huangtf 5 месяцев назад
Родитель
Сommit
aae4d1c981

+ 2 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchivesAuto.java

@@ -184,4 +184,6 @@ public class ArchivesAuto extends BaseEntity {
         return (this.getCarrierType() != null &&
                 this.getCarrierType().equals("5"));
     }
+
+    private String outId;
 }

+ 5 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ArchiveFile.java

@@ -315,4 +315,9 @@ public class ArchiveFile extends BaseEntity {
      */
     @ApiModelProperty("文件时间名称,可用于确定时间树节点的id")
     private String dateName;
+
+    /**
+     * 外部同步的id,常常文件url不是来自外部
+     */
+    private String outId;
 }

+ 2 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ArchiveTreeContract.java

@@ -250,6 +250,8 @@ public class ArchiveTreeContract extends BaseEntity {
     @ApiModelProperty(value = "试验资料类型(归档树)对应字典试验节点类型,数字逗号拼接")
     private String contractTrialType;
 
+    private String outId;
+
     public ArchiveTreeContract() {
     }
 

+ 6 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/utils/FileUtils.java

@@ -757,6 +757,12 @@ public class FileUtils {
      * @return
      */
     public static String getAliYunSubUrl(String url) {
+
+        //不要删除其他buket的文件
+        if (url != null && url.contains("huazheng2021")) {
+            return "666";
+        }
+
         int uploadStart = url.indexOf("upload/");
         if (uploadStart != -1) {  // 如果找到了以 'upload/' 开始的字符串
             return url.substring(uploadStart);