diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/backup/ArticleBackupService.java b/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/backup/ArticleBackupService.java index 381211f..3f0637c 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/backup/ArticleBackupService.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/backup/ArticleBackupService.java @@ -209,6 +209,7 @@ public class ArticleBackupService { if (toLocal == YesNo.YES) { backLogs.add(""); if (articleId != null) { + // 查询文章引用的图片 List refs = referenceService.listPics(articleId); PictureEntity where = new PictureEntity(); where.setUrls(refs.stream().map(ArticleReferenceEntity::getTargetUrl).collect(Collectors.toList())); @@ -216,11 +217,16 @@ public class ArticleBackupService { backLogs.add("[图片备份] 图片个数: " + pics.size()); backLogs.add("┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ ↓↓ 图片列表 ↓↓ ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"); for (PictureEntity pic : pics) { - backLogs.add("┃ " + pic.getPathName()); - FileUtil.copy( - pic.getPathName(), - backupFile.getRootPath() + "/" + pic.getPathName(), - true); + try { + FileUtil.copy( + pic.getPathName(), + backupFile.getRootPath() + "/" + pic.getPathName(), + true); + backLogs.add("┃ " + pic.getPathName()); + } catch (Exception e) { + backLogs.add("┃ [警告] " + pic.getPathName() + " 未在存储路径中找到"); + log.warn("{} 未在存储路径中找到", pic.getPathName()); + } } } // 备份全部图片 @@ -378,7 +384,7 @@ public class ArticleBackupService { } List refs = referenceService.listPics(articleId); - final String domain = iaasProperties.getBlos().getDomain(); + final String domain = paramService.getDomain(); // 计算字符出现的次数 int separatorCount = countChar(articleName, '/'); diff --git a/blossom-backend/common/common-iaas/src/main/java/com/blossom/common/iaas/IaasProperties.java b/blossom-backend/common/common-iaas/src/main/java/com/blossom/common/iaas/IaasProperties.java index b5b4ad3..fb03d72 100644 --- a/blossom-backend/common/common-iaas/src/main/java/com/blossom/common/iaas/IaasProperties.java +++ b/blossom-backend/common/common-iaas/src/main/java/com/blossom/common/iaas/IaasProperties.java @@ -173,7 +173,11 @@ public class IaasProperties { public static class BLOS { /** * BLOS 查看图片的接口的地址, 默认在 PictureController#getFile() 方法中, 末尾带有 "/" 会自动清除 + * + * @deprecated 该配置项已转移至系统配置 base_sys_param {@link ParamEnum#BLOSSOM_OBJECT_STORAGE_DOMAIN}, + * 但在 base_sys_param 为配置时仍然生效 */ + @Deprecated private String domain; /** * BLOS 默认上传地址, 不能为空, 注意不同系统的区分, 末尾带有 "/" 会自动清除 @@ -202,7 +206,7 @@ public class IaasProperties { } if (blos != null) { String domain = formatDomain(blos.getDomain()); - if (!StrUtil.endWith(domain,"/pic")) { + if (!StrUtil.endWith(domain, "/pic")) { domain = domain + "/pic"; } blos.setDomain(domain);