1

src/main/java/com/fdkankan/fusion/task/TaskService.java

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.util.DateUtils;
+import com.fdkankan.fusion.down.CaseDownService;
+import com.fdkankan.fusion.down.FusionDownService;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.service.*;
 import com.fdkankan.redis.util.RedisUtil;
@@ -25,7 +27,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.fdkankan.fusion.down.CaseDownService.downProcessKey;
 
 @Service
 @Slf4j
@@ -51,13 +52,20 @@ public class TaskService {
     RedisUtil redisUtil;
     @PostConstruct
     public void cleanRedisKey(){
-        String redisKey = String.format(downProcessKey, "*");
+        String redisKey = String.format(CaseDownService.downProcessKey, "*");
+        String redisKey2 = String.format(FusionDownService.downProcessKey, "*");
         Set<String>  keys = redisUtil.keys(redisKey);
         if(keys != null && !keys.isEmpty()){
             for (String key : keys) {
                 redisUtil.del(key);
             }
         }
+        Set<String>  keys2 = redisUtil.keys(redisKey2);
+        if(keys2 != null && !keys2.isEmpty()){
+            for (String key : keys2) {
+                redisUtil.del(key);
+            }
+        }
 
         updateFusion();
         updateCaseSetting();

src/main/java/com/fdkankan/fusion/task/TimeTaskService.java

@@ -8,6 +8,7 @@ import com.fdkankan.fusion.config.CacheUtil;
 import com.fdkankan.fusion.response.FileInfoVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +22,9 @@ public class TimeTaskService {
 
     @Autowired
     UploadToOssUtil uploadToOssUtil;
+    @Value("${spring.profiles.active}")
+    private String environment;
+
     @PostConstruct
     public void init() {
         delOssOffline();
@@ -35,8 +39,10 @@ public class TimeTaskService {
      * 定时删除oss中离线包文件
      */
     private void delOssOffline() {
+        String path = "fusion/" + environment + "/offline";
+        log.info("开始执行清除离线包:{}",path);
         try {
-            List<String> list = uploadToOssUtil.listKeysFromAli("fusion/" + CacheUtil.environment + "/offline");
+            List<String> list = uploadToOssUtil.listKeysFromAli(path);
             for (String key : list) {
                 FileInfoVo fileInfo = uploadToOssUtil.getFileInfo(key);
                 Long lastModified = fileInfo.getLastModified();