lyhzzz 1 月之前
父节点
当前提交
0defab2b00
共有 1 个文件被更改,包括 17 次插入30 次删除
  1. 17 30
      src/main/java/com/fdkankan/fusion/task/TimeTaskService.java

+ 17 - 30
src/main/java/com/fdkankan/fusion/task/TimeTaskService.java

@@ -26,42 +26,29 @@ public class TimeTaskService {
     UploadToOssUtil uploadToOssUtil;
     UploadToOssUtil uploadToOssUtil;
     @Value("${spring.profiles.active}")
     @Value("${spring.profiles.active}")
     private String environment;
     private String environment;
-    @Autowired
-    @Qualifier("taskExecutor")
-    private Executor taskExecutor;
-
-
-    @PostConstruct
-    public void init() {
-        delOssOffline();
-    }
-
-    @Scheduled(cron = "0 0 0 * * ?")
-    public void scheduledTask() {
-        delOssOffline();
-    }
 
 
     /**
     /**
      * 定时删除oss中离线包文件
      * 定时删除oss中离线包文件
      */
      */
+    @Scheduled(
+            cron = "0 0 0 * * ?", initialDelay = 10000)
     private void delOssOffline() {
     private void delOssOffline() {
-        taskExecutor.execute(() ->{
-            String path = "fusion/" + environment + "/offline";
-            log.info("开始执行清除离线包:{}",path);
-            try {
-                List<String> list = uploadToOssUtil.listKeysFromAli(path);
-                for (String key : list) {
-                    FileInfoVo fileInfo = uploadToOssUtil.getFileInfo(key);
-                    Long lastModified = fileInfo.getLastModified();
-                    long between = DateUtil.between(new Date(lastModified), new Date(), DateUnit.DAY);
-                    if(between >7){
-                        log.info("删除文件->{},info:{}",key,lastModified);
-                        uploadToOssUtil.delete(key);
-                    }
+        String path = "fusion/" + environment + "/offline";
+        log.info("开始执行清除离线包:{}",path);
+        try {
+            List<String> list = uploadToOssUtil.listKeysFromAli(path);
+            for (String key : list) {
+                FileInfoVo fileInfo = uploadToOssUtil.getFileInfo(key);
+                Long lastModified = fileInfo.getLastModified();
+                long between = DateUtil.between(new Date(lastModified), new Date(), DateUnit.DAY);
+                if(between >7){
+                    log.info("删除文件->{},info:{}",key,lastModified);
+                    uploadToOssUtil.delete(key);
                 }
                 }
-            }catch (Exception e){
-                log.info("del-oss-offline-error:{}",e);
             }
             }
-        });
+        }catch (Exception e){
+            log.info("del-oss-offline-error:{}",e);
+        }
+
     }
     }
 }
 }