✨ 缓存功能优化, 更高效的管理缓存.

src/main/java/im/zhaojun/common/service/FileAsyncCacheService.java

@@ -1,12 +1,17 @@
 package im.zhaojun.common.service;
 
 import im.zhaojun.common.config.StorageTypeFactory;
+import im.zhaojun.common.model.dto.FileItemDTO;
+import im.zhaojun.common.model.enums.FileTypeEnum;
 import im.zhaojun.common.model.enums.StorageTypeEnum;
+import im.zhaojun.common.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayDeque;
+import java.util.List;
 
 /**
  * @author zhaojun
@@ -29,12 +34,35 @@ public class FileAsyncCacheService {
             return;
         }
 
+        boolean enableCache = systemConfigService.getEnableCache();
+        if (!enableCache) {
+            log.info("未开启缓存, 跳过启动缓存");
+            return;
+        }
+
         AbstractFileService fileService = StorageTypeFactory.getStorageTypeService(storageStrategy);
+
+
+        if (fileService.getIsUnInitialized()) {
+            log.info("存储引擎 {} 未初始化成功, 跳过启动缓存.", storageStrategy.getDescription());
+            return;
+        }
+
         log.info("缓存 {} 所有文件开始", storageStrategy.getDescription());
         long startTime = System.currentTimeMillis();
         try {
-            if (fileService.getIsInitialized()) {
-                fileService.selectAllFileList();
+            String path = "/";
+
+            FileService currentFileService = systemConfigService.getCurrentFileService();
+            List<FileItemDTO> fileItemList = currentFileService.fileList(path);
+            ArrayDeque<FileItemDTO> queue = new ArrayDeque<>(fileItemList);
+
+            while (!queue.isEmpty()) {
+                FileItemDTO fileItemDTO = queue.pop();
+                if (fileItemDTO.getType() == FileTypeEnum.FOLDER) {
+                    String filePath = StringUtils.removeDuplicateSeparator("/" + fileItemDTO.getPath() + "/" + fileItemDTO.getName() + "/");
+                    queue.addAll(currentFileService.fileList(filePath));
+                }
             }
         } catch (Exception e) {
             log.error("缓存所有文件失败", e);
@@ -45,6 +73,7 @@ public class FileAsyncCacheService {
         cacheFinish = true;
     }
 
+
     public boolean isCacheFinish() {
         return cacheFinish;
     }