diff --git a/src/main/java/im/zhaojun/common/controller/FileController.java b/src/main/java/im/zhaojun/common/controller/FileController.java index 667388f..b83a0a3 100644 --- a/src/main/java/im/zhaojun/common/controller/FileController.java +++ b/src/main/java/im/zhaojun/common/controller/FileController.java @@ -10,10 +10,8 @@ import im.zhaojun.common.model.dto.SiteConfigDTO; import im.zhaojun.common.model.dto.SystemConfigDTO; import im.zhaojun.common.service.AbstractFileService; import im.zhaojun.common.service.FileAsyncCacheService; -import im.zhaojun.common.service.StorageConfigService; import im.zhaojun.common.service.SystemConfigService; import im.zhaojun.common.service.SystemService; -import im.zhaojun.common.util.AudioHelper; import im.zhaojun.common.util.FileComparator; import im.zhaojun.common.util.HttpUtil; import im.zhaojun.common.util.StringUtils; @@ -40,9 +38,6 @@ public class FileController { @Resource private SystemConfigService systemConfigService; - @Resource - private StorageConfigService storageConfigService; - @Resource private FileAsyncCacheService fileAsyncCacheService; diff --git a/src/main/java/im/zhaojun/common/controller/InstallController.java b/src/main/java/im/zhaojun/common/controller/InstallController.java index 1bf9366..e4d1ca4 100644 --- a/src/main/java/im/zhaojun/common/controller/InstallController.java +++ b/src/main/java/im/zhaojun/common/controller/InstallController.java @@ -6,7 +6,6 @@ import im.zhaojun.common.model.dto.InstallModelDTO; import im.zhaojun.common.model.dto.ResultBean; import im.zhaojun.common.model.dto.SystemConfigDTO; import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.FileAsyncCacheService; import im.zhaojun.common.service.StorageConfigService; import im.zhaojun.common.service.SystemConfigService; import org.springframework.web.bind.annotation.GetMapping; @@ -33,9 +32,6 @@ public class InstallController { @Resource private AdminController adminController; - @Resource - private FileAsyncCacheService fileAsyncCacheService; - @GetMapping("/is-installed") public ResultBean isInstall() { if (systemConfigService.getCurrentStorageStrategy() == null) { diff --git a/src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java b/src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java index 29a23f2..a4025ff 100644 --- a/src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java +++ b/src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java @@ -10,8 +10,8 @@ import java.util.Set; */ @Data public class CacheConfigDTO { - private boolean enableCache; - private boolean cacheFinish; + private Boolean enableCache; + private Boolean cacheFinish; private Set cacheKeys; private Integer cacheDirectoryCount; private Integer cacheFileCount; diff --git a/src/main/java/im/zhaojun/common/service/FileAsyncCacheService.java b/src/main/java/im/zhaojun/common/service/FileAsyncCacheService.java index a47653e..4a3432b 100644 --- a/src/main/java/im/zhaojun/common/service/FileAsyncCacheService.java +++ b/src/main/java/im/zhaojun/common/service/FileAsyncCacheService.java @@ -73,8 +73,6 @@ public class FileAsyncCacheService { log.info("缓存 {} 所有文件开始", storageStrategy.getDescription()); long startTime = System.currentTimeMillis(); try { - String path = "/"; - FileService currentFileService = systemConfigService.getCurrentFileService(); List rootFileItems = currentFileService.fileList("/"); ArrayDeque queue = new ArrayDeque<>(rootFileItems); diff --git a/src/main/java/im/zhaojun/common/service/SystemConfigService.java b/src/main/java/im/zhaojun/common/service/SystemConfigService.java index 746c214..ad12b3f 100644 --- a/src/main/java/im/zhaojun/common/service/SystemConfigService.java +++ b/src/main/java/im/zhaojun/common/service/SystemConfigService.java @@ -37,9 +37,6 @@ public class SystemConfigService { @Resource private SystemConfigRepository systemConfigRepository; - @Resource - private FileAsyncCacheService fileAsyncCacheService; - @Resource private FileCacheService fileCacheService; @@ -101,8 +98,6 @@ public class SystemConfigService { systemConfigRepository.saveAll(systemConfigList); - AbstractFileService currentFileService = getCurrentFileService(); - if (!oldEnableCache && curEnableCache) { log.debug("检测到开启了缓存, 开启预热缓存"); fileCacheService.enableCache();