🔨 重构代码, 优化目录结构

src/main/java/im/zhaojun/zfile/ZfileApplication.java

@@ -1,4 +1,4 @@
-package im.zhaojun;
+package im.zhaojun.zfile;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/im/zhaojun/zfile/cache/ZFileCache.java

@@ -1,9 +1,9 @@
-package im.zhaojun.common.cache;
+package im.zhaojun.zfile.cache;
 
 import cn.hutool.core.util.StrUtil;
-import im.zhaojun.common.model.dto.FileItemDTO;
-import im.zhaojun.common.model.dto.SystemConfigDTO;
-import im.zhaojun.common.service.SystemConfigService;
+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;

src/main/java/im/zhaojun/zfile/config/CacheConfig.java

@@ -1,6 +1,6 @@
-package im.zhaojun.common.config;
+package im.zhaojun.zfile.config;
 
-import im.zhaojun.common.model.dto.FileItemDTO;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

src/main/java/im/zhaojun/zfile/config/ContentTypeTextToTextJson.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.config;
+package im.zhaojun.zfile.config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,6 +12,9 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.Collections;
 
+/**
+ * @author zhaojun
+ */
 public class ContentTypeTextToTextJson implements ClientHttpRequestInterceptor {
 
     private static final Logger LOG = LoggerFactory.getLogger(ContentTypeTextToTextJson.class);

src/main/java/im/zhaojun/zfile/config/CorsFilter.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.config;
+package im.zhaojun.zfile.config;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.cors.CorsUtils;

src/main/java/im/zhaojun/zfile/config/GlobalScheduleTask.java

@@ -1,12 +1,12 @@
-package im.zhaojun.common.config;
+package im.zhaojun.zfile.config;
 
-import im.zhaojun.common.cache.ZFileCache;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractFileService;
-import im.zhaojun.common.service.StorageConfigService;
-import im.zhaojun.common.service.SystemConfigService;
-import im.zhaojun.onedrive.china.service.OneDriveChinaServiceImpl;
-import im.zhaojun.onedrive.international.service.OneDriveServiceImpl;
+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.impl.OneDriveChinaServiceImpl;
+import im.zhaojun.zfile.service.impl.OneDriveServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -48,7 +48,7 @@ public class GlobalScheduleTask {
         try {
             log.debug("尝试调用 OneDrive 自动刷新 AccessToken 定时任务");
 
-            AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
+            AbstractBaseFileService currentFileService = systemConfigService.getCurrentFileService();
 
             if (!(currentFileService instanceof OneDriveServiceImpl
                     || currentFileService instanceof OneDriveChinaServiceImpl)) {

src/main/java/im/zhaojun/zfile/config/OneDriveConfig.java

@@ -1,11 +1,11 @@
-package im.zhaojun.onedrive.common.config;
+package im.zhaojun.zfile.config;
 
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.StorageConfigService;
-import im.zhaojun.onedrive.china.service.OneDriveChinaServiceImpl;
-import im.zhaojun.onedrive.international.service.OneDriveServiceImpl;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.constant.StorageConfigConstant;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.StorageConfigService;
+import im.zhaojun.zfile.service.impl.OneDriveChinaServiceImpl;
+import im.zhaojun.zfile.service.impl.OneDriveServiceImpl;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;

src/main/java/im/zhaojun/zfile/config/StorageTypeFactory.java

@@ -1,7 +1,7 @@
-package im.zhaojun.common.config;
+package im.zhaojun.zfile.config;
 
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractFileService;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -15,7 +15,7 @@ import java.util.Map;
 @Component
 public class StorageTypeFactory implements ApplicationContextAware {
 
-    private static Map<String, AbstractFileService> storageTypeEnumFileServiceMap;
+    private static Map<String, AbstractBaseFileService> storageTypeEnumFileServiceMap;
 
     private static ApplicationContext applicationContext;
 
@@ -27,15 +27,15 @@ public class StorageTypeFactory implements ApplicationContextAware {
         applicationContext = act;
 
         // 获取 Spring 容器中所有 FileService 类型的类
-        storageTypeEnumFileServiceMap = act.getBeansOfType(AbstractFileService.class);
+        storageTypeEnumFileServiceMap = act.getBeansOfType(AbstractBaseFileService.class);
     }
 
     /**
      * 获取指定存储类型 Service
      */
-    public static AbstractFileService getStorageTypeService(StorageTypeEnum type) {
-        AbstractFileService result = null;
-        for (AbstractFileService fileService : storageTypeEnumFileServiceMap.values()) {
+    public static AbstractBaseFileService getStorageTypeService(StorageTypeEnum type) {
+        AbstractBaseFileService result = null;
+        for (AbstractBaseFileService fileService : storageTypeEnumFileServiceMap.values()) {
             if (fileService.getStorageTypeEnum() == type) {
                 result = fileService;
                 break;

src/main/java/im/zhaojun/zfile/config/WebMvcConfig.java

@@ -1,6 +1,6 @@
-package im.zhaojun.common.config;
+package im.zhaojun.zfile.config;
 
-import im.zhaojun.common.model.enums.StorageTypeEnumDeSerializerConvert;
+import im.zhaojun.zfile.model.enums.StorageTypeEnumDeSerializerConvert;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
 import org.springframework.context.annotation.Bean;

src/main/java/im/zhaojun/zfile/config/ZFileConfiguration.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.config;
+package im.zhaojun.zfile.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/im/zhaojun/zfile/controller/AdminController.java

@@ -1,19 +1,19 @@
-package im.zhaojun.common.controller;
+package im.zhaojun.zfile.controller;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ZipUtil;
-import im.zhaojun.common.config.StorageTypeFactory;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.SystemMonitorInfo;
-import im.zhaojun.common.model.dto.ResultBean;
-import im.zhaojun.common.model.dto.StorageStrategyDTO;
-import im.zhaojun.common.model.dto.SystemConfigDTO;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-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.util.FileUtil;
+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.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
+import im.zhaojun.zfile.service.support.FileAsyncCacheService;
+import im.zhaojun.zfile.service.StorageConfigService;
+import im.zhaojun.zfile.service.SystemConfigService;
+import im.zhaojun.zfile.util.FileUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
@@ -105,7 +105,7 @@ public class AdminController {
         List<StorageStrategyDTO> result = new ArrayList<>();
         StorageTypeEnum[] values = StorageTypeEnum.values();
         for (StorageTypeEnum value : values) {
-            AbstractFileService storageTypeService = StorageTypeFactory.getStorageTypeService(value);
+            AbstractBaseFileService storageTypeService = StorageTypeFactory.getStorageTypeService(value);
             result.add(new StorageStrategyDTO(value.getKey(),
                                     value.getDescription(),
                                     storageTypeService.getIsInitialized()));
@@ -118,10 +118,9 @@ public class AdminController {
      * @param storageStrategyConfig     保存表单值
      * @param storageStrategy           所属策略
      * @return                          操作结果
-     * @throws Exception                表单解析出错异常
      */
     @PostMapping("/storage-strategy")
-    public ResultBean save(@RequestParam Map<String, String> storageStrategyConfig, StorageTypeEnum storageStrategy) throws Exception {
+    public ResultBean save(@RequestParam Map<String, String> storageStrategyConfig, StorageTypeEnum storageStrategy) {
         // 保存设置.
         List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageStrategy);
         for (StorageConfig storageConfig : storageConfigList) {
@@ -132,7 +131,7 @@ public class AdminController {
         storageConfigService.updateStorageConfig(storageConfigList);
 
         // 获取当前修改的存储策略 Service, 尝试调用初始化.
-        AbstractFileService updateStorageStrategyService = StorageTypeFactory.getStorageTypeService(storageStrategy);
+        AbstractBaseFileService updateStorageStrategyService = StorageTypeFactory.getStorageTypeService(storageStrategy);
         updateStorageStrategyService.init();
 
         // 如果修改的为当前启用的缓存, 则重新进行缓存.
@@ -142,7 +141,7 @@ public class AdminController {
                 log.debug("检测到更新了当前启用的存储策略 {}, 已清理缓存.", currentStorageStrategy);
             }
 
-            AbstractFileService fileService = systemConfigService.getCurrentFileService();
+            AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
             fileService.clearFileCache();
             fileAsyncCacheService.cacheGlobalFile();
         }
@@ -170,7 +169,7 @@ public class AdminController {
         if (storageStrategy == null) {
             log.info("尚未配置存储策略.");
         } else {
-            AbstractFileService fileService = systemConfigService.getCurrentFileService();
+            AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
             fileService.init();
             fileService.clearFileCache();
             log.info("切换至存储类型: {}", storageStrategy.getDescription());

src/main/java/im/zhaojun/zfile/controller/CacheController.java

@@ -1,19 +1,18 @@
-package im.zhaojun.common.controller;
+package im.zhaojun.zfile.controller;
 
-import im.zhaojun.common.cache.ZFileCache;
-import im.zhaojun.common.model.dto.CacheConfigDTO;
-import im.zhaojun.common.model.dto.ResultBean;
-import im.zhaojun.common.service.AbstractFileService;
-import im.zhaojun.common.service.FileAsyncCacheService;
-import im.zhaojun.common.service.FileCacheService;
-import im.zhaojun.common.service.SystemConfigService;
+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.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;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.Set;
 
 /**
  * @author zhaojun
@@ -48,7 +47,7 @@ public class CacheController {
 
     @GetMapping("/config")
     public ResultBean cacheConfig() {
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
         CacheConfigDTO cacheConfigDTO = new CacheConfigDTO();
         cacheConfigDTO.setEnableCache(systemConfigService.getEnableCache());
         cacheConfigDTO.setCacheFinish(fileAsyncCacheService.isCacheFinish());
@@ -61,7 +60,7 @@ public class CacheController {
 
     @PostMapping("/refresh")
     public ResultBean refreshCache(String key) throws Exception {
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
         fileService.refreshCache(key);
         return ResultBean.success();
     }

src/main/java/im/zhaojun/zfile/controller/CommonController.java

@@ -1,9 +1,9 @@
-package im.zhaojun.common.controller;
+package im.zhaojun.zfile.controller;
 
-import im.zhaojun.common.model.dto.ResultBean;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.util.AudioHelper;
-import im.zhaojun.common.util.HttpUtil;
+import im.zhaojun.zfile.model.dto.ResultBean;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.util.AudioHelper;
+import im.zhaojun.zfile.util.HttpUtil;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/im/zhaojun/zfile/controller/FileController.java

@@ -1,22 +1,22 @@
-package im.zhaojun.common.controller;
+package im.zhaojun.zfile.controller;
 
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.URLUtil;
-import im.zhaojun.common.annotation.CheckStorageStrategyInit;
-import im.zhaojun.common.exception.SearchDisableException;
-import im.zhaojun.common.model.FilePageModel;
-import im.zhaojun.common.model.constant.ZFileConstant;
-import im.zhaojun.common.model.dto.FileItemDTO;
-import im.zhaojun.common.model.dto.ResultBean;
-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.SystemConfigService;
-import im.zhaojun.common.service.SystemService;
-import im.zhaojun.common.util.FileComparator;
-import im.zhaojun.common.util.HttpUtil;
-import im.zhaojun.common.util.StringUtils;
+import im.zhaojun.zfile.model.annotation.CheckStorageStrategyInit;
+import im.zhaojun.zfile.exception.SearchDisableException;
+import im.zhaojun.zfile.model.support.FilePageModel;
+import im.zhaojun.zfile.model.constant.ZFileConstant;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
+import im.zhaojun.zfile.model.dto.ResultBean;
+import im.zhaojun.zfile.model.dto.SiteConfigDTO;
+import im.zhaojun.zfile.model.dto.SystemConfigDTO;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
+import im.zhaojun.zfile.service.support.FileAsyncCacheService;
+import im.zhaojun.zfile.service.SystemConfigService;
+import im.zhaojun.zfile.service.SystemService;
+import im.zhaojun.zfile.util.FileComparator;
+import im.zhaojun.zfile.util.HttpUtil;
+import im.zhaojun.zfile.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -57,11 +57,11 @@ public class FileController {
                            @RequestParam(defaultValue = "asc") String order,
                            @RequestParam(required = false) String password,
                            @RequestParam(defaultValue = "1") Integer page) throws Exception {
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
         List<FileItemDTO> fileItemList = fileService.fileList(StringUtils.removeDuplicateSeparator("/" + path + "/"));
         for (FileItemDTO fileItemDTO : fileItemList) {
             if (ZFileConstant.PASSWORD_FILE_NAME.equals(fileItemDTO.getName())) {
-                String expectedPasswordContent = null;
+                String expectedPasswordContent;
                 try {
                     expectedPasswordContent = HttpUtil.getTextContent(fileItemDTO.getUrl() + '1');
                 } catch (HttpClientErrorException httpClientErrorException) {
@@ -110,7 +110,7 @@ public class FileController {
                              @RequestParam(defaultValue = "name") String sortBy,
                              @RequestParam(defaultValue = "asc") String order,
                              @RequestParam(defaultValue = "1") Integer page) {
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
         SystemConfigDTO systemConfigDTO = systemConfigService.getSystemConfig();
         if (BooleanUtil.isFalse(systemConfigDTO.getSearchEnable())) {
             throw new SearchDisableException("搜索功能未开启");
@@ -166,7 +166,7 @@ public class FileController {
     @CheckStorageStrategyInit
     @GetMapping("/directlink")
     public ResultBean directlink(String path) {
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
         return ResultBean.successData(fileService.getFileItem(path));
     }
 }

src/main/java/im/zhaojun/zfile/controller/InstallController.java

@@ -1,13 +1,13 @@
-package im.zhaojun.common.controller;
+package im.zhaojun.zfile.controller;
 
 import cn.hutool.crypto.SecureUtil;
-import im.zhaojun.common.model.StorageConfig;
-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.StorageConfigService;
-import im.zhaojun.common.service.SystemConfigService;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.dto.InstallModelDTO;
+import im.zhaojun.zfile.model.dto.ResultBean;
+import im.zhaojun.zfile.model.dto.SystemConfigDTO;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.StorageConfigService;
+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.RestController;

src/main/java/im/zhaojun/zfile/controller/LocalController.java

@@ -1,8 +1,8 @@
-package im.zhaojun.local.controller;
+package im.zhaojun.zfile.controller;
 
-import im.zhaojun.common.util.FileUtil;
-import im.zhaojun.common.util.StringUtils;
-import im.zhaojun.local.service.LocalServiceImpl;
+import im.zhaojun.zfile.util.FileUtil;
+import im.zhaojun.zfile.util.StringUtils;
+import im.zhaojun.zfile.service.impl.LocalServiceImpl;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.AntPathMatcher;

src/main/java/im/zhaojun/zfile/controller/OneDriveController.java

@@ -1,8 +1,8 @@
-package im.zhaojun.onedrive.common.controller;
+package im.zhaojun.zfile.controller;
 
-import im.zhaojun.onedrive.china.service.OneDriveChinaServiceImpl;
-import im.zhaojun.onedrive.common.model.OneDriveToken;
-import im.zhaojun.onedrive.international.service.OneDriveServiceImpl;
+import im.zhaojun.zfile.service.impl.OneDriveChinaServiceImpl;
+import im.zhaojun.zfile.model.support.OneDriveToken;
+import im.zhaojun.zfile.service.impl.OneDriveServiceImpl;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/im/zhaojun/zfile/controller/PageController.java

@@ -1,10 +1,11 @@
-package im.zhaojun.common.controller;
+package im.zhaojun.zfile.controller;
 
 import cn.hutool.core.util.URLUtil;
-import im.zhaojun.common.model.dto.FileItemDTO;
-import im.zhaojun.common.model.enums.FileTypeEnum;
-import im.zhaojun.common.service.AbstractFileService;
-import im.zhaojun.common.service.SystemConfigService;
+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 org.springframework.stereotype.Controller;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,18 +27,18 @@ public class PageController {
     private SystemConfigService systemConfigService;
 
     @GetMapping("/directlink/**")
-    public String directlink(final HttpServletRequest request) throws MalformedURLException {
+    public String directlink(final HttpServletRequest request) {
         String path = (String) request.getAttribute(
                 HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
         String bestMatchPattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
         AntPathMatcher apm = new AntPathMatcher();
         String filePath = apm.extractPathWithinPattern(bestMatchPattern, path);
 
-        if (filePath.length() > 0 && filePath.charAt(0) != '/') {
+        if (filePath.length() > 0 && filePath.charAt(0) != ZFileConstant.PATH_SEPARATOR_CHAR) {
             filePath = "/" + filePath;
         }
 
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
         FileItemDTO fileItem = fileService.getFileItem(filePath);
 
         String url = fileItem.getUrl();

src/main/java/im/zhaojun/zfile/core/FileListCacheAop.java

@@ -1,8 +1,8 @@
-package im.zhaojun.common.aop;
+package im.zhaojun.zfile.core;
 
-import im.zhaojun.common.cache.ZFileCache;
-import im.zhaojun.common.model.dto.FileItemDTO;
-import im.zhaojun.common.service.SystemConfigService;
+import im.zhaojun.zfile.cache.ZFileCache;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
+import im.zhaojun.zfile.service.SystemConfigService;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -14,11 +14,12 @@ import javax.annotation.Resource;
 import java.util.List;
 
 /**
- * 操作日志切面.
+ * @author zhaojun
+ * 缓存切面类, 用于访问文件夹时, 缓存文件列表内容.
  */
 @Aspect
 @Component
-public class FileListCacheAspect {
+public class FileListCacheAop {
 
     @Resource
     private ZFileCache zFileCache;
@@ -26,7 +27,7 @@ public class FileListCacheAspect {
     @Resource
     private SystemConfigService systemConfigService;
 
-    @Pointcut("execution(public * im.zhaojun.common.service.AbstractFileService.fileList(..))")
+    @Pointcut("execution(public * im.zhaojun.zfile.service.base.AbstractBaseFileService.fileList(..))")
     public void pointcut() {
     }
 

src/main/java/im/zhaojun/zfile/core/StorageStrategyInitCheckAop.java

@@ -1,9 +1,9 @@
-package im.zhaojun.common.aspect;
+package im.zhaojun.zfile.core;
 
-import im.zhaojun.common.exception.StorageStrategyUninitializedException;
-import im.zhaojun.common.service.AbstractFileService;
-import im.zhaojun.common.service.SystemConfigService;
-import im.zhaojun.common.util.SpringContextHolder;
+import im.zhaojun.zfile.exception.StorageStrategyUninitializedException;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
+import im.zhaojun.zfile.service.SystemConfigService;
+import im.zhaojun.zfile.util.SpringContextHolder;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.stereotype.Component;
@@ -13,12 +13,12 @@ import org.springframework.stereotype.Component;
  */
 @Aspect
 @Component
-public class StorageStrategyInitCheckAspect {
+public class StorageStrategyInitCheckAop {
 
-    @Before("@annotation(im.zhaojun.common.annotation.CheckStorageStrategyInit)")
+    @Before("@annotation(im.zhaojun.zfile.model.annotation.CheckStorageStrategyInit)")
     public void logStart() {
         SystemConfigService systemConfigService = SpringContextHolder.getBean(SystemConfigService.class);
-        AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
+        AbstractBaseFileService currentFileService = systemConfigService.getCurrentFileService();
         if (currentFileService == null) {
             throw new StorageStrategyUninitializedException("存储策略尚未初始化, 请联系管理员!");
         }

src/main/java/im/zhaojun/zfile/exception/GlobleExceptionHandler.java

@@ -1,6 +1,6 @@
-package im.zhaojun.common.exception;
+package im.zhaojun.zfile.exception;
 
-import im.zhaojun.common.model.dto.ResultBean;
+import im.zhaojun.zfile.model.dto.ResultBean;
 import org.apache.catalina.connector.ClientAbortException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/im/zhaojun/zfile/exception/InitializeException.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.exception;
+package im.zhaojun.zfile.exception;
 
 /**
  * 对象存储初始化异常

src/main/java/im/zhaojun/zfile/exception/NotExistFileException.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.exception;
+package im.zhaojun.zfile.exception;
 
 /**
  * @author zhaojun

src/main/java/im/zhaojun/zfile/exception/SearchDisableException.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.exception;
+package im.zhaojun.zfile.exception;
 
 /**
  * @author zhaojun

src/main/java/im/zhaojun/zfile/exception/StorageStrategyUninitializedException.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.exception;
+package im.zhaojun.zfile.exception;
 
 /**
  * 存储策略未初始化异常

src/main/java/im/zhaojun/zfile/exception/UnknownStorageTypeException.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.exception;
+package im.zhaojun.zfile.exception;
 
 /**
  * 未知的存储类型异常

src/main/java/im/zhaojun/zfile/filter/MyCorsFilter.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.security;
+package im.zhaojun.zfile.filter;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/im/zhaojun/zfile/model/annotation/CheckStorageStrategyInit.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.annotation;
+package im.zhaojun.zfile.model.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/im/zhaojun/zfile/model/constant/StorageConfigConstant.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.constant;
+package im.zhaojun.zfile.model.constant;
 
 /**
  * @author zhaojun

src/main/java/im/zhaojun/zfile/model/constant/SystemConfigConstant.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.constant;
+package im.zhaojun.zfile.model.constant;
 
 /**
  * @author zhaojun

src/main/java/im/zhaojun/zfile/model/constant/ZFileConstant.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.constant;
+package im.zhaojun.zfile.model.constant;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -14,6 +14,10 @@ public class ZFileConstant {
 
     public static final String AUDIO_TMP_PATH = "/.zfile/tmp/audio/";
 
+    public static final Character PATH_SEPARATOR_CHAR = '/';
+
+    public static final String PATH_SEPARATOR = "/";
+
     /**
      * 页面文档文件
      */

src/main/java/im/zhaojun/zfile/model/dto/AudioInfoDTO.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.dto;
+package im.zhaojun.zfile.model.dto;
 
 /**
  * @author zhaojun

src/main/java/im/zhaojun/zfile/model/dto/CacheConfigDTO.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.dto;
+package im.zhaojun.zfile.model.dto;
 
 import lombok.Data;
 

src/main/java/im/zhaojun/zfile/model/dto/FileItemDTO.java

@@ -1,6 +1,6 @@
-package im.zhaojun.common.model.dto;
+package im.zhaojun.zfile.model.dto;
 
-import im.zhaojun.common.model.enums.FileTypeEnum;
+import im.zhaojun.zfile.model.enums.FileTypeEnum;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/im/zhaojun/zfile/model/dto/InstallModelDTO.java

@@ -1,6 +1,6 @@
-package im.zhaojun.common.model.dto;
+package im.zhaojun.zfile.model.dto;
 
-import im.zhaojun.common.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
 
 import java.util.Map;
 

src/main/java/im/zhaojun/zfile/model/dto/ResultBean.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.dto;
+package im.zhaojun.zfile.model.dto;
 
 import java.io.Serializable;
 

src/main/java/im/zhaojun/zfile/model/dto/SiteConfigDTO.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.dto;
+package im.zhaojun.zfile.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

src/main/java/im/zhaojun/zfile/model/dto/StorageStrategyDTO.java

@@ -1,5 +1,7 @@
-package im.zhaojun.common.model.dto;
+package im.zhaojun.zfile.model.dto;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -16,6 +18,7 @@ public class StorageStrategyDTO {
 
     private String description;
 
-    private boolean available;
+    @JsonProperty(defaultValue = "false")
+    private Boolean available;
 
 }

src/main/java/im/zhaojun/zfile/model/dto/SystemConfigDTO.java

@@ -1,9 +1,9 @@
-package im.zhaojun.common.model.dto;
+package im.zhaojun.zfile.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.model.enums.StorageTypeEnumSerializerConvert;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.model.enums.StorageTypeEnumSerializerConvert;
 import lombok.Data;
 import lombok.ToString;
 

src/main/java/im/zhaojun/zfile/model/entity/StorageConfig.java

@@ -1,6 +1,6 @@
-package im.zhaojun.common.model;
+package im.zhaojun.zfile.model.entity;
 
-import im.zhaojun.common.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
 import lombok.Data;
 
 import javax.persistence.Column;

src/main/java/im/zhaojun/zfile/model/entity/SystemConfig.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model;
+package im.zhaojun.zfile.model.entity;
 
 import lombok.Data;
 

src/main/java/im/zhaojun/zfile/model/enums/FileTypeEnum.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.enums;
+package im.zhaojun.zfile.model.enums;
 
 /**
  * @author zhaojun

src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnum.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.enums;
+package im.zhaojun.zfile.model.enums;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 

src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumConvert.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.enums;
+package im.zhaojun.zfile.model.enums;
 
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;

src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumDeSerializerConvert.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.enums;
+package im.zhaojun.zfile.model.enums;
 
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.lang.NonNull;

src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumSerializerConvert.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model.enums;
+package im.zhaojun.zfile.model.enums;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;

src/main/java/im/zhaojun/zfile/model/support/FilePageModel.java

@@ -1,6 +1,6 @@
-package im.zhaojun.common.model;
+package im.zhaojun.zfile.model.support;
 
-import im.zhaojun.common.model.dto.FileItemDTO;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

src/main/java/im/zhaojun/zfile/model/support/Jvm.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model;
+package im.zhaojun.zfile.model.support;
 
 import lombok.Data;
 

src/main/java/im/zhaojun/zfile/model/support/Mem.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model;
+package im.zhaojun.zfile.model.support;
 
 import com.sun.management.OperatingSystemMXBean;
 import lombok.Data;
@@ -27,11 +27,11 @@ public class Mem {
     private double free;
 
     public Mem() {
-        OperatingSystemMXBean operatingSystemMXBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
+        OperatingSystemMXBean osb = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
         // 总的物理内存+虚拟内存
-        long totalVirtualMemory = operatingSystemMXBean.getTotalSwapSpaceSize();
+        long totalVirtualMemory = osb.getTotalSwapSpaceSize();
         // 剩余的物理内存
-        long freePhysicalMemorySize = operatingSystemMXBean.getFreePhysicalMemorySize();
+        long freePhysicalMemorySize = osb.getFreePhysicalMemorySize();
         this.total = totalVirtualMemory;
         this.free = freePhysicalMemorySize;
         this.used = totalVirtualMemory - freePhysicalMemorySize;

src/main/java/im/zhaojun/zfile/model/support/OneDriveToken.java

@@ -1,4 +1,4 @@
-package im.zhaojun.onedrive.common.model;
+package im.zhaojun.zfile.model.support;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

src/main/java/im/zhaojun/zfile/model/support/Sys.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.model;
+package im.zhaojun.zfile.model.support;
 
 import cn.hutool.core.date.BetweenFormater;
 import cn.hutool.core.date.DateUtil;

src/main/java/im/zhaojun/zfile/model/support/SystemMonitorInfo.java

@@ -1,5 +1,8 @@
-package im.zhaojun.common.model;
+package im.zhaojun.zfile.model.support;
 
+import im.zhaojun.zfile.model.support.Jvm;
+import im.zhaojun.zfile.model.support.Mem;
+import im.zhaojun.zfile.model.support.Sys;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/im/zhaojun/zfile/repository/StorageConfigRepository.java

@@ -1,7 +1,7 @@
-package im.zhaojun.common.repository;
+package im.zhaojun.zfile.repository;
 
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/im/zhaojun/zfile/repository/SystemConfigRepository.java

@@ -1,6 +1,6 @@
-package im.zhaojun.common.repository;
+package im.zhaojun.zfile.repository;
 
-import im.zhaojun.common.model.SystemConfig;
+import im.zhaojun.zfile.model.entity.SystemConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/im/zhaojun/zfile/security/Md5PasswordEncoder.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.security;
+package im.zhaojun.zfile.security;
 
 import cn.hutool.crypto.SecureUtil;
 import org.springframework.security.crypto.password.PasswordEncoder;

src/main/java/im/zhaojun/zfile/security/MySecurityConfig.java

@@ -1,7 +1,7 @@
-package im.zhaojun.common.security;
+package im.zhaojun.zfile.security;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import im.zhaojun.common.model.dto.ResultBean;
+import im.zhaojun.zfile.model.dto.ResultBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -21,6 +21,7 @@ import java.io.PrintWriter;
 
 /**
  * 自定义 Security 配置类
+ *
  * @author zhaojun
  */
 @EnableWebSecurity
@@ -34,7 +35,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter {
         http
                 // .authenticationProvider(authenticationProvider())
                 .exceptionHandling()
-                //未登录时，进行json格式的提示，很喜欢这种写法，不用单独写一个又一个的类
+                // 未登录时，进行 json 格式的提示.
                 .authenticationEntryPoint((request, response, authException) -> {
                     response.setContentType("application/json;charset=utf-8");
                     response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
@@ -48,8 +49,8 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/").permitAll()
                 .antMatchers("/admin/**").authenticated()
                 .and()
-                .formLogin() //使用自带的登录
-                //登录失败，返回json
+                .formLogin() // 使用自带的登录
+                // 登录失败，返回json
                 .failureHandler((request, response, ex) -> {
                     response.setContentType("application/json;charset=utf-8");
                     response.setStatus(HttpServletResponse.SC_FORBIDDEN);
@@ -64,7 +65,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter {
                     out.flush();
                     out.close();
                 })
-                //登录成功，返回json
+                // 登录成功，返回json
                 .successHandler((request, response, authentication) -> {
                     response.setContentType("application/json;charset=utf-8");
                     PrintWriter out = response.getWriter();
@@ -74,7 +75,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter {
                 })
                 .and()
                 .exceptionHandling()
-                //没有权限，返回json
+                // 没有权限，返回json
                 .accessDeniedHandler((request, response, ex) -> {
                     response.setContentType("application/json;charset=utf-8");
                     response.setStatus(HttpServletResponse.SC_FORBIDDEN);
@@ -85,7 +86,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter {
                 })
                 .and()
                 .logout()
-                //退出成功，返回json
+                // 退出成功，返回 json
                 .logoutSuccessHandler((request, response, authentication) -> {
                     response.setContentType("application/json;charset=utf-8");
                     PrintWriter out = response.getWriter();
@@ -120,7 +121,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     public void configure(WebSecurity web) {
-        //对于在header里面增加token等类似情况，放行所有OPTIONS请求。
+        // 对于在 header 里面增加 token 等类似情况，放行所有 OPTIONS 请求。
         web.ignoring().antMatchers(HttpMethod.OPTIONS, "/**");
         web.httpFirewall(allowUrlEncodedSlashHttpFirewall());
     }

src/main/java/im/zhaojun/zfile/security/MyUserDetailsServiceImpl.java

@@ -1,7 +1,7 @@
-package im.zhaojun.common.security;
+package im.zhaojun.zfile.security;
 
-import im.zhaojun.common.model.dto.SystemConfigDTO;
-import im.zhaojun.common.service.SystemConfigService;
+import im.zhaojun.zfile.model.dto.SystemConfigDTO;
+import im.zhaojun.zfile.service.SystemConfigService;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

src/main/java/im/zhaojun/zfile/service/StorageConfigService.java

@@ -1,8 +1,8 @@
-package im.zhaojun.common.service;
+package im.zhaojun.zfile.service;
 
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.repository.StorageConfigRepository;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.repository.StorageConfigRepository;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/im/zhaojun/zfile/service/SystemConfigService.java

@@ -1,15 +1,17 @@
-package im.zhaojun.common.service;
+package im.zhaojun.zfile.service;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.crypto.SecureUtil;
-import im.zhaojun.common.cache.ZFileCache;
-import im.zhaojun.common.config.StorageTypeFactory;
-import im.zhaojun.common.model.SystemConfig;
-import im.zhaojun.common.model.constant.SystemConfigConstant;
-import im.zhaojun.common.model.dto.SystemConfigDTO;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.repository.SystemConfigRepository;
+import im.zhaojun.zfile.cache.ZFileCache;
+import im.zhaojun.zfile.config.StorageTypeFactory;
+import im.zhaojun.zfile.model.constant.SystemConfigConstant;
+import im.zhaojun.zfile.model.dto.SystemConfigDTO;
+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;
 
@@ -25,10 +27,6 @@ import java.util.List;
 @Service
 public class SystemConfigService {
 
-    public static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-config-cache:";
-
-    public static final String SYSTEM_CONFIG_CACHE_KEY = "1";
-
     @Resource
     private ZFileCache zFileCache;
 
@@ -38,7 +36,7 @@ public class SystemConfigService {
     @Resource
     private FileCacheService fileCacheService;
 
-    private Class<SystemConfigDTO> systemConfigDTOClass = SystemConfigDTO.class;
+    private Class<SystemConfigDTO> systemConfigClazz = SystemConfigDTO.class;
 
     public SystemConfigDTO getSystemConfig() {
         SystemConfigDTO cacheConfig = zFileCache.getConfig();
@@ -53,7 +51,7 @@ public class SystemConfigService {
             String key = systemConfig.getKey();
 
             try {
-                Field field = systemConfigDTOClass.getDeclaredField(key);
+                Field field = systemConfigClazz.getDeclaredField(key);
                 if (field != null) {
                     field.setAccessible(true);
                     String strVal = systemConfig.getValue();
@@ -75,7 +73,7 @@ public class SystemConfigService {
     public void updateSystemConfig(SystemConfigDTO systemConfigDTO) throws Exception {
         List<SystemConfig> systemConfigList = new ArrayList<>();
 
-        Field[] fields = systemConfigDTOClass.getDeclaredFields();
+        Field[] fields = systemConfigClazz.getDeclaredFields();
         for (Field field : fields) {
             String key = field.getName();
             SystemConfig systemConfig = systemConfigRepository.findByKey(key);
@@ -117,7 +115,7 @@ public class SystemConfigService {
     }
 
 
-    public AbstractFileService getCurrentFileService() {
+    public AbstractBaseFileService getCurrentFileService() {
         StorageTypeEnum storageStrategy = getCurrentStorageStrategy();
         return StorageTypeFactory.getStorageTypeService(storageStrategy);
     }

src/main/java/im/zhaojun/zfile/service/SystemService.java

@@ -1,11 +1,12 @@
-package im.zhaojun.common.service;
+package im.zhaojun.zfile.service;
 
-import im.zhaojun.common.model.constant.ZFileConstant;
-import im.zhaojun.common.model.dto.FileItemDTO;
-import im.zhaojun.common.model.dto.SiteConfigDTO;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.util.HttpUtil;
-import im.zhaojun.common.util.StringUtils;
+import im.zhaojun.zfile.model.constant.ZFileConstant;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
+import im.zhaojun.zfile.model.dto.SiteConfigDTO;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
+import im.zhaojun.zfile.util.HttpUtil;
+import im.zhaojun.zfile.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
@@ -32,7 +33,7 @@ public class SystemService {
     public SiteConfigDTO getConfig(String path) throws Exception {
 
         SiteConfigDTO siteConfigDTO = new SiteConfigDTO();
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
 
         List<FileItemDTO> fileItemList;
 

src/main/java/im/zhaojun/zfile/service/base/AbstractBaseFileService.java

@@ -1,11 +1,14 @@
-package im.zhaojun.common.service;
+package im.zhaojun.zfile.service.base;
 
 import cn.hutool.core.util.BooleanUtil;
-import im.zhaojun.common.cache.ZFileCache;
-import im.zhaojun.common.model.constant.ZFileConstant;
-import im.zhaojun.common.model.dto.FileItemDTO;
-import im.zhaojun.common.model.dto.SystemConfigDTO;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
+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 lombok.extern.slf4j.Slf4j;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Value;
@@ -14,13 +17,12 @@ import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * @author zhaojun
  */
 @Slf4j
-public abstract class AbstractFileService extends FileCacheService implements FileService {
+public abstract class AbstractBaseFileService extends FileCacheService implements BaseFileService {
 
     private static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-cache:";
 
@@ -134,10 +136,15 @@ public abstract class AbstractFileService extends FileCacheService implements Fi
      */
     public void refreshCache(String key) throws Exception {
         zFileCache.remove(key);
-        FileService currentFileService = (FileService) AopContext.currentProxy();
+        BaseFileService currentFileService = (BaseFileService) AopContext.currentProxy();
         currentFileService.fileList(key);
     }
 
+    /**
+     * 获取单个文件信息
+     * @param path 文件路径
+     * @return  单个文件的内容.
+     */
     public abstract FileItemDTO getFileItem(String path);
 
 }

src/main/java/im/zhaojun/zfile/service/base/AbstractOneDriveServiceBase.java

@@ -1,4 +1,4 @@
-package im.zhaojun.onedrive.common.service;
+package im.zhaojun.zfile.service.base;
 
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.http.HttpRequest;
@@ -7,15 +7,15 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.dto.FileItemDTO;
-import im.zhaojun.common.model.enums.FileTypeEnum;
-import im.zhaojun.common.repository.StorageConfigRepository;
-import im.zhaojun.common.service.AbstractFileService;
-import im.zhaojun.common.service.StorageConfigService;
-import im.zhaojun.common.util.StringUtils;
-import im.zhaojun.onedrive.common.model.OneDriveToken;
+import im.zhaojun.zfile.model.constant.ZFileConstant;
+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.enums.FileTypeEnum;
+import im.zhaojun.zfile.repository.StorageConfigRepository;
+import im.zhaojun.zfile.service.StorageConfigService;
+import im.zhaojun.zfile.util.StringUtils;
+import im.zhaojun.zfile.model.support.OneDriveToken;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.HttpClientErrorException;
@@ -31,7 +31,7 @@ import java.util.List;
  * 2020/1/29 11:54
  */
 @Slf4j
-public abstract class AbstractOneDriveService extends AbstractFileService {
+public abstract class AbstractOneDriveServiceBase extends AbstractBaseFileService {
 
     protected static final String DRIVER_INFO_URL = "https://{graphEndPoint}/v1.0/me/drives";
 
@@ -43,6 +43,8 @@ public abstract class AbstractOneDriveService extends AbstractFileService {
 
     protected static final String AUTHENTICATE_URL = "https://{authenticateEndPoint}/common/oauth2/v2.0/token";
 
+    private static final String ONE_DRIVE_FILE_FLAG = "file";
+
     @Resource
     private RestTemplate oneDriveRestTemplate;
 
@@ -105,7 +107,7 @@ public abstract class AbstractOneDriveService extends AbstractFileService {
             if (nextLink != null) {
                 nextLink = nextLink.replace("+", "%2B");
                 requestUrl = URLUtil.decode(nextLink);
-            }else if ("/".equalsIgnoreCase(fullPath) || "".equalsIgnoreCase(fullPath)) {
+            }else if (ZFileConstant.PATH_SEPARATOR.equalsIgnoreCase(fullPath) || "".equalsIgnoreCase(fullPath)) {
                 requestUrl = DRIVER_ROOT_URL;
             } else {
                 requestUrl = DRIVER_ITEMS_URL;
@@ -169,7 +171,7 @@ public abstract class AbstractOneDriveService extends AbstractFileService {
         fileItemDTO.setSize(fileItem.getLong("size"));
         fileItemDTO.setTime(fileItem.getDate("lastModifiedDateTime"));
 
-        if (fileItem.containsKey("file")) {
+        if (fileItem.containsKey(ONE_DRIVE_FILE_FLAG)) {
             fileItemDTO.setUrl(fileItem.getString("@microsoft.graph.downloadUrl"));
             fileItemDTO.setType(FileTypeEnum.FILE);
         } else {

src/main/java/im/zhaojun/zfile/service/base/AbstractS3BaseFileService.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.service;
+package im.zhaojun.zfile.service.base;
 
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.URLUtil;
@@ -6,10 +6,11 @@ import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.model.ListObjectsRequest;
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
-import im.zhaojun.common.exception.NotExistFileException;
-import im.zhaojun.common.model.dto.FileItemDTO;
-import im.zhaojun.common.model.enums.FileTypeEnum;
-import im.zhaojun.common.util.StringUtils;
+import im.zhaojun.zfile.service.StorageConfigService;
+import im.zhaojun.zfile.exception.NotExistFileException;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
+import im.zhaojun.zfile.model.enums.FileTypeEnum;
+import im.zhaojun.zfile.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.net.URL;
@@ -21,7 +22,7 @@ import java.util.Objects;
 /**
  * @author zhaojun
  */
-public abstract class AbstractS3FileService extends AbstractFileService {
+public abstract class AbstractS3BaseFileService extends AbstractBaseFileService {
 
     @Resource
     protected StorageConfigService storageConfigService;

src/main/java/im/zhaojun/zfile/service/base/BaseFileService.java

@@ -1,13 +1,13 @@
-package im.zhaojun.common.service;
+package im.zhaojun.zfile.service.base;
 
-import im.zhaojun.common.model.dto.FileItemDTO;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
 
 import java.util.List;
 
 /**
  * @author zhaojun
  */
-public interface FileService {
+public interface BaseFileService {
 
     /***
      * 获取指定路径下的文件及文件夹

src/main/java/im/zhaojun/zfile/service/impl/AliyunServiceImpl.java

@@ -1,15 +1,15 @@
-package im.zhaojun.aliyun.service;
+package im.zhaojun.zfile.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractS3FileService;
-import im.zhaojun.common.service.FileService;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.constant.StorageConfigConstant;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.AbstractS3BaseFileService;
+import im.zhaojun.zfile.service.base.BaseFileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import java.util.Objects;
  * @author zhaojun
  */
 @Service
-public class AliyunServiceImpl extends AbstractS3FileService implements FileService {
+public class AliyunServiceImpl extends AbstractS3BaseFileService implements BaseFileService {
 
     private static final Logger log = LoggerFactory.getLogger(AliyunServiceImpl.class);
 

src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java

@@ -1,16 +1,16 @@
-package im.zhaojun.ftp.service;
+package im.zhaojun.zfile.service.impl;
 
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.extra.ftp.Ftp;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-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.service.AbstractFileService;
-import im.zhaojun.common.service.FileService;
-import im.zhaojun.common.service.StorageConfigService;
-import im.zhaojun.common.util.StringUtils;
+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.enums.FileTypeEnum;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +27,7 @@ import java.util.Objects;
  * @author zhaojun
  */
 @Service
-public class FtpServiceImpl extends AbstractFileService implements FileService {
+public class FtpServiceImpl extends AbstractBaseFileService implements BaseFileService {
 
     private static final Logger log = LoggerFactory.getLogger(FtpServiceImpl.class);
 
@@ -56,7 +56,7 @@ public class FtpServiceImpl extends AbstractFileService implements FileService {
             username = stringStorageConfigMap.get(StorageConfigConstant.USERNAME_KEY).getValue();
             password = stringStorageConfigMap.get(StorageConfigConstant.PASSWORD_KEY).getValue();
             domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
-            super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();;
+            super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
             if (Objects.isNull(host) || Objects.isNull(port) || Objects.isNull(username) || Objects.isNull(password)) {
                 isInitialized = false;
             } else {
@@ -128,26 +128,12 @@ public class FtpServiceImpl extends AbstractFileService implements FileService {
         return fileItemDTO;
     }
 
-    @Override
-    protected boolean testConnection() {
-        // FTPClient ftpClient = ftp.getClient();
-        // try {
-        //     ftpClient.connect(host, Integer.parseInt(port));
-        //     return ftpClient.login(username, password);
-        // } catch (Exception e) {
-        //     e.printStackTrace();
-        //     return false;
-        // }
-        return true;
-    }
-
     private void ifDisConnectionReConnection() {
         FTPClient ftpClient = ftp.getClient();
         try {
             // 验证FTP服务器是否登录成功
             int replyCode = ftpClient.getReplyCode();
 
-            // ftpClient.reinitialize();
             if (!FTPReply.isPositiveCompletion(replyCode)) {
                 System.out.println("断开了连接, 已尝试重新连接.");
                 ftpClient.connect(host, Integer.parseInt(port));

src/main/java/im/zhaojun/zfile/service/impl/HuaweiServiceImpl.java

@@ -1,15 +1,15 @@
-package im.zhaojun.huawei.service;
+package im.zhaojun.zfile.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractS3FileService;
-import im.zhaojun.common.service.FileService;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.constant.StorageConfigConstant;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.AbstractS3BaseFileService;
+import im.zhaojun.zfile.service.base.BaseFileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import java.util.Objects;
  * @author zhaojun
  */
 @Service
-public class HuaweiServiceImpl extends AbstractS3FileService implements FileService {
+public class HuaweiServiceImpl extends AbstractS3BaseFileService implements BaseFileService {
 
     private static final Logger log = LoggerFactory.getLogger(HuaweiServiceImpl.class);
 

src/main/java/im/zhaojun/zfile/service/impl/LocalServiceImpl.java

@@ -1,18 +1,18 @@
-package im.zhaojun.local.service;
+package im.zhaojun.zfile.service.impl;
 
-import im.zhaojun.common.exception.NotExistFileException;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.SystemConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.constant.SystemConfigConstant;
-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.repository.SystemConfigRepository;
-import im.zhaojun.common.service.AbstractFileService;
-import im.zhaojun.common.service.FileService;
-import im.zhaojun.common.service.StorageConfigService;
-import im.zhaojun.common.util.StringUtils;
+import im.zhaojun.zfile.exception.NotExistFileException;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.entity.SystemConfig;
+import im.zhaojun.zfile.model.constant.StorageConfigConstant;
+import im.zhaojun.zfile.model.constant.SystemConfigConstant;
+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.repository.SystemConfigRepository;
+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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -29,7 +29,7 @@ import java.util.Objects;
  * @author zhaojun
  */
 @Service
-public class LocalServiceImpl extends AbstractFileService implements FileService {
+public class LocalServiceImpl extends AbstractBaseFileService implements BaseFileService {
 
     private static final Logger log = LoggerFactory.getLogger(LocalServiceImpl.class);
 

src/main/java/im/zhaojun/zfile/service/impl/MinIOServiceImpl.java

@@ -1,15 +1,15 @@
-package im.zhaojun.minio;
+package im.zhaojun.zfile.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractS3FileService;
-import im.zhaojun.common.service.FileService;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.constant.StorageConfigConstant;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.AbstractS3BaseFileService;
+import im.zhaojun.zfile.service.base.BaseFileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import java.util.Objects;
  * @author zhaojun
  */
 @Service
-public class MinIOServiceImpl extends AbstractS3FileService implements FileService {
+public class MinIOServiceImpl extends AbstractS3BaseFileService implements BaseFileService {
 
     private static final Logger log = LoggerFactory.getLogger(MinIOServiceImpl.class);
 

src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java

@@ -1,12 +1,12 @@
-package im.zhaojun.onedrive.china.service;
+package im.zhaojun.zfile.service.impl;
 
-import im.zhaojun.common.config.GlobalScheduleTask;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.FileService;
-import im.zhaojun.common.service.StorageConfigService;
-import im.zhaojun.onedrive.common.service.AbstractOneDriveService;
+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.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.BaseFileService;
+import im.zhaojun.zfile.service.StorageConfigService;
+import im.zhaojun.zfile.service.base.AbstractOneDriveServiceBase;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -20,7 +20,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-public class OneDriveChinaServiceImpl extends AbstractOneDriveService implements FileService {
+public class OneDriveChinaServiceImpl extends AbstractOneDriveServiceBase implements BaseFileService {
 
     @Resource
     private GlobalScheduleTask globalScheduleTask;

src/main/java/im/zhaojun/zfile/service/impl/OneDriveServiceImpl.java

@@ -1,12 +1,12 @@
-package im.zhaojun.onedrive.international.service;
+package im.zhaojun.zfile.service.impl;
 
-import im.zhaojun.common.config.GlobalScheduleTask;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.FileService;
-import im.zhaojun.common.service.StorageConfigService;
-import im.zhaojun.onedrive.common.service.AbstractOneDriveService;
+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.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.BaseFileService;
+import im.zhaojun.zfile.service.StorageConfigService;
+import im.zhaojun.zfile.service.base.AbstractOneDriveServiceBase;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -20,7 +20,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-public class OneDriveServiceImpl extends AbstractOneDriveService implements FileService {
+public class OneDriveServiceImpl extends AbstractOneDriveServiceBase implements BaseFileService {
 
     @Resource
     private GlobalScheduleTask globalScheduleTask;

src/main/java/im/zhaojun/zfile/service/impl/QiniuServiceImpl.java

@@ -1,15 +1,15 @@
-package im.zhaojun.qiniu.service;
+package im.zhaojun.zfile.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractS3FileService;
-import im.zhaojun.common.service.FileService;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.constant.StorageConfigConstant;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.AbstractS3BaseFileService;
+import im.zhaojun.zfile.service.base.BaseFileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import java.util.Objects;
  * @author zhaojun
  */
 @Service
-public class QiniuServiceImpl extends AbstractS3FileService implements FileService {
+public class QiniuServiceImpl extends AbstractS3BaseFileService implements BaseFileService {
 
     private static final Logger log = LoggerFactory.getLogger(QiniuServiceImpl.class);
 

src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java

@@ -1,15 +1,15 @@
-package im.zhaojun.s3;
+package im.zhaojun.zfile.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractS3FileService;
-import im.zhaojun.common.service.FileService;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.constant.StorageConfigConstant;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.AbstractS3BaseFileService;
+import im.zhaojun.zfile.service.base.BaseFileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import java.util.Objects;
  * @author zhaojun
  */
 @Service
-public class S3ServiceImpl extends AbstractS3FileService implements FileService {
+public class S3ServiceImpl extends AbstractS3BaseFileService implements BaseFileService {
 
     private static final Logger log = LoggerFactory.getLogger(S3ServiceImpl.class);
 

src/main/java/im/zhaojun/zfile/service/impl/TencentServiceImpl.java

@@ -1,15 +1,15 @@
-package im.zhaojun.tencent;
+package im.zhaojun.zfile.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractS3FileService;
-import im.zhaojun.common.service.FileService;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.constant.StorageConfigConstant;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.base.AbstractS3BaseFileService;
+import im.zhaojun.zfile.service.base.BaseFileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import java.util.Objects;
  * @author zhaojun
  */
 @Service
-public class TencentServiceImpl extends AbstractS3FileService implements FileService {
+public class TencentServiceImpl extends AbstractS3BaseFileService implements BaseFileService {
 
     private static final Logger log = LoggerFactory.getLogger(TencentServiceImpl.class);
 

src/main/java/im/zhaojun/zfile/service/impl/UFileServiceImpl.java

@@ -1,7 +1,6 @@
-package im.zhaojun.ufile.service;
+package im.zhaojun.zfile.service.impl;
 
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.upyun.service.UpYunServiceImpl;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/im/zhaojun/zfile/service/impl/UpYunServiceImpl.java

@@ -1,18 +1,18 @@
-package im.zhaojun.upyun.service;
+package im.zhaojun.zfile.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.URLUtil;
 import com.UpYun;
-import im.zhaojun.common.exception.NotExistFileException;
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.constant.StorageConfigConstant;
-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.service.AbstractFileService;
-import im.zhaojun.common.service.FileService;
-import im.zhaojun.common.service.StorageConfigService;
-import im.zhaojun.common.util.StringUtils;
+import im.zhaojun.zfile.exception.NotExistFileException;
+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.enums.FileTypeEnum;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -28,7 +28,7 @@ import java.util.Objects;
  */
 @Service
 @Slf4j
-public class UpYunServiceImpl extends AbstractFileService implements FileService {
+public class UpYunServiceImpl extends AbstractBaseFileService implements BaseFileService {
 
     private static final String END_MARK = "g2gCZAAEbmV4dGQAA2VvZg";
 

src/main/java/im/zhaojun/zfile/service/support/FileAsyncCacheService.java

@@ -1,11 +1,14 @@
-package im.zhaojun.common.service;
+package im.zhaojun.zfile.service.support;
 
-import im.zhaojun.common.cache.ZFileCache;
-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 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.base.AbstractBaseFileService;
+import im.zhaojun.zfile.service.base.BaseFileService;
+import im.zhaojun.zfile.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
@@ -61,7 +64,7 @@ public class FileAsyncCacheService {
             return;
         }
 
-        AbstractFileService fileService = StorageTypeFactory.getStorageTypeService(storageStrategy);
+        AbstractBaseFileService fileService = StorageTypeFactory.getStorageTypeService(storageStrategy);
 
         if (fileService.getIsUnInitialized()) {
             log.debug("存储策略 {} 未初始化成功, 跳过缓存.", storageStrategy.getDescription());
@@ -73,7 +76,7 @@ public class FileAsyncCacheService {
         log.info("缓存 {} 所有文件开始", storageStrategy.getDescription());
         long startTime = System.currentTimeMillis();
         try {
-            FileService currentFileService = systemConfigService.getCurrentFileService();
+            BaseFileService currentFileService = systemConfigService.getCurrentFileService();
             List<FileItemDTO> rootFileItems = currentFileService.fileList("/");
             ArrayDeque<FileItemDTO> queue = new ArrayDeque<>(rootFileItems);
 
@@ -145,7 +148,7 @@ public class FileAsyncCacheService {
                     }
 
                     zFileCache.remove(key);
-                    AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
+                    AbstractBaseFileService currentFileService = systemConfigService.getCurrentFileService();
                     try {
                         if (Objects.equals(currentStorageStrategy, systemConfigService.getCurrentStorageStrategy())) {
                             currentFileService.fileList(key);

src/main/java/im/zhaojun/zfile/service/support/FileCacheService.java

@@ -1,6 +1,7 @@
-package im.zhaojun.common.service;
+package im.zhaojun.zfile.service.support;
 
-import im.zhaojun.common.cache.ZFileCache;
+import im.zhaojun.zfile.cache.ZFileCache;
+import im.zhaojun.zfile.service.SystemConfigService;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 

src/main/java/im/zhaojun/zfile/service/support/SystemMonitorService.java

@@ -1,6 +1,6 @@
-package im.zhaojun.common.service;
+package im.zhaojun.zfile.service.support;
 
-import im.zhaojun.common.model.SystemMonitorInfo;
+import im.zhaojun.zfile.model.support.SystemMonitorInfo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -12,4 +12,5 @@ public class SystemMonitorService {
     public SystemMonitorInfo systemMonitorInfo() {
         return new SystemMonitorInfo();
     }
-}
+
+}

src/main/java/im/zhaojun/zfile/util/AudioHelper.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.util;
+package im.zhaojun.zfile.util;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.io.FileUtil;
@@ -10,8 +10,8 @@ import com.mpatric.mp3agic.ID3v2;
 import com.mpatric.mp3agic.InvalidDataException;
 import com.mpatric.mp3agic.Mp3File;
 import com.mpatric.mp3agic.UnsupportedTagException;
-import im.zhaojun.common.model.constant.ZFileConstant;
-import im.zhaojun.common.model.dto.AudioInfoDTO;
+import im.zhaojun.zfile.model.constant.ZFileConstant;
+import im.zhaojun.zfile.model.dto.AudioInfoDTO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/im/zhaojun/zfile/util/FileComparator.java

@@ -1,7 +1,7 @@
-package im.zhaojun.common.util;
+package im.zhaojun.zfile.util;
 
-import im.zhaojun.common.model.dto.FileItemDTO;
-import im.zhaojun.common.model.enums.FileTypeEnum;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
+import im.zhaojun.zfile.model.enums.FileTypeEnum;
 
 import java.util.Comparator;
 

src/main/java/im/zhaojun/zfile/util/FileUtil.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.util;
+package im.zhaojun.zfile.util;
 
 import cn.hutool.core.util.URLUtil;
 import org.springframework.core.io.FileSystemResource;

src/main/java/im/zhaojun/zfile/util/HttpUtil.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.util;
+package im.zhaojun.zfile.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.client.RestClientException;

src/main/java/im/zhaojun/zfile/util/NaturalOrderComparator.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.util;
+package im.zhaojun.zfile.util;
 /*
  NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java.
  Copyright (C) 2003 by Pierre-Luc Paour <natorder@paour.com>
@@ -25,8 +25,13 @@ package im.zhaojun.common.util;
 
 import java.util.Comparator;
 
+/**
+ * @author zhaojun
+ */
 public class NaturalOrderComparator implements Comparator<String> {
 
+    private static final char ZERO_CHAR = '0';
+
     private int compareRight(String a, String b) {
         int bias = 0, ia = 0, ib = 0;
 
@@ -61,9 +66,10 @@ public class NaturalOrderComparator implements Comparator<String> {
         }
     }
 
+    @Override
     public int compare(String a, String b) {
         int ia = 0, ib = 0;
-        int nza = 0, nzb = 0;
+        int nza, nzb;
         char ca, cb;
 
         while (true) {
@@ -74,8 +80,8 @@ public class NaturalOrderComparator implements Comparator<String> {
             cb = charAt(b, ib);
 
             // skip over leading spaces or zeros
-            while (Character.isSpaceChar(ca) || ca == '0') {
-                if (ca == '0') {
+            while (Character.isSpaceChar(ca) || ca == ZERO_CHAR) {
+                if (ca == ZERO_CHAR) {
                     nza++;
                 } else {
                     // Only count consecutive zeroes
@@ -130,11 +136,13 @@ public class NaturalOrderComparator implements Comparator<String> {
     }
 
     private static int compareEqual(String a, String b, int nza, int nzb) {
-        if (nza - nzb != 0)
+        if (nza - nzb != 0) {
             return nza - nzb;
+        }
 
-        if (a.length() == b.length())
+        if (a.length() == b.length()) {
             return a.compareTo(b);
+        }
 
         return a.length() - b.length();
     }

src/main/java/im/zhaojun/zfile/util/SpringContextHolder.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.util;
+package im.zhaojun.zfile.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/im/zhaojun/zfile/util/StartupListener.java

@@ -1,14 +1,10 @@
-package im.zhaojun.common.util;
+package im.zhaojun.zfile.util;
 
 import cn.hutool.core.net.NetUtil;
-import im.zhaojun.common.cache.ZFileCache;
-import im.zhaojun.common.exception.InitializeException;
-import im.zhaojun.common.service.AbstractFileService;
-import im.zhaojun.common.service.FileAsyncCacheService;
-import im.zhaojun.common.service.SystemConfigService;
-import lombok.SneakyThrows;
+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.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.env.Environment;

src/main/java/im/zhaojun/zfile/util/StringUtils.java

@@ -1,4 +1,4 @@
-package im.zhaojun.common.util;
+package im.zhaojun.zfile.util;
 
 import cn.hutool.core.util.ObjectUtil;