From 430aee2b7f3f00501401a9815bd2010cc75ff068 Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Sun, 8 Mar 2020 11:43:42 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?,=20=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../im/zhaojun/zfile/cache/ZFileCache.java | 30 ++++++++++++---- .../config/ContentTypeTextToTextJson.java | 5 --- .../zfile/config/GlobalScheduleTask.java | 10 +----- .../zfile/controller/AdminController.java | 17 +++++----- .../zfile/controller/CacheController.java | 3 +- .../zfile/controller/PageController.java | 3 +- .../zhaojun/zfile/core/FileListCacheAop.java | 6 +--- .../zhaojun/zfile/model/dto/ResultBean.java | 2 -- .../zfile/model/dto/StorageStrategyDTO.java | 1 - .../zfile/service/SystemConfigService.java | 4 --- .../service/base/AbstractBaseFileService.java | 34 ++++--------------- .../zfile/service/impl/FtpServiceImpl.java | 28 +++++---------- .../impl/OneDriveChinaServiceImpl.java | 8 ++--- .../service/impl/OneDriveServiceImpl.java | 8 ++--- .../support/FileAsyncCacheService.java | 11 +++--- .../zhaojun/zfile/util/StartupListener.java | 6 +--- 16 files changed, 63 insertions(+), 113 deletions(-) diff --git a/src/main/java/im/zhaojun/zfile/cache/ZFileCache.java b/src/main/java/im/zhaojun/zfile/cache/ZFileCache.java index 1880e11..2966a5d 100644 --- a/src/main/java/im/zhaojun/zfile/cache/ZFileCache.java +++ b/src/main/java/im/zhaojun/zfile/cache/ZFileCache.java @@ -1,12 +1,11 @@ package im.zhaojun.zfile.cache; import cn.hutool.core.util.StrUtil; +import im.zhaojun.zfile.model.constant.ZFileConstant; import im.zhaojun.zfile.model.dto.FileItemDTO; import im.zhaojun.zfile.model.dto.SystemConfigDTO; -import im.zhaojun.zfile.service.SystemConfigService; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -23,9 +22,6 @@ public class ZFileCache { public Date lastCacheAutoRefreshDate; - @Resource - private SystemConfigService systemConfigService; - public synchronized void put(String key, List value) { fileCache.put(key, value); } @@ -42,11 +38,17 @@ public class ZFileCache { return fileCache.size(); } - public List find(String key, boolean ignoreCase) { + public List find(String key, boolean ignoreCase, boolean searchContainEncryptedFile) { List result = new ArrayList<>(); Collection> values = fileCache.values(); for (List fileItemList : values) { + + // 如果开启了 "搜索包含加密文件" 选项, 则直接返回 true. + if (!searchContainEncryptedFile && isEncryptedFolder(fileItemList)) { + continue; + } + for (FileItemDTO fileItemDTO : fileItemList) { boolean testResult; @@ -91,4 +93,20 @@ public class ZFileCache { public void setLastCacheAutoRefreshDate(Date lastCacheAutoRefreshDate) { this.lastCacheAutoRefreshDate = lastCacheAutoRefreshDate; } + + + /** + * 不是加密文件夹 + * @param list 文件夹中的内容 + * @return 返回此文件夹是否加密. + */ + private boolean isEncryptedFolder(List list) { + // 遍历文件判断是否包含 + for (FileItemDTO fileItemDTO : list) { + if (Objects.equals(ZFileConstant.PASSWORD_FILE_NAME, fileItemDTO.getName())) { + return true; + } + } + return false; + } } diff --git a/src/main/java/im/zhaojun/zfile/config/ContentTypeTextToTextJson.java b/src/main/java/im/zhaojun/zfile/config/ContentTypeTextToTextJson.java index 045f32b..66d5076 100644 --- a/src/main/java/im/zhaojun/zfile/config/ContentTypeTextToTextJson.java +++ b/src/main/java/im/zhaojun/zfile/config/ContentTypeTextToTextJson.java @@ -1,7 +1,5 @@ package im.zhaojun.zfile.config; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; @@ -17,12 +15,9 @@ import java.util.Collections; */ public class ContentTypeTextToTextJson implements ClientHttpRequestInterceptor { - private static final Logger LOG = LoggerFactory.getLogger(ContentTypeTextToTextJson.class); - @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { - URI uri = request.getURI(); ClientHttpResponse response = execution.execute(request, body); HttpHeaders headers = response.getHeaders(); headers.put("Content-Type", Collections.singletonList("application/text")); diff --git a/src/main/java/im/zhaojun/zfile/config/GlobalScheduleTask.java b/src/main/java/im/zhaojun/zfile/config/GlobalScheduleTask.java index 5ef09bc..a496008 100644 --- a/src/main/java/im/zhaojun/zfile/config/GlobalScheduleTask.java +++ b/src/main/java/im/zhaojun/zfile/config/GlobalScheduleTask.java @@ -1,10 +1,8 @@ package im.zhaojun.zfile.config; -import im.zhaojun.zfile.cache.ZFileCache; import im.zhaojun.zfile.model.enums.StorageTypeEnum; -import im.zhaojun.zfile.service.base.AbstractBaseFileService; -import im.zhaojun.zfile.service.StorageConfigService; import im.zhaojun.zfile.service.SystemConfigService; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; import im.zhaojun.zfile.service.impl.OneDriveChinaServiceImpl; import im.zhaojun.zfile.service.impl.OneDriveServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -24,12 +22,6 @@ import java.util.Objects; @Slf4j public class GlobalScheduleTask { - @Resource - private ZFileCache zFileCache; - - @Resource - private StorageConfigService storageConfigService; - @Resource private OneDriveServiceImpl oneDriveServiceImpl; diff --git a/src/main/java/im/zhaojun/zfile/controller/AdminController.java b/src/main/java/im/zhaojun/zfile/controller/AdminController.java index f0223a3..5df52c1 100644 --- a/src/main/java/im/zhaojun/zfile/controller/AdminController.java +++ b/src/main/java/im/zhaojun/zfile/controller/AdminController.java @@ -3,27 +3,30 @@ package im.zhaojun.zfile.controller; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ZipUtil; import im.zhaojun.zfile.config.StorageTypeFactory; -import im.zhaojun.zfile.model.entity.StorageConfig; -import im.zhaojun.zfile.model.support.SystemMonitorInfo; import im.zhaojun.zfile.model.dto.ResultBean; import im.zhaojun.zfile.model.dto.StorageStrategyDTO; import im.zhaojun.zfile.model.dto.SystemConfigDTO; +import im.zhaojun.zfile.model.entity.StorageConfig; import im.zhaojun.zfile.model.enums.StorageTypeEnum; -import im.zhaojun.zfile.service.base.AbstractBaseFileService; -import im.zhaojun.zfile.service.support.FileAsyncCacheService; +import im.zhaojun.zfile.model.support.SystemMonitorInfo; import im.zhaojun.zfile.service.StorageConfigService; import im.zhaojun.zfile.service.SystemConfigService; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.support.FileAsyncCacheService; import im.zhaojun.zfile.util.FileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.File; import java.util.*; -import java.util.concurrent.ScheduledExecutorService; /** * 后台管理 @@ -44,8 +47,6 @@ public class AdminController { @Resource private FileAsyncCacheService fileAsyncCacheService; - private ScheduledExecutorService scheduledExecutorService; - /** * 获取系统配置 */ diff --git a/src/main/java/im/zhaojun/zfile/controller/CacheController.java b/src/main/java/im/zhaojun/zfile/controller/CacheController.java index 08b2044..30f4d43 100644 --- a/src/main/java/im/zhaojun/zfile/controller/CacheController.java +++ b/src/main/java/im/zhaojun/zfile/controller/CacheController.java @@ -3,10 +3,10 @@ package im.zhaojun.zfile.controller; import im.zhaojun.zfile.cache.ZFileCache; import im.zhaojun.zfile.model.dto.CacheConfigDTO; import im.zhaojun.zfile.model.dto.ResultBean; +import im.zhaojun.zfile.service.SystemConfigService; import im.zhaojun.zfile.service.base.AbstractBaseFileService; import im.zhaojun.zfile.service.support.FileAsyncCacheService; import im.zhaojun.zfile.service.support.FileCacheService; -import im.zhaojun.zfile.service.SystemConfigService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -47,7 +47,6 @@ public class CacheController { @GetMapping("/config") public ResultBean cacheConfig() { - AbstractBaseFileService fileService = systemConfigService.getCurrentFileService(); CacheConfigDTO cacheConfigDTO = new CacheConfigDTO(); cacheConfigDTO.setEnableCache(systemConfigService.getEnableCache()); cacheConfigDTO.setCacheFinish(fileAsyncCacheService.isCacheFinish()); diff --git a/src/main/java/im/zhaojun/zfile/controller/PageController.java b/src/main/java/im/zhaojun/zfile/controller/PageController.java index f398650..d5fdc2c 100644 --- a/src/main/java/im/zhaojun/zfile/controller/PageController.java +++ b/src/main/java/im/zhaojun/zfile/controller/PageController.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.URLUtil; import im.zhaojun.zfile.model.constant.ZFileConstant; import im.zhaojun.zfile.model.dto.FileItemDTO; import im.zhaojun.zfile.model.enums.FileTypeEnum; -import im.zhaojun.zfile.service.base.AbstractBaseFileService; import im.zhaojun.zfile.service.SystemConfigService; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; import org.springframework.stereotype.Controller; import org.springframework.util.AntPathMatcher; import org.springframework.web.bind.annotation.GetMapping; @@ -13,7 +13,6 @@ import org.springframework.web.servlet.HandlerMapping; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.net.MalformedURLException; import java.util.Objects; /** diff --git a/src/main/java/im/zhaojun/zfile/core/FileListCacheAop.java b/src/main/java/im/zhaojun/zfile/core/FileListCacheAop.java index 99cff3a..b0705f2 100644 --- a/src/main/java/im/zhaojun/zfile/core/FileListCacheAop.java +++ b/src/main/java/im/zhaojun/zfile/core/FileListCacheAop.java @@ -27,11 +27,7 @@ public class FileListCacheAop { @Resource private SystemConfigService systemConfigService; - @Pointcut("execution(public * im.zhaojun.zfile.service.base.AbstractBaseFileService.fileList(..))") - public void pointcut() { - } - - @Around(value = "pointcut()") + @Around(value = "execution(public * im.zhaojun.zfile.service.base.AbstractBaseFileService.fileList(..))") public Object around(ProceedingJoinPoint point) throws Throwable { List result; diff --git a/src/main/java/im/zhaojun/zfile/model/dto/ResultBean.java b/src/main/java/im/zhaojun/zfile/model/dto/ResultBean.java index bc7a497..e0ffab3 100644 --- a/src/main/java/im/zhaojun/zfile/model/dto/ResultBean.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/ResultBean.java @@ -23,8 +23,6 @@ public class ResultBean implements Serializable { private Object data; - private int total; - private ResultBean() { super(); } diff --git a/src/main/java/im/zhaojun/zfile/model/dto/StorageStrategyDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/StorageStrategyDTO.java index f9608bd..548fa57 100644 --- a/src/main/java/im/zhaojun/zfile/model/dto/StorageStrategyDTO.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/StorageStrategyDTO.java @@ -1,6 +1,5 @@ package im.zhaojun.zfile.model.dto; -import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/im/zhaojun/zfile/service/SystemConfigService.java b/src/main/java/im/zhaojun/zfile/service/SystemConfigService.java index 3602d05..b8ca9df 100644 --- a/src/main/java/im/zhaojun/zfile/service/SystemConfigService.java +++ b/src/main/java/im/zhaojun/zfile/service/SystemConfigService.java @@ -11,7 +11,6 @@ import im.zhaojun.zfile.model.entity.SystemConfig; import im.zhaojun.zfile.model.enums.StorageTypeEnum; import im.zhaojun.zfile.repository.SystemConfigRepository; import im.zhaojun.zfile.service.base.AbstractBaseFileService; -import im.zhaojun.zfile.service.support.FileCacheService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -33,9 +32,6 @@ public class SystemConfigService { @Resource private SystemConfigRepository systemConfigRepository; - @Resource - private FileCacheService fileCacheService; - private Class systemConfigClazz = SystemConfigDTO.class; public SystemConfigDTO getSystemConfig() { diff --git a/src/main/java/im/zhaojun/zfile/service/base/AbstractBaseFileService.java b/src/main/java/im/zhaojun/zfile/service/base/AbstractBaseFileService.java index f914692..e2f8cb8 100644 --- a/src/main/java/im/zhaojun/zfile/service/base/AbstractBaseFileService.java +++ b/src/main/java/im/zhaojun/zfile/service/base/AbstractBaseFileService.java @@ -2,13 +2,12 @@ package im.zhaojun.zfile.service.base; import cn.hutool.core.util.BooleanUtil; import im.zhaojun.zfile.cache.ZFileCache; -import im.zhaojun.zfile.service.support.FileAsyncCacheService; -import im.zhaojun.zfile.service.support.FileCacheService; -import im.zhaojun.zfile.service.SystemConfigService; -import im.zhaojun.zfile.model.constant.ZFileConstant; import im.zhaojun.zfile.model.dto.FileItemDTO; import im.zhaojun.zfile.model.dto.SystemConfigDTO; import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.SystemConfigService; +import im.zhaojun.zfile.service.support.FileAsyncCacheService; +import im.zhaojun.zfile.service.support.FileCacheService; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.framework.AopContext; import org.springframework.beans.factory.annotation.Value; @@ -16,7 +15,6 @@ import org.springframework.beans.factory.annotation.Value; import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.util.List; -import java.util.Objects; /** * @author zhaojun @@ -24,8 +22,6 @@ import java.util.Objects; @Slf4j public abstract class AbstractBaseFileService extends FileCacheService implements BaseFileService { - private static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-cache:"; - @Value("${zfile.cache.timeout}") protected Long timeout; @@ -106,29 +102,11 @@ public abstract class AbstractBaseFileService extends FileCacheService implement * @return 包含该文件名的所有文件或文件夹 */ public List search(String name) { - boolean searchIgnoreCase = systemConfigService.getSearchIgnoreCase(); - return zFileCache.find(name, searchIgnoreCase); - } - - /** - * 不是加密文件夹 - * @param list 文件夹中的内容 - * @return 返回此文件夹是否加密. - */ - private boolean isNotEncryptedFolder(List list) { - // 如果开启了 "搜索包含加密文件" 选项, 则直接返回 true. SystemConfigDTO systemConfig = systemConfigService.getSystemConfig(); - if (BooleanUtil.isFalse(systemConfig.getSearchContainEncryptedFile())) { - return true; - } - // 遍历文件判断是否包含 - for (FileItemDTO fileItemDTO : list) { - if (Objects.equals(ZFileConstant.PASSWORD_FILE_NAME, fileItemDTO.getName())) { - return false; - } - } - return true; + boolean searchIgnoreCase = BooleanUtil.isTrue(systemConfig.getSearchIgnoreCase()); + boolean searchContainEncryptedFile = BooleanUtil.isTrue(systemConfig.getSearchContainEncryptedFile()); + return zFileCache.find(name, searchIgnoreCase, searchContainEncryptedFile); } /** diff --git a/src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java index 6240442..b3f40b3 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java @@ -2,16 +2,20 @@ package im.zhaojun.zfile.service.impl; import cn.hutool.core.util.URLUtil; import cn.hutool.extra.ftp.Ftp; -import im.zhaojun.zfile.model.entity.StorageConfig; import im.zhaojun.zfile.model.constant.StorageConfigConstant; import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.entity.StorageConfig; import im.zhaojun.zfile.model.enums.FileTypeEnum; import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.StorageConfigService; import im.zhaojun.zfile.service.base.AbstractBaseFileService; import im.zhaojun.zfile.service.base.BaseFileService; -import im.zhaojun.zfile.service.StorageConfigService; import im.zhaojun.zfile.util.StringUtils; -import org.apache.commons.net.ftp.*; +import org.apache.commons.net.ftp.FTP; +import org.apache.commons.net.ftp.FTPClient; +import org.apache.commons.net.ftp.FTPClientConfig; +import org.apache.commons.net.ftp.FTPFile; +import org.apache.commons.net.ftp.FTPReply; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -127,20 +131,4 @@ public class FtpServiceImpl extends AbstractBaseFileService implements BaseFileS fileItemDTO.setUrl(getDownloadUrl(path)); return fileItemDTO; } - - private void ifDisConnectionReConnection() { - FTPClient ftpClient = ftp.getClient(); - try { - // 验证FTP服务器是否登录成功 - int replyCode = ftpClient.getReplyCode(); - - if (!FTPReply.isPositiveCompletion(replyCode)) { - System.out.println("断开了连接, 已尝试重新连接."); - ftpClient.connect(host, Integer.parseInt(port)); - ftpClient.login(username, password); - } - } catch (Exception e) { - e.printStackTrace(); - } - } -} +} \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java index 053c49a..57961d9 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java @@ -1,12 +1,11 @@ package im.zhaojun.zfile.service.impl; -import im.zhaojun.zfile.config.GlobalScheduleTask; -import im.zhaojun.zfile.model.entity.StorageConfig; import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.entity.StorageConfig; import im.zhaojun.zfile.model.enums.StorageTypeEnum; -import im.zhaojun.zfile.service.base.BaseFileService; import im.zhaojun.zfile.service.StorageConfigService; import im.zhaojun.zfile.service.base.AbstractOneDriveServiceBase; +import im.zhaojun.zfile.service.base.BaseFileService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -22,9 +21,6 @@ import java.util.Map; @Slf4j public class OneDriveChinaServiceImpl extends AbstractOneDriveServiceBase implements BaseFileService { - @Resource - private GlobalScheduleTask globalScheduleTask; - @Resource private StorageConfigService storageConfigService; diff --git a/src/main/java/im/zhaojun/zfile/service/impl/OneDriveServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/OneDriveServiceImpl.java index 9caa46a..a73f855 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/OneDriveServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/OneDriveServiceImpl.java @@ -1,12 +1,11 @@ package im.zhaojun.zfile.service.impl; -import im.zhaojun.zfile.config.GlobalScheduleTask; -import im.zhaojun.zfile.model.entity.StorageConfig; import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.entity.StorageConfig; import im.zhaojun.zfile.model.enums.StorageTypeEnum; -import im.zhaojun.zfile.service.base.BaseFileService; import im.zhaojun.zfile.service.StorageConfigService; import im.zhaojun.zfile.service.base.AbstractOneDriveServiceBase; +import im.zhaojun.zfile.service.base.BaseFileService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -22,9 +21,6 @@ import java.util.Map; @Slf4j public class OneDriveServiceImpl extends AbstractOneDriveServiceBase implements BaseFileService { - @Resource - private GlobalScheduleTask globalScheduleTask; - @Resource private StorageConfigService storageConfigService; diff --git a/src/main/java/im/zhaojun/zfile/service/support/FileAsyncCacheService.java b/src/main/java/im/zhaojun/zfile/service/support/FileAsyncCacheService.java index 45d3e98..a80fd15 100644 --- a/src/main/java/im/zhaojun/zfile/service/support/FileAsyncCacheService.java +++ b/src/main/java/im/zhaojun/zfile/service/support/FileAsyncCacheService.java @@ -1,11 +1,11 @@ package im.zhaojun.zfile.service.support; import im.zhaojun.zfile.cache.ZFileCache; -import im.zhaojun.zfile.service.SystemConfigService; import im.zhaojun.zfile.config.StorageTypeFactory; import im.zhaojun.zfile.model.dto.FileItemDTO; import im.zhaojun.zfile.model.enums.FileTypeEnum; import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.SystemConfigService; import im.zhaojun.zfile.service.base.AbstractBaseFileService; import im.zhaojun.zfile.service.base.BaseFileService; import im.zhaojun.zfile.util.StringUtils; @@ -15,7 +15,12 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -71,8 +76,6 @@ public class FileAsyncCacheService { return; } - Integer cacheDirectoryCount = 0; - log.info("缓存 {} 所有文件开始", storageStrategy.getDescription()); long startTime = System.currentTimeMillis(); try { diff --git a/src/main/java/im/zhaojun/zfile/util/StartupListener.java b/src/main/java/im/zhaojun/zfile/util/StartupListener.java index eedb40b..b77f754 100644 --- a/src/main/java/im/zhaojun/zfile/util/StartupListener.java +++ b/src/main/java/im/zhaojun/zfile/util/StartupListener.java @@ -3,7 +3,6 @@ package im.zhaojun.zfile.util; import cn.hutool.core.net.NetUtil; import im.zhaojun.zfile.exception.InitializeException; import im.zhaojun.zfile.service.support.FileAsyncCacheService; -import im.zhaojun.zfile.service.SystemConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.event.ApplicationStartedEvent; import org.springframework.context.ApplicationListener; @@ -12,7 +11,7 @@ import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.util.*; +import java.util.LinkedHashSet; /** * 项目启动监听器, 当项目启动时, 遍历当前对象存储的所有内容, 添加到缓存中. @@ -28,9 +27,6 @@ public class StartupListener implements ApplicationListener