🔖 升级版本为 0.6

README.md

@@ -9,7 +9,7 @@
 
 前端基于 [h5ai](https://larsjung.de/h5ai/) 的原有功能使用 Vue 重新开发了一遍. 后端采用 SpringBoot, 数据库采用内嵌数据库.
 
-预览地址: [http://zfile.jun6.net](http://zfile.jun6.net)
+预览地址: [https://zfile.jun6.net](https://zfile.jun6.net)
 
 ## 系统特色
 
@@ -18,7 +18,7 @@
 * 个性化配置
 * 自定义目录的 header 和 footer 说明文件
 * 文件夹密码
-* 支持在线浏览文本文件, 视频, 图片, 音乐.
+* 支持在线浏览文本文件, 视频, 图片, 音乐. (支持 FLV 和 HLS)
 * 文件/目录二维码
 * 缓存动态开启, 缓存自动刷新
 * 全局搜索
@@ -28,25 +28,25 @@
 安装 JDK 1.8 : 
 
 ```bash
-yum instal -y java # 适用于 Centos 7.x
+yum install -y java # 适用于 Centos 7.x
 ```
 
 下载项目:
 
 ```bash
-wget https://github.com/zhaojun1998/zfile/releases/download/0.3/zfile-0.3.jar
+wget https://github.com/zhaojun1998/zfile/releases/download/0.6/zfile-0.6.jar
 ```
 
 启动项目:
 
 ```bash
-java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.jar
+java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.6.jar
 
 ## 高级启动
-java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.jar --server.port=18777
+java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.6.jar --server.port=18777
 
 ## 后台运行
-nohup java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.jar &
+nohup java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.6.jar &
 ```
 
 > 系统使用的是内置配置文件, 默认配置请参考: [application.yml](https://github.com/zhaojun1998/zfile/blob/master/src/main/resources/application.yml)
@@ -57,13 +57,6 @@ nohup java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.jar &
 
 > *指定 `-Djava.security.egd=file:/dev/./urandom` 是为了防止在 Linux 环境中, 生成首次登陆生成 sessionId 取系统随机数过慢的问题.*
 
-重要参数:
-- `server.port` 为指定端口, 默认为 `8080`
-- `logging.path` 为日志文件存放路径, 默认为 `${user.home}/.zfile/logs`
-- `spring.datasource` 下配置了 `h2` 和 `mysql` 两种数据库的支持,  默认采用 `h2`.
-- `spring.cache.type` 为指定缓存方式, 默认为 `caffeine`, 即内存缓存, 无需安装, 支持切换为 `redis`, 但需配置 `spring.redis.host` 和 `spring.redis.password` 参数后才可使用.
-
-
 访问地址:
 
 用户前台: http://127.0.0.1:8080/#/main
@@ -85,12 +78,10 @@ nohup java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.jar &
 
 缓存默认支持 `h2` 和 `mysql`, 前者为嵌入式数据库, 无需安装, 但后者相对性能更好.
 
-
 ### 默认路径
 
 默认 H2 数据库文件地址: `~/.zfile/db/`, `~` 表示用户目录, windows 为 `C:/Users/用户名/`, linux 为 `/home/用户名/`, root 用户为 `/root/`
 
-
 ### 头尾文件和加密文件
 
 - 目录头部显示文件名为 `header.md`

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>im.zhaojun</groupId>
     <artifactId>zfile</artifactId>
-    <version>0.3</version>
+    <version>0.6</version>
     <name>zfile</name>
     <description>一个在线的文件浏览系统</description>
 
@@ -65,7 +65,7 @@
             <version>4.5.11</version>
         </dependency>
 
-        <!-- 存储引擎相关 API, 对象存储、FTP、 Rest API-->
+        <!-- 存储策略相关 API, 对象存储、FTP、 Rest API-->
         <dependency>
             <groupId>com.upyun</groupId>
             <artifactId>java-sdk</artifactId>
@@ -104,6 +104,20 @@
             <groupId>com.alicp.jetcache</groupId>
             <artifactId>jetcache-starter-redis</artifactId>
             <version>2.5.14</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alicp.jetcache</groupId>
+                    <artifactId>jetcache-redis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>redis.clients</groupId>
+                    <artifactId>jedis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.esotericsoftware</groupId>
+                    <artifactId>kryo</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -35,12 +36,19 @@ public class AliyunServiceImpl extends AbstractS3FileService implements FileServ
             super.domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
             super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
 
-            BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
-            super.s3Client = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "oss")).build();
+            if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
+                log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());
+                isInitialized = false;
+            } else {
+                BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+
+                super.s3Client = AmazonS3ClientBuilder.standard()
+                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "oss")).build();
+                isInitialized = testConnection();
+            }
+
 
-            isInitialized = testConnection();
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

src/main/java/im/zhaojun/common/aspect/StorageStrategyInitCheckAspect.java

@@ -19,9 +19,13 @@ public class StorageStrategyInitCheckAspect {
     public void logStart() {
         SystemConfigService systemConfigService = SpringContextHolder.getBean(SystemConfigService.class);
         AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
-        if (currentFileService == null || !currentFileService.getIsInitialized()) {
+        if (currentFileService == null) {
+            throw new StorageStrategyUninitializedException("存储策略尚未初始化, 请联系管理员!");
+        }
+        if (currentFileService.getIsUnInitialized()) {
             throw new StorageStrategyUninitializedException("存储策略异常, 请联系管理员!");
         }
+
     }
 
 }

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

@@ -13,10 +13,13 @@ import org.slf4j.LoggerFactory;
 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 java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 后台管理
@@ -49,6 +52,24 @@ public class AdminController {
     /**
      * 更新系统配置
      */
+    @PostMapping("/config")
+    public ResultBean updateConfig(SystemConfigDTO systemConfigDTO) throws Exception {
+        StorageTypeEnum currentStorageStrategy = systemConfigService.getCurrentStorageStrategy();
+
+        systemConfigDTO.setId(1);
+        systemConfigService.updateSystemConfig(systemConfigDTO);
+
+        if (!Objects.equals(currentStorageStrategy, systemConfigDTO.getStorageStrategy())) {
+            log.info("已将存储策略由 {} 切换为 {}", currentStorageStrategy, systemConfigDTO.getStorageStrategy());
+            refreshStorageStrategy();
+        }
+
+        return ResultBean.success();
+    }
+
+    /**
+     * 修改管理员登陆密码
+     */
     @PostMapping("/update-pwd")
     public ResultBean updatePwd(String username, String password) {
         systemConfigService.updateUsernameAndPwd(username, password);
@@ -56,36 +77,46 @@ public class AdminController {
     }
 
     /**
-     * 更新系统配置
+     * 获取指定存储策略的设置
+     * @param storageType   存储策略
+     * @return              所有设置
      */
-    @PostMapping("/config")
-    public ResultBean updateConfig(SystemConfigDTO systemConfigDTO) {
-        StorageTypeEnum currentStorageStrategy = systemConfigService.getCurrentStorageStrategy();
-
-        systemConfigDTO.setId(1);
-        systemConfigService.updateSystemConfig(systemConfigDTO);
-
-        if (!currentStorageStrategy.equals(systemConfigDTO.getStorageStrategy())) {
-            refreshStorageStrategy();
-        }
-
-        return ResultBean.success();
-    }
-
-
     @GetMapping("/strategy-form")
     public ResultBean getFormByStorageType(StorageTypeEnum storageType) {
         List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageType);
         return ResultBean.success(storageConfigList);
     }
 
+
     /**
-     * 清理当前启用的存储引擎的缓存
+     * 保存存储策略
+     * @param storageStrategyConfig     保存表单值
+     * @param storageStrategy           所属策略
+     * @return                          操作结果
+     * @throws Exception                表单解析出错异常
      */
-    @GetMapping("/clear-cache")
-    public ResultBean clearCache() {
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
-        fileService.clearCache();
+    @PostMapping("/storage-strategy")
+    public ResultBean save(@RequestParam Map<String, String> storageStrategyConfig, StorageTypeEnum storageStrategy) throws Exception {
+        List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageStrategy);
+        for (StorageConfig storageConfig : storageConfigList) {
+            String key = storageConfig.getKey();
+            String value = storageStrategyConfig.get(key);
+            storageConfig.setValue(value);
+        }
+        storageConfigService.updateStorageConfig(storageConfigList);
+
+        StorageTypeEnum currentStorageStrategy = systemConfigService.getCurrentStorageStrategy();
+        if (Objects.equals(storageStrategy, currentStorageStrategy)) {
+            if (log.isDebugEnabled()) {
+                log.debug("检测到更新了当前启用的存储策略 {}, 已清理缓存.", currentStorageStrategy);
+            }
+
+            AbstractFileService fileService = systemConfigService.getCurrentFileService();
+            fileService.clearFileCache();
+            fileService.init();
+            fileAsyncCacheService.cacheGlobalFile();
+        }
+
         return ResultBean.success();
     }
 
@@ -106,10 +137,10 @@ public class AdminController {
         } else {
             AbstractFileService fileService = systemConfigService.getCurrentFileService();
             fileService.init();
-            log.info("当前启用存储类型: {}", storageStrategy.getDescription());
+            log.info("切换至存储类型: {}", storageStrategy.getDescription());
 
-            // if 判断是否开启搜索.
             fileAsyncCacheService.cacheGlobalFile();
         }
     }
+
 }

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

@@ -0,0 +1,82 @@
+package im.zhaojun.common.controller;
+
+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 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
+ * @date 2020/1/11 14:03
+ */
+@RestController
+@RequestMapping("/admin/cache")
+public class CacheController {
+
+    @Resource
+    private SystemConfigService systemConfigService;
+
+    @Resource
+    private FileAsyncCacheService fileAsyncCacheService;
+
+    @Resource
+    private FileCacheService fileCacheService;
+
+    @PostMapping("/enable")
+    public ResultBean enableCache() throws Exception {
+        fileCacheService.enableCache();
+        return ResultBean.success();
+    }
+
+    @PostMapping("/disable")
+    public ResultBean disableCache() throws Exception {
+        fileCacheService.disableCache();
+        return ResultBean.success();
+    }
+
+    @GetMapping("/config")
+    public ResultBean cacheConfig() throws Exception {
+        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        Set<String> cacheKeys = fileService.getCacheKeys();
+
+        CacheConfigDTO cacheConfigDTO = new CacheConfigDTO();
+        cacheConfigDTO.setEnableCache(systemConfigService.getEnableCache());
+        cacheConfigDTO.setCacheFinish(fileAsyncCacheService.isCacheFinish());
+        cacheConfigDTO.setCacheKeys(cacheKeys);
+        cacheConfigDTO.setCacheDirectoryCount(fileAsyncCacheService.getCacheDirectoryCount());
+        cacheConfigDTO.setCacheFileCount(fileAsyncCacheService.getCacheFileCount());
+        return ResultBean.success(cacheConfigDTO);
+    }
+
+    @PostMapping("/refresh")
+    public ResultBean refreshCache(String key) throws Exception {
+        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        fileService.refreshCache(key);
+        return ResultBean.success();
+    }
+
+    @PostMapping("/clear")
+    public ResultBean clearCache(String key) throws Exception {
+        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        fileService.clearFileCache();
+        fileAsyncCacheService.resetCacheCount();
+        return ResultBean.success();
+    }
+
+    @PostMapping("/all")
+    public ResultBean cacheAll() throws Exception {
+        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        fileService.clearFileCache();
+        fileAsyncCacheService.cacheGlobalFile();
+        return ResultBean.success();
+    }
+}

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

@@ -3,14 +3,13 @@ package im.zhaojun.common.controller;
 import cn.hutool.core.util.URLUtil;
 import im.zhaojun.common.annotation.CheckStorageStrategyInit;
 import im.zhaojun.common.exception.SearchDisableException;
-import im.zhaojun.common.model.StorageConfig;
 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.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.service.SystemService;
@@ -44,6 +43,9 @@ public class FileController {
     @Resource
     private StorageConfigService storageConfigService;
 
+    @Resource
+    private FileAsyncCacheService fileAsyncCacheService;
+
     /**
      * 滚动加载每页条数.
      */
@@ -82,21 +84,44 @@ public class FileController {
         int start = (page - 1) * PAGE_SIZE;
         int end = page * PAGE_SIZE;
         end = Math.min(end, total);
-        List<FileItemDTO> fileSubItem = fileItemList.subList(start, end);
+        List<FileItemDTO> fileSubItem = new ArrayList<>(fileItemList.subList(start, end));
         return ResultBean.successData(fileSubItem);
     }
 
+
     /**
      * 获取文件类容, 仅限用于, txt, md, ini 等普通文本文件.
      * @param url   文件路径
      * @return       文件内容
      */
-    @CheckStorageStrategyInit
     @GetMapping("/content")
     public ResultBean getContent(String url) {
         return ResultBean.successData(HttpUtil.getTextContent(url));
     }
 
+
+    /**
+     * 获取文件类容, 仅限用于, txt, md, ini 等普通文本文件.
+     * @param url   文件路径
+     * @return       文件内容
+     */
+    @GetMapping("/content/origin")
+    public String getContentOrigin(String url) {
+        return HttpUtil.getTextContent(url);
+    }
+
+
+    /**
+     * 检测文件是否存在
+     * @param url   文件路径
+     * @return      是否存在
+     */
+    @GetMapping("/content/exist")
+    public boolean checkFileExist(String url) {
+        return HttpUtil.checkUrlExist(url);
+    }
+
+
     /**
      * 获取系统配置信息和当前页的标题, 文件头, 文件尾信息
      * @param path          路径
@@ -109,15 +134,6 @@ public class FileController {
         return ResultBean.successData(config);
     }
 
-    @CheckStorageStrategyInit
-    @GetMapping("/clearCache")
-    public ResultBean clearCache() {
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
-        if (fileService != null) {
-            fileService.clearCache();
-        }
-        return ResultBean.success();
-    }
 
     @CheckStorageStrategyInit
     @GetMapping("/audioInfo")
@@ -125,6 +141,7 @@ public class FileController {
         return ResultBean.success(AudioHelper.getAudioInfo(url));
     }
 
+
     @CheckStorageStrategyInit
     @GetMapping("/search")
     public ResultBean search(@RequestParam(value = "name", defaultValue = "/") String name) throws Exception {
@@ -133,16 +150,12 @@ public class FileController {
         if (!systemConfigDTO.getSearchEnable()) {
             throw new SearchDisableException("搜索功能未开启");
         }
+        if (!fileAsyncCacheService.isCacheFinish()) {
+            throw new SearchDisableException("搜索功能缓存预热中, 请稍后再试");
+        }
         return ResultBean.success(fileService.search(URLUtil.decode(name)));
     }
 
-    @GetMapping("/form")
-    public ResultBean getFormByStorageType(String storageType) {
-        StorageTypeEnum storageTypeEnum = StorageTypeEnum.getEnum(storageType);
-        List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageTypeEnum);
-        storageConfigList.forEach(storageConfig -> storageConfig.setValue(null));
-        return ResultBean.success(storageConfigList);
-    }
 
     /**
      * 过滤文件列表, 不显示密码, 头部和尾部文件.

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

@@ -6,25 +6,22 @@ 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.AbstractFileService;
+import im.zhaojun.common.service.FileAsyncCacheService;
 import im.zhaojun.common.service.StorageConfigService;
 import im.zhaojun.common.service.SystemConfigService;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * 系统安装初始化
  * @author zhaojun
  */
-@Controller
+@RestController
 public class InstallController {
 
     @Resource
@@ -36,8 +33,10 @@ public class InstallController {
     @Resource
     private AdminController adminController;
 
+    @Resource
+    private FileAsyncCacheService fileAsyncCacheService;
+
     @GetMapping("/is-installed")
-    @ResponseBody
     public ResultBean isInstall() {
         if (systemConfigService.getCurrentStorageStrategy() == null) {
             return ResultBean.success();
@@ -47,8 +46,7 @@ public class InstallController {
 
 
     @PostMapping("/install")
-    @ResponseBody
-    public ResultBean install(InstallModelDTO installModelDTO) {
+    public ResultBean install(InstallModelDTO installModelDTO) throws Exception {
         SystemConfigDTO systemConfigDTO = systemConfigService.getSystemConfig();
 
         if (systemConfigDTO.getStorageStrategy() != null) {
@@ -77,24 +75,13 @@ public class InstallController {
         return ResultBean.success();
     }
 
-    @PostMapping("/storage-strategy")
-    @ResponseBody
-    public ResultBean save(@RequestParam Map<String, String> storageStrategyConfig, StorageTypeEnum storageStrategy) {
-        List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageStrategy);
-        for (StorageConfig storageConfig : storageConfigList) {
-            String key = storageConfig.getKey();
-            String value = storageStrategyConfig.get(key);
-            storageConfig.setValue(value);
-        }
-        storageConfigService.updateStorageConfig(storageConfigList);
 
-        StorageTypeEnum currentStorageStrategy = systemConfigService.getCurrentStorageStrategy();
-        if (Objects.equals(storageStrategy, currentStorageStrategy)) {
-            AbstractFileService fileService = systemConfigService.getCurrentFileService();
-            fileService.clearCache();
-            fileService.init();
-        }
-
-        return ResultBean.success();
+    @GetMapping("/form")
+    public ResultBean getFormByStorageType(String storageType) {
+        StorageTypeEnum storageTypeEnum = StorageTypeEnum.getEnum(storageType);
+        List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageTypeEnum);
+        storageConfigList.forEach(storageConfig -> storageConfig.setValue(null));
+        return ResultBean.success(storageConfigList);
     }
-}
+
+}

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

@@ -0,0 +1,18 @@
+package im.zhaojun.common.model.dto;
+
+import lombok.Data;
+
+import java.util.Set;
+
+/**
+ * @author zhaojun
+ * @date 2020/1/3 12:39
+ */
+@Data
+public class CacheConfigDTO {
+    private boolean enableCache;
+    private boolean cacheFinish;
+    private Set<String> cacheKeys;
+    private Integer cacheDirectoryCount;
+    private Integer cacheFileCount;
+}

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

@@ -53,7 +53,7 @@ public enum StorageTypeEnum {
     }
 
     public static StorageTypeEnum getEnum(String value) {
-        return enumMap.get(value);
+        return enumMap.get(value.toLowerCase());
     }
 
 }

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

@@ -12,6 +12,8 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.firewall.HttpFirewall;
+import org.springframework.security.web.firewall.StrictHttpFirewall;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -98,6 +100,13 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter {
         http.csrf().disable();
     }
 
+    @Bean
+    public HttpFirewall allowUrlEncodedSlashHttpFirewall() {
+        StrictHttpFirewall firewall = new StrictHttpFirewall();
+        firewall.setAllowUrlEncodedPercent(true);
+        return firewall;
+    }
+
     @Override
     public void configure(AuthenticationManagerBuilder web) throws Exception {
         web.userDetailsService(myUserDetailsServiceImpl()).passwordEncoder(passwordEncoder());
@@ -112,6 +121,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) {
         //对于在header里面增加token等类似情况，放行所有OPTIONS请求。
         web.ignoring().antMatchers(HttpMethod.OPTIONS, "/**");
+        web.httpFirewall(allowUrlEncodedSlashHttpFirewall());
     }
 
     @Bean

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

@@ -1,6 +1,7 @@
 package im.zhaojun.common.service;
 
 import com.alicp.jetcache.Cache;
+import com.alicp.jetcache.RefreshPolicy;
 import com.alicp.jetcache.anno.CacheRefresh;
 import com.alicp.jetcache.anno.CacheType;
 import com.alicp.jetcache.anno.Cached;
@@ -14,25 +15,37 @@ import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Value;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * @author zhaojun
  * @date 2019/12/28 19:27
  */
 @Slf4j
-public abstract class AbstractFileService implements FileService {
+public abstract class AbstractFileService extends FileCacheService implements FileService {
+
+    public static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-cache:";
 
     @Value("${zfile.cache.timeout}")
     protected Long timeout;
 
     protected boolean isInitialized;
 
-    @CreateCache(name = "zfile-cache:")
-    private Cache<String, Object> userCache;
+    @Resource
+    private SystemConfigService systemConfigService;
+
+    @Resource
+    private FileAsyncCacheService fileAsyncCacheService;
+
+    @CreateCache(name = SYSTEM_CONFIG_CACHE_PREFIX, cacheType = CacheType.LOCAL)
+    private Cache<String, List<FileItemDTO>> cache;
 
     /***
      * 获取指定路径下的文件及文件夹, 默认缓存 60 分钟，每隔 30 分钟刷新一次.
@@ -41,17 +54,20 @@ public abstract class AbstractFileService implements FileService {
      * @throws Exception  获取文件列表中出现的异常
      */
     @Override
-    @Cached(name = "zfile-cache:",
+    @Cached(name = SYSTEM_CONFIG_CACHE_PREFIX,
             key =  "args[0]",
-            cacheType = CacheType.LOCAL, condition = "mvel{bean('systemConfigService').enableCache}")
+            cacheType = CacheType.LOCAL, localLimit = 100000, condition = "mvel{bean('systemConfigService').enableCache}")
     @CacheRefresh(refresh = 30, timeUnit = TimeUnit.MINUTES)
     public abstract List<FileItemDTO> fileList(String path) throws Exception;
 
-
     /**
-     * 清理当前存储引擎的缓存
+     * 清理当前存储策略的缓存
      */
-    public void clearCache() {
+    public void clearFileCache() throws Exception {
+        Set<String> cacheKeys = getCacheKeys();
+        cache.removeAll(cacheKeys);
+        closeCacheAutoRefresh();
+        fileAsyncCacheService.setCacheFinish(false);
     }
 
     /**
@@ -65,7 +81,7 @@ public abstract class AbstractFileService implements FileService {
         try {
             fileList("/");
         } catch (Exception e) {
-            e.printStackTrace();
+            log.debug(getStorageTypeEnum().getDescription() + "初始化异常", e);
             flag = false;
         }
         return flag;
@@ -73,22 +89,22 @@ public abstract class AbstractFileService implements FileService {
 
     /**
      * 获取是否初始化成功
-     * @return  初始化成功与否
+     * @return              初始化成功与否
      */
-    public boolean getIsInitialized() {
-        return isInitialized;
+    public boolean getIsUnInitialized() {
+        return !isInitialized;
     }
 
     /**
-     * 获取存储引擎类型
-     * @return  存储引擎类型枚举
+     * 获取存储策略类型
+     * @return              存储策略类型枚举
      */
     public abstract StorageTypeEnum getStorageTypeEnum();
 
     /**
      * 搜索文件
-     * @param name 文件名
-     * @return      包含该文件名的所有文件或文件夹
+     * @param name          文件名
+     * @return              包含该文件名的所有文件或文件夹
      * @throws Exception    搜索过程出现的异常
      */
     public List<FileItemDTO> search(String name) throws Exception {
@@ -105,17 +121,20 @@ public abstract class AbstractFileService implements FileService {
     }
 
     /**
-     * 查询所有文件
-     * @return      所有文件
-     * @throws Exception    异常现象
+     * 查询所有文件, 仅去缓存中查询.
+     * @return              所有文件
      */
     public List<FileItemDTO> selectAllFileList() throws Exception {
         List<FileItemDTO> result = new ArrayList<>();
-
+        boolean enableCache = systemConfigService.getEnableCache();
+        if (!enableCache) {
+            log.debug("未开启缓存, 不支持查询所有文件.");
+            return null;
+        }
         String path = "/";
 
-        FileService currentFileService = (FileService) AopContext.currentProxy();
-        List<FileItemDTO> fileItemList = currentFileService.fileList(path);
+        List<FileItemDTO> fileItemList = cache.get(path);
+        fileItemList = fileItemList == null ? new ArrayList<>() : fileItemList;
         ArrayDeque<FileItemDTO> queue = new ArrayDeque<>(fileItemList);
 
         while (!queue.isEmpty()) {
@@ -123,10 +142,53 @@ public abstract class AbstractFileService implements FileService {
             result.add(fileItemDTO);
             if (fileItemDTO.getType() == FileTypeEnum.FOLDER) {
                 String filePath = StringUtils.removeDuplicateSeparator("/" + fileItemDTO.getPath() + "/" + fileItemDTO.getName() + "/");
-                queue.addAll(currentFileService.fileList(filePath));
+                List<FileItemDTO> cacheList = cache.get(filePath);
+                if (cacheList != null) {
+                    queue.addAll(cacheList);
+                }
             }
-        }
 
+        }
         return result;
     }
+
+    /**
+     * 获取所有缓存的 Key, 仅当开启缓存, 且缓存完成时, 可获取.
+     * @return              所有缓存的 Key
+     * @throws Exception    可能出现的异常
+     */
+    public Set<String> getCacheKeys() throws Exception {
+        if (systemConfigService.getEnableCache() && fileAsyncCacheService.isCacheFinish()) {
+            Set<String> collect = selectAllFileList().stream().map(fileItemDTO -> {
+                if (fileItemDTO.getType() == FileTypeEnum.FOLDER) {
+                    return StringUtils.removeDuplicateSeparator("/" + fileItemDTO.getPath() + "/" + fileItemDTO.getName() + "/");
+                }
+                return null;
+            }).collect(Collectors.toSet());
+            collect.remove(null);
+            collect.add("/");
+            return collect;
+        } else {
+            return Collections.emptySet();
+        }
+    }
+
+    /**
+     * 刷新缓存
+     */
+    public void refreshCache(String key) throws Exception {
+        cache.remove(key);
+        FileService currentFileService = (FileService) AopContext.currentProxy();
+        currentFileService.fileList(key);
+    }
+
+    public void closeCacheAutoRefresh() {
+        cache.config().setRefreshPolicy(null);
+    }
+
+    public void openCacheAutoRefresh() {
+        RefreshPolicy refreshPolicy = RefreshPolicy.newPolicy(30, TimeUnit.MINUTES);
+        cache.config().setRefreshPolicy(refreshPolicy);
+    }
+
 }

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

@@ -21,6 +21,7 @@ import java.util.List;
  * @date 2019/12/26 22:26
  */
 public abstract class AbstractS3FileService extends AbstractFileService {
+
     @Resource
     protected StorageConfigService storageConfigService;
 

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

@@ -1,21 +1,39 @@
 package im.zhaojun.common.service;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alicp.jetcache.Cache;
+import com.alicp.jetcache.anno.CacheType;
+import com.alicp.jetcache.anno.CreateCache;
 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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import im.zhaojun.common.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayDeque;
+import java.util.List;
 
 /**
  * @author zhaojun
  */
+@Slf4j
 @Service
 public class FileAsyncCacheService {
 
-    private static final Logger log = LoggerFactory.getLogger(FileAsyncCacheService.class);
+    public static final String CACHE_PROCESS_PREFIX = "zfile-process-cache:";
+
+    public static final String CACHE_FILE_COUNT_KEY = "file-count";
+
+    public static final String CACHE_DIRECTORY_COUNT_KEY = "directory-count";
+
+    @CreateCache(name = "SYSTEM_CONFIG_CACHE_PREFIX", cacheType = CacheType.LOCAL)
+    private Cache<String, Integer> cache;
+    
+    private boolean cacheFinish;
 
     @Resource
     private SystemConfigService systemConfigService;
@@ -25,22 +43,100 @@ public class FileAsyncCacheService {
         StorageTypeEnum storageStrategy = systemConfigService.getCurrentStorageStrategy();
 
         if (storageStrategy == null) {
-            log.info("尚未配置存储策略. 跳过启动缓存.");
+            log.debug("尚未配置存储策略. 跳过启动缓存.");
+            return;
+        }
+
+        boolean enableCache = systemConfigService.getEnableCache();
+        if (!enableCache) {
+            log.debug("存储策略 {} 未启用缓存, 跳过缓存.", storageStrategy.getDescription());
             return;
         }
 
         AbstractFileService fileService = StorageTypeFactory.getStorageTypeService(storageStrategy);
+
+        if (fileService.getIsUnInitialized()) {
+            log.debug("存储策略 {} 未初始化成功, 跳过缓存.", storageStrategy.getDescription());
+            return;
+        }
+
+        Integer cacheDirectoryCount = cache.get(CACHE_DIRECTORY_COUNT_KEY);
+        if (cacheDirectoryCount == null) {
+            cacheDirectoryCount = 0;
+        }
+
+        Integer cacheFileCount = cache.get(CACHE_FILE_COUNT_KEY);
+        if (cacheFileCount == null) {
+            cacheFileCount = 0;
+        }
+
         log.info("缓存 {} 所有文件开始", storageStrategy.getDescription());
         long startTime = System.currentTimeMillis();
         try {
-            if (fileService.getIsInitialized()) {
-                fileService.selectAllFileList();
+            String path = "/";
+
+            FileService currentFileService = systemConfigService.getCurrentFileService();
+            List<FileItemDTO> rootFileItems = currentFileService.fileList("/");
+            ArrayDeque<FileItemDTO> queue = new ArrayDeque<>(rootFileItems);
+
+            while (!queue.isEmpty()) {
+                FileItemDTO fileItemDTO = queue.pop();
+
+                if (FileTypeEnum.FOLDER.equals(fileItemDTO.getType())) {
+                    cacheDirectoryCount++;
+                }
+                if (FileTypeEnum.FILE.equals(fileItemDTO.getType())) {
+                    cacheFileCount++;
+                }
+
+                log.debug("已缓存 {} 个文件夹", cacheDirectoryCount);
+                cache.put(CACHE_DIRECTORY_COUNT_KEY, cacheDirectoryCount);
+
+                log.debug("已缓存 {} 个文件", cacheFileCount);
+                cache.put(CACHE_FILE_COUNT_KEY, cacheFileCount);
+
+                if (fileItemDTO.getType() == FileTypeEnum.FOLDER) {
+                    String filePath = StringUtils.removeDuplicateSeparator("/" + fileItemDTO.getPath() + "/" + fileItemDTO.getName() + "/");
+
+                    List<FileItemDTO> fileItems = currentFileService.fileList(filePath);
+                    queue.addAll(fileItems);
+                }
             }
+            cache.put(CACHE_DIRECTORY_COUNT_KEY, cacheDirectoryCount);
+            cache.put(CACHE_FILE_COUNT_KEY, cacheFileCount);
         } catch (Exception e) {
             log.error("缓存所有文件失败", e);
             e.printStackTrace();
         }
         long endTime = System.currentTimeMillis();
-        log.info("缓存 {} 所有文件结束, 用时: {} 秒", storageStrategy.getDescription(), ( (endTime - startTime) / 1000 ));
+        log.info("缓存 {} 所有文件结束, 用时: {} 秒, 文件夹共 {} 个, 文件共 {} 个",
+                storageStrategy.getDescription(),
+                ( (endTime - startTime) / 1000 ), cacheDirectoryCount, cacheFileCount);
+        cacheFinish = true;
+    }
+
+
+    /**
+     * 清理缓存的文件/文件夹数量统计
+     */
+    public void resetCacheCount() {
+        cache.remove(CACHE_DIRECTORY_COUNT_KEY);
+        cache.remove(CACHE_FILE_COUNT_KEY);
+    }
+
+    public Integer getCacheDirectoryCount() {
+        return ObjectUtil.defaultIfNull(cache.get(CACHE_DIRECTORY_COUNT_KEY), 0);
+    }
+
+    public Integer getCacheFileCount() {
+        return ObjectUtil.defaultIfNull(cache.get(CACHE_FILE_COUNT_KEY), 0);
+    }
+
+    public boolean isCacheFinish() {
+        return cacheFinish;
+    }
+
+    public void setCacheFinish(boolean cacheFinish) {
+        this.cacheFinish = cacheFinish;
     }
 }

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

@@ -0,0 +1,37 @@
+package im.zhaojun.common.service;
+
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhaojun
+ * @date 2020/1/11 14:08
+ */
+@Service
+public class FileCacheService {
+
+    @Resource
+    private SystemConfigService systemConfigService;
+
+    @Resource
+    private FileAsyncCacheService fileAsyncCacheService;
+
+    public void enableCache() {
+        systemConfigService.updateCacheEnableConfig(true);
+
+        AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
+        currentFileService.openCacheAutoRefresh();
+        fileAsyncCacheService.cacheGlobalFile();
+    }
+
+
+    public void disableCache() throws Exception {
+        systemConfigService.updateCacheEnableConfig(false);
+
+        AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
+        currentFileService.clearFileCache();
+        fileAsyncCacheService.resetCacheCount();
+    }
+
+}

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

@@ -10,7 +10,7 @@ import java.util.List;
 public interface FileService {
 
     /***
-     * 获取指定路径下的文件及文件夹, 默认缓存 60 分钟，每隔 30 分钟刷新一次.
+     * 获取指定路径下的文件及文件夹
      * @param path 文件路径
      * @return     文件及文件夹列表
      * @throws Exception  获取文件列表中出现的异常

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

@@ -1,115 +1,120 @@
 package im.zhaojun.common.service;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.SecureUtil;
+import com.alicp.jetcache.Cache;
+import com.alicp.jetcache.anno.CacheType;
+import com.alicp.jetcache.anno.CreateCache;
 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.common.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * @author zhaojun
  */
+@Slf4j
 @Service
 public class SystemConfigService {
 
+    public static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-config-cache:";
+
+    public static final String SYSTEM_CONFIG_CACHE_KEY = "1";
+
+    @CreateCache(name = SYSTEM_CONFIG_CACHE_PREFIX, cacheType = CacheType.LOCAL)
+    private Cache<String, Object> configCache;
+
     @Resource
     private SystemConfigRepository systemConfigRepository;
 
+    @Resource
+    private FileAsyncCacheService fileAsyncCacheService;
+
+    @Resource
+    private FileCacheService fileCacheService;
+
+    private Class<SystemConfigDTO> systemConfigDTOClass = SystemConfigDTO.class;
+
     public SystemConfigDTO getSystemConfig() {
+        Object cache = configCache.get(SYSTEM_CONFIG_CACHE_KEY);
+        if (configCache.get(SYSTEM_CONFIG_CACHE_KEY) != null) {
+            return (SystemConfigDTO) cache;
+        }
+
         SystemConfigDTO systemConfigDTO = new SystemConfigDTO();
         List<SystemConfig> systemConfigList = systemConfigRepository.findAll();
 
         for (SystemConfig systemConfig : systemConfigList) {
-            switch (systemConfig.getKey()) {
-                case SystemConfigConstant.SITE_NAME:
-                    systemConfigDTO.setSiteName(systemConfig.getValue());
-                    break;
-                case SystemConfigConstant.INFO_ENABLE:
-                    systemConfigDTO.setInfoEnable("true".equals(systemConfig.getValue()));
-                    break;
-                case SystemConfigConstant.SEARCH_ENABLE:
-                    systemConfigDTO.setSearchEnable("true".equals(systemConfig.getValue()));
-                    break;
-                case SystemConfigConstant.SEARCH_IGNORE_CASE:
-                    systemConfigDTO.setSearchIgnoreCase("true".equals(systemConfig.getValue()));
-                    break;
-                case SystemConfigConstant.STORAGE_STRATEGY:
-                    String value = systemConfig.getValue();
-                    systemConfigDTO.setStorageStrategy(StorageTypeEnum.getEnum(value));
-                    break;
-                case SystemConfigConstant.USERNAME:
-                    systemConfigDTO.setUsername(systemConfig.getValue());
-                    break;
-                case SystemConfigConstant.PASSWORD:
-                    systemConfigDTO.setPassword(systemConfig.getValue());
-                    break;
-                case SystemConfigConstant.DOMAIN:
-                    systemConfigDTO.setDomain(systemConfig.getValue());
-                    break;
-                case SystemConfigConstant.ENABLE_CACHE:
-                    systemConfigDTO.setEnableCache("true".equals(systemConfig.getValue()));
-                    break;
-                default:break;
+            String key = systemConfig.getKey();
+
+            try {
+                Field field = systemConfigDTOClass.getDeclaredField(key);
+                if (field != null) {
+                    field.setAccessible(true);
+                    String strVal = systemConfig.getValue();
+                    Object convertVal = Convert.convert(field.getType(), strVal);
+                    field.set(systemConfigDTO, convertVal);
+                }
+            } catch (NoSuchFieldException | IllegalAccessException e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("通过反射, 将字段 {" + key + "}注入 SystemConfigDTO 时出现异常:", e);
+                }
             }
         }
 
+        configCache.put(SYSTEM_CONFIG_CACHE_KEY, systemConfigDTO);
         return systemConfigDTO;
     }
 
-    public void updateSystemConfig(SystemConfigDTO systemConfigDTO) {
+
+    public void updateSystemConfig(SystemConfigDTO systemConfigDTO) throws Exception {
         List<SystemConfig> systemConfigList = new ArrayList<>();
 
-        SystemConfig systemConfig = systemConfigRepository.findByKey(SystemConfigConstant.SITE_NAME);
-        systemConfig.setValue(systemConfigDTO.getSiteName());
-        systemConfigList.add(systemConfig);
-
-        SystemConfig domainConfig = systemConfigRepository.findByKey(SystemConfigConstant.DOMAIN);
-        domainConfig.setValue(systemConfigDTO.getDomain());
-        systemConfigList.add(domainConfig);
-
-        SystemConfig infoEnableSystemConfig = systemConfigRepository.findByKey(SystemConfigConstant.INFO_ENABLE);
-        infoEnableSystemConfig.setValue(systemConfigDTO.getInfoEnable() ? "true" : "false");
-        systemConfigList.add(infoEnableSystemConfig);
-
-        SystemConfig searchEnableSystemConfig = systemConfigRepository.findByKey(SystemConfigConstant.SEARCH_ENABLE);
-        searchEnableSystemConfig.setValue(systemConfigDTO.getSearchEnable() ? "true" : "false");
-        systemConfigList.add(searchEnableSystemConfig);
-
-        SystemConfig searchIgnoreCaseSystemConfig = systemConfigRepository.findByKey(SystemConfigConstant.SEARCH_IGNORE_CASE);
-        searchIgnoreCaseSystemConfig.setValue(systemConfigDTO.getSearchIgnoreCase() ? "true" : "false");
-        systemConfigList.add(searchIgnoreCaseSystemConfig);
-
-        SystemConfig enableCacheSystemConfig = systemConfigRepository.findByKey(SystemConfigConstant.ENABLE_CACHE);
-        enableCacheSystemConfig.setValue(systemConfigDTO.getEnableCache() ? "true" : "false");
-        systemConfigList.add(enableCacheSystemConfig);
-
-        SystemConfig storageStrategySystemConfig = systemConfigRepository.findByKey(SystemConfigConstant.STORAGE_STRATEGY);
-        storageStrategySystemConfig.setValue(systemConfigDTO.getStorageStrategy().getKey());
-        systemConfigList.add(storageStrategySystemConfig);
-
-        if (StringUtils.isNotNullOrEmpty(systemConfigDTO.getUsername())) {
-            SystemConfig usernameSystemConfig = systemConfigRepository.findByKey(SystemConfigConstant.USERNAME);
-            usernameSystemConfig.setValue(systemConfigDTO.getUsername());
-            systemConfigList.add(usernameSystemConfig);
+        Field[] fields = systemConfigDTOClass.getDeclaredFields();
+        for (Field field : fields) {
+            String key = field.getName();
+            SystemConfig systemConfig = systemConfigRepository.findByKey(key);
+            if (systemConfig != null) {
+                field.setAccessible(true);
+                Object val = field.get(systemConfigDTO);
+                if (val != null) {
+                    systemConfig.setValue(val.toString());
+                    systemConfigList.add(systemConfig);
+                }
+            }
         }
 
-        if (StringUtils.isNotNullOrEmpty(systemConfigDTO.getPassword())) {
-            SystemConfig passwordSystemConfig = systemConfigRepository.findByKey(SystemConfigConstant.PASSWORD);
-            passwordSystemConfig.setValue(systemConfigDTO.getPassword());
-            systemConfigList.add(passwordSystemConfig);
-        }
+        boolean oldEnableCache = getEnableCache();
+        boolean curEnableCache = ObjectUtil.defaultIfNull(systemConfigDTO.getEnableCache(), false);
+
+        configCache.remove(SYSTEM_CONFIG_CACHE_KEY);
 
         systemConfigRepository.saveAll(systemConfigList);
+
+        AbstractFileService currentFileService = getCurrentFileService();
+
+        if (!oldEnableCache && curEnableCache) {
+            log.debug("检测到开启了缓存, 开启预热缓存");
+            fileCacheService.enableCache();
+        }
+
+        if (oldEnableCache && !curEnableCache) {
+            log.debug("检测到关闭了缓存, 正在清理缓存数据及关闭自动刷新");
+            fileCacheService.disableCache();
+        }
     }
 
+
     public void updateUsernameAndPwd(String username, String password) {
         SystemConfig usernameConfig = systemConfigRepository.findByKey(SystemConfigConstant.USERNAME);
         usernameConfig.setValue(username);
@@ -119,22 +124,35 @@ public class SystemConfigService {
         SystemConfig systemConfig = systemConfigRepository.findByKey(SystemConfigConstant.PASSWORD);
         systemConfig.setValue(encryptionPassword);
 
+        configCache.remove(SYSTEM_CONFIG_CACHE_KEY);
+
         systemConfigRepository.save(systemConfig);
     }
 
+
+    public void updateCacheEnableConfig(Boolean isEnable) {
+        SystemConfig enableConfig = systemConfigRepository.findByKey(SystemConfigConstant.ENABLE_CACHE);
+        enableConfig.setValue(isEnable.toString());
+        systemConfigRepository.save(enableConfig);
+        configCache.remove(SYSTEM_CONFIG_CACHE_KEY);
+    }
+
+
     public AbstractFileService getCurrentFileService() {
         StorageTypeEnum storageStrategy = getCurrentStorageStrategy();
         return StorageTypeFactory.getStorageTypeService(storageStrategy);
     }
 
+
     public StorageTypeEnum getCurrentStorageStrategy() {
         SystemConfigDTO systemConfigDTO = getSystemConfig();
         return systemConfigDTO.getStorageStrategy();
     }
 
+
     public boolean getEnableCache() {
         SystemConfigDTO systemConfigDTO = getSystemConfig();
-        return systemConfigDTO.getEnableCache();
+        return ObjectUtil.defaultIfNull(systemConfigDTO.getEnableCache(), false);
     }
 
 }

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

@@ -7,6 +7,7 @@ import im.zhaojun.common.util.HttpUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -27,7 +28,7 @@ public class SystemService {
         SiteConfigDTO siteConfigDTO = new SiteConfigDTO();
         AbstractFileService fileService = systemConfigService.getCurrentFileService();
 
-        List<FileItemDTO> fileItemList = fileService.fileList(path);
+        List<FileItemDTO> fileItemList = new ArrayList<>(fileService.fileList(path));
         for (FileItemDTO fileItemDTO : fileItemList) {
             if (ZFileConstant.FOOTER_FILE_NAME.equalsIgnoreCase(fileItemDTO.getName())) {
                 siteConfigDTO.setFooter(HttpUtil.getTextContent(fileItemDTO.getUrl()));

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

@@ -48,7 +48,7 @@ public class AudioHelper {
         AudioInfoDTO audioInfoDTO = new AudioInfoDTO();
         audioInfoDTO.setTitle("未知歌曲");
         audioInfoDTO.setArtist("未知");
-        audioInfoDTO.setCover("/shikwasa/audio.png");
+        audioInfoDTO.setCover("http://c.jun6.net/audio.png");
 
         Mp3File mp3File = null;
         try {

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

@@ -1,10 +1,13 @@
 package im.zhaojun.common.util;
 
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
 /**
  * @author zhaojun
  */
+@Slf4j
 public class HttpUtil {
 
     public static String getTextContent(String url) {
@@ -13,4 +16,14 @@ public class HttpUtil {
         return result == null ? "" : result;
     }
 
+    public static boolean checkUrlExist(String url) {
+        RestTemplate restTemplate = SpringContextHolder.getBean(RestTemplate.class);
+        try {
+            restTemplate.headForHeaders(url);
+            return true;
+        } catch (RestClientException ignored) {
+        }
+        return false;
+    }
+
 }

src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java

@@ -14,13 +14,13 @@ import im.zhaojun.common.util.StringUtils;
 import org.apache.commons.net.ftp.FTPFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -39,24 +39,28 @@ public class FtpServiceImpl extends AbstractFileService implements FileService {
 
     @Override
     public void init() {
-       try {
-           Map<String, StorageConfig> stringStorageConfigMap =
-                   storageConfigService.selectStorageConfigMapByKey(StorageTypeEnum.FTP);
-           String host = stringStorageConfigMap.get(StorageConfigConstant.HOST_KEY).getValue();
-           String port = stringStorageConfigMap.get(StorageConfigConstant.PORT_KEY).getValue();
-           String username = stringStorageConfigMap.get(StorageConfigConstant.USERNAME_KEY).getValue();
-           String password = stringStorageConfigMap.get(StorageConfigConstant.PASSWORD_KEY).getValue();
-           domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
+        try {
+            Map<String, StorageConfig> stringStorageConfigMap =
+                    storageConfigService.selectStorageConfigMapByKey(StorageTypeEnum.FTP);
+            String host = stringStorageConfigMap.get(StorageConfigConstant.HOST_KEY).getValue();
+            String port = stringStorageConfigMap.get(StorageConfigConstant.PORT_KEY).getValue();
+            String username = stringStorageConfigMap.get(StorageConfigConstant.USERNAME_KEY).getValue();
+            String password = stringStorageConfigMap.get(StorageConfigConstant.PASSWORD_KEY).getValue();
+            domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
 
-           ftp = new Ftp(host, Integer.parseInt(port), username, password);
-           isInitialized = testConnection();
-       } catch (Exception e) {
-           log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
-       }
+            if (Objects.isNull(host) || Objects.isNull(port) || Objects.isNull(username) || Objects.isNull(password)) {
+                isInitialized = true;
+            } else {
+                ftp = new Ftp(host, Integer.parseInt(port), username, password);
+                isInitialized = testConnection();
+            }
+
+        } catch (Exception e) {
+            log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
+        }
     }
 
     @Override
-    @Cacheable
     public List<FileItemDTO> fileList(String path) {
         FTPFile[] ftpFiles = ftp.lsFiles(path);
 
@@ -78,7 +82,6 @@ public class FtpServiceImpl extends AbstractFileService implements FileService {
     }
 
     @Override
-    @Cacheable
     public String getDownloadUrl(String path) {
         return URLUtil.complateUrl(domain, path);
     }

src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -35,12 +36,17 @@ public class HuaweiServiceImpl extends AbstractS3FileService implements FileServ
             domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
             basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
 
-            BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
-            s3Client = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "obs")).build();
+            if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
+                log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());
+                isInitialized = false;
+            } else {
+                BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+                s3Client = AmazonS3ClientBuilder.standard()
+                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "obs")).build();
 
-            isInitialized = testConnection();
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

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

@@ -32,7 +32,7 @@ public class LocalController {
     public ResponseEntity<FileSystemResource> downAttachment(final HttpServletRequest request) {
         String path = (String) request.getAttribute(
                 HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
-        String bestMatchPattern = (String ) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
+        String bestMatchPattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
         AntPathMatcher apm = new AntPathMatcher();
         String filePath = apm.extractPathWithinPattern(bestMatchPattern, path);
 
@@ -41,6 +41,11 @@ public class LocalController {
 
     private ResponseEntity<FileSystemResource> export(File file) {
 
+        if (!file.exists()) {
+            return ResponseEntity.notFound().build();
+        }
+
+
         MediaType mediaType = MediaType.APPLICATION_OCTET_STREAM;
 
         HttpHeaders headers = new HttpHeaders();

src/main/java/im/zhaojun/local/service/LocalServiceImpl.java

@@ -1,5 +1,6 @@
 package im.zhaojun.local.service;
 
+import cn.hutool.core.util.URLUtil;
 import im.zhaojun.common.model.StorageConfig;
 import im.zhaojun.common.model.SystemConfig;
 import im.zhaojun.common.model.constant.StorageConfigConstant;
@@ -22,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -45,7 +47,12 @@ public class LocalServiceImpl extends AbstractFileService implements FileService
             Map<String, StorageConfig> stringStorageConfigMap =
                     storageConfigService.selectStorageConfigMapByKey(StorageTypeEnum.LOCAL);
             filePath = stringStorageConfigMap.get(StorageConfigConstant.FILE_PATH_KEY).getValue();
-            isInitialized = testConnection();
+            if (Objects.isNull(filePath)) {
+                log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());
+                isInitialized = false;
+            } else {
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }
@@ -82,7 +89,7 @@ public class LocalServiceImpl extends AbstractFileService implements FileService
     @Override
     public String getDownloadUrl(String path) {
         SystemConfig usernameConfig = systemConfigRepository.findByKey(SystemConfigConstant.DOMAIN);
-        return StringUtils.removeDuplicateSeparator(usernameConfig.getValue() + "/file/" + path);
+        return URLUtil.encode(StringUtils.removeDuplicateSeparator(usernameConfig.getValue() + "/file/" + path));
     }
 
     public String getFilePath() {

src/main/java/im/zhaojun/minio/MinIOServiceImpl.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -33,12 +34,17 @@ public class MinIOServiceImpl extends AbstractS3FileService implements FileServi
             bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
             basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
 
-            BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
-            s3Client = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "minio")).build();
+            if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
+                log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());
+                isInitialized = false;
+            } else {
+                BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+                s3Client = AmazonS3ClientBuilder.standard()
+                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "minio")).build();
 
-            isInitialized = testConnection();
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java

@@ -11,10 +11,10 @@ import im.zhaojun.common.service.AbstractS3FileService;
 import im.zhaojun.common.service.FileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -36,12 +36,17 @@ public class QiniuServiceImpl extends AbstractS3FileService implements FileServi
             domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
             basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
 
-            BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
-            s3Client = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "kodo")).build();
+            if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
+                log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());
+                isInitialized = false;
+            } else {
+                BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+                s3Client = AmazonS3ClientBuilder.standard()
+                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "kodo")).build();
 
-            isInitialized = testConnection();
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

src/main/java/im/zhaojun/tencent/TencentServiceImpl.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -29,17 +30,22 @@ public class TencentServiceImpl extends AbstractS3FileService implements FileSer
             Map<String, StorageConfig> stringStorageConfigMap = storageConfigService.selectStorageConfigMapByKey(StorageTypeEnum.TENCENT);
             String secretId = stringStorageConfigMap.get(StorageConfigConstant.SECRET_ID_KEY).getValue();
             String secretKey = stringStorageConfigMap.get(StorageConfigConstant.SECRET_KEY).getValue();
-            String regionName = stringStorageConfigMap.get(StorageConfigConstant.ENDPOINT_KEY).getValue();
+            String endPoint = stringStorageConfigMap.get(StorageConfigConstant.ENDPOINT_KEY).getValue();
             bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
             domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
             basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
 
-            BasicAWSCredentials credentials = new BasicAWSCredentials(secretId, secretKey);
-            s3Client = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(regionName, "cos")).build();
+            if (Objects.isNull(secretId) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
+                log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());
+                isInitialized = false;
+            } else {
+                BasicAWSCredentials credentials = new BasicAWSCredentials(secretId, secretKey);
+                s3Client = AmazonS3ClientBuilder.standard()
+                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "cos")).build();
 
-            isInitialized = testConnection();
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java

@@ -1,5 +1,6 @@
 package im.zhaojun.upyun.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.URLUtil;
 import com.UpYun;
 import im.zhaojun.common.model.StorageConfig;
@@ -13,7 +14,6 @@ import im.zhaojun.common.service.StorageConfigService;
 import im.zhaojun.common.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -51,15 +52,21 @@ public class UpYunServiceImpl extends AbstractFileService implements FileService
             String password = stringStorageConfigMap.get(StorageConfigConstant.PASSWORD_KEY).getValue();
             domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
             basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
-            upYun = new UpYun(bucketName, username, password);
-            isInitialized = testConnection();
+            basePath = ObjectUtil.defaultIfNull(basePath, "");
+
+            if (Objects.isNull(bucketName) || Objects.isNull(username) || Objects.isNull(password)) {
+                log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());
+                isInitialized = false;
+            } else {
+                upYun = new UpYun(bucketName, username, password);
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }
     }
 
     @Override
-    @Cacheable
     public List<FileItemDTO> fileList(String path) throws Exception {
         ArrayList<FileItemDTO> fileItemList = new ArrayList<>();
         String nextMark = null;
@@ -94,7 +101,6 @@ public class UpYunServiceImpl extends AbstractFileService implements FileService
     }
 
     @Override
-    @Cacheable
     public String getDownloadUrl(String path) {
         return URLUtil.complateUrl(domain, path);
     }

src/main/resources/application.yml

@@ -1,10 +1,3 @@
-logging:
-  level:
-    im:
-      zhaojun:
-        common: debug
-  path: ${user.home}/.zfile/logs
-
 server:
   port: 8080
   servlet:
@@ -41,10 +34,12 @@ spring:
     properties:
       hibernate:
         format_sql: false
-    show-sql: true
+    show-sql: false
   resources:
     chain:
       gzipped: true
+  profiles:
+    active: prod
 zfile:
   cache:
     timeout: 300
@@ -59,5 +54,4 @@ jetcache:
   local:
     default:
       type: caffeine
-      keyConvertor: fastjson
-      defaultExpireInMillis: 3600000
+      keyConvertor: fastjson

src/main/resources/logback-spring.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    scan：当此属性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true。
+    scanPeriod：设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒当scan为true时，此属性生效。默认的时间间隔为1分钟。
+    debug：当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。
+-->
+<configuration scan="false" scanPeriod="60 seconds" debug="false">
+
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+
+    <!-- 定义日志的根目录 -->
+    <property name="LOG_HOME" value="${user.home}/.zfile/logs" />
+    <!-- 定义日志文件名称 -->
+    <property name="appName" value="zfile"/>
+
+    <!-- ch.qos.logback.core.ConsoleAppender 表示控制台输出 -->
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </layout>
+    </appender>
+
+    <!-- 滚动记录文件，先将日志记录到指定文件，当符合某个条件时，将日志记录到其他文件 -->
+    <appender name="appLogAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 指定日志文件的名称 -->
+        <file>${LOG_HOME}/${appName}.log</file>
+
+        <!--
+            当发生滚动时，决定 RollingFileAppender 的行为，涉及文件移动和重命名
+            TimeBasedRollingPolicy： 最常用的滚动策略，它根据时间来制定滚动策略，既负责滚动也负责出发滚动。
+        -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--
+            滚动时产生的文件的存放位置及文件名称 %d{yyyy-MM-dd}：按天进行日志滚动
+            %i：当文件大小超过maxFileSize时，按照i进行文件滚动
+            -->
+            <fileNamePattern>${LOG_HOME}/${appName}-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
+            <!--
+            可选节点，控制保留的归档文件的最大数量，超出数量就删除旧文件。假设设置每天滚动，
+            且maxHistory是365，则只保存最近365天的文件，删除之前的旧文件。注意，删除旧文件是，
+            那些为了归档而创建的目录也会被删除。
+            -->
+            <MaxHistory>365</MaxHistory>
+            <!--
+            当日志文件超过maxFileSize指定的大小是，根据上面提到的%i进行日志文件滚动 注意此处配置SizeBasedTriggeringPolicy是无法实现按文件大小进行滚动的，必须配置timeBasedFileNamingAndTriggeringPolicy
+            -->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>5MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <!-- 日志输出格式： -->
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </layout>
+    </appender>
+
+    <!--
+		logger主要用于存放日志对象，也可以定义日志类型、级别
+		name：表示匹配的logger类型前缀，也就是包的前半部分
+		level：要记录的日志级别，包括 TRACE < DEBUG < INFO < WARN < ERROR
+		additivity：作用在于children-logger是否使用 rootLogger配置的appender进行输出，
+		false：表示只用当前logger的appender-ref，true：
+		表示当前logger的appender-ref和rootLogger的appender-ref都有效
+    -->
+
+    <!-- jetCache logger -->
+    <logger name="com.alicp" level="debug"/>
+
+    <!-- hibernate logger -->
+    <logger name="org.hibernate.SQL" level="DEBUG"/>
+
+
+    <!--
+        root与logger是父子关系，没有特别定义则默认为root，任何一个类只会和一个logger对应，
+        要么是定义的logger，要么是root，判断的关键在于找到这个logger，然后判断这个logger的appender和level。
+    -->
+    <root level="info">
+        <appender-ref ref="stdout" />
+        <appender-ref ref="appLogAppender" />
+    </root>
+
+</configuration>

src/main/resources/static/css/adminIndex.25eab1c6.css

@@ -0,0 +1 @@
+.el-menu[data-v-0d38e212],.el-row[data-v-0d38e212]{height:100vh}

src/main/resources/static/css/adminIndex.6656b315.css

@@ -1 +0,0 @@
-.el-menu[data-v-11c58ddb],.el-row[data-v-11c58ddb]{height:100vh}

src/main/resources/static/css/install.39da241e.css

@@ -1 +0,0 @@
-.box-card[data-v-621306e1]{padding-top:30px;padding-right:30px;margin:15vh auto;height:65vh;overflow-y:auto}.el-select[data-v-621306e1]{width:100%}

src/main/resources/static/css/install.ca398206.css

@@ -0,0 +1 @@
+.box-card[data-v-23a15e8c]{padding-top:30px;padding-right:30px;margin:15vh auto;height:65vh;overflow-y:auto}.el-select[data-v-23a15e8c]{width:100%}

src/main/resources/static/css/login.4c106b9d.css

@@ -1 +0,0 @@
-.login-container[data-v-ec97d092]{width:100%;height:100%}.login-page[data-v-ec97d092]{border-radius:5px;margin:180px auto;width:350px;padding:35px 35px 15px;background:#fff;border:1px solid #eaeaea;-webkit-box-shadow:0 0 25px #cac6c6;box-shadow:0 0 25px #cac6c6}label.el-checkbox.rememberme[data-v-ec97d092]{margin:0 0 15px;text-align:left}

src/main/resources/static/css/siteSetting.8aa8fb90.css

@@ -1 +0,0 @@
-#siteForm[data-v-5ab4a46c]{margin-top:20px;margin-left:20px}#siteForm[data-v-5ab4a46c] .el-select{width:100%}.zfile-word-aux[data-v-5ab4a46c]{margin-left:20px;color:#aaa}

src/main/resources/static/css/storageStrategy.c619bd5e.css

@@ -1 +0,0 @@
-#storageForm[data-v-4e200950]{margin-left:20px}#storageForm[data-v-4e200950] .el-select{width:100%}.el-tabs[data-v-1b7d7bc8]{display:block;width:940px}

src/main/resources/static/css/updatePassword.11e9911c.css

@@ -1 +0,0 @@
-#pwdForm[data-v-7d080185]{margin-top:20px;margin-left:20px}

src/main/resources/static/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title></title><link href=/css/adminIndex.6656b315.css rel=prefetch><link href=/css/install.39da241e.css rel=prefetch><link href=/css/login.4c106b9d.css rel=prefetch><link href=/css/siteSetting.8aa8fb90.css rel=prefetch><link href=/css/storageStrategy.c619bd5e.css rel=prefetch><link href=/css/updatePassword.11e9911c.css rel=prefetch><link href=/js/adminIndex.52ec74b4.js rel=prefetch><link href=/js/dplayer.acc587f7.js rel=prefetch><link href=/js/flv.4f294571.js rel=prefetch><link href=/js/highlight.1e643364.js rel=prefetch><link href=/js/install.fa590583.js rel=prefetch><link href=/js/login.c6d3d33e.js rel=prefetch><link href=/js/marked.58818bc3.js rel=prefetch><link href=/js/siteSetting.2fa65c09.js rel=prefetch><link href=/js/storageStrategy.ec7b4260.js rel=prefetch><link href=/js/updatePassword.2cc74208.js rel=prefetch><link href=/css/app.2293f0bd.css rel=preload as=style><link href=/css/chunk-vendors.f095837b.css rel=preload as=style><link href=/js/app.11d51f1c.js rel=preload as=script><link href=/js/chunk-vendors.eec3a6bb.js rel=preload as=script><link href=/css/chunk-vendors.f095837b.css rel=stylesheet><link href=/css/app.2293f0bd.css rel=stylesheet></head><body><noscript><strong>We're sorry but zfile doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.eec3a6bb.js></script><script src=/js/app.11d51f1c.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title></title><link href=/css/adminIndex.25eab1c6.css rel=prefetch><link href=/css/install.ca398206.css rel=prefetch><link href=/js/adminIndex.456ac23a.js rel=prefetch><link href=/js/dplayer.acc587f7.js rel=prefetch><link href=/js/install.7e582096.js rel=prefetch><link href=/css/app.9a6cb5c2.css rel=preload as=style><link href=/css/chunk-vendors.b9a3d604.css rel=preload as=style><link href=/js/app.022a9bb1.js rel=preload as=script><link href=/js/chunk-vendors.3fc3f2af.js rel=preload as=script><link href=/css/chunk-vendors.b9a3d604.css rel=stylesheet><link href=/css/app.9a6cb5c2.css rel=stylesheet></head><body><noscript><strong>We're sorry but zfile doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.3fc3f2af.js></script><script src=/js/app.022a9bb1.js></script></body></html>

src/main/resources/static/js/adminIndex.456ac23a.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["adminIndex"],{7869:function(t,e,a){},adf4:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("el-row",[a("el-col",{attrs:{span:3}},[a("el-menu",{staticClass:"el-menu-vertical-demo",attrs:{"default-active":"/admin"!==this.$route.path?this.$route.path:"/admin/site",router:!0}},[a("el-menu-item",{attrs:{index:"/admin/site"}},[a("i",{staticClass:"el-icon-setting"}),a("span",{attrs:{slot:"title"},slot:"title"},[t._v("站点设置")])]),a("el-menu-item",{attrs:{index:"/admin/storage"}},[a("i",{staticClass:"el-icon-s-operation"}),a("span",{attrs:{slot:"title"},slot:"title"},[t._v("存储策略")])]),a("el-menu-item",{attrs:{index:"/admin/password"}},[a("i",{staticClass:"el-icon-key"}),a("span",{attrs:{slot:"title"},slot:"title"},[t._v("修改密码")])]),a("el-menu-item",{attrs:{index:"/admin/cache"}},[a("i",{staticClass:"el-icon-collection"}),a("span",{attrs:{slot:"title"},slot:"title"},[t._v("缓存管理")])])],1)],1),a("el-col",{attrs:{span:16}},[a("keep-alive",{attrs:{exclude:"CacheManager,SiteSetting"}},[a("router-view")],1)],1)],1)},s=[],n={name:"Index",data:function(){return{active:"/admin/storage"}}},l=n,o=(a("f2cb"),a("2877")),r=Object(o["a"])(l,i,s,!1,null,"0d38e212",null);e["default"]=r.exports},f2cb:function(t,e,a){"use strict";var i=a("7869"),s=a.n(i);s.a}}]);

src/main/resources/static/js/adminIndex.52ec74b4.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["adminIndex"],{"76fb":function(t,e,a){"use strict";var s=a("efec"),i=a.n(s);i.a},adf4:function(t,e,a){"use strict";a.r(e);var s=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("el-row",[a("el-col",{attrs:{span:3}},[a("el-menu",{staticClass:"el-menu-vertical-demo",attrs:{"default-active":"/admin"!==this.$route.path?this.$route.path:"/admin/site",router:!0}},[a("el-menu-item",{attrs:{index:"/admin/site"}},[a("i",{staticClass:"el-icon-setting"}),a("span",{attrs:{slot:"title"},slot:"title"},[t._v("站点设置")])]),a("el-menu-item",{attrs:{index:"/admin/storage"}},[a("i",{staticClass:"el-icon-s-operation"}),a("span",{attrs:{slot:"title"},slot:"title"},[t._v("存储策略")])]),a("el-menu-item",{attrs:{index:"/admin/password"}},[a("i",{staticClass:"el-icon-key"}),a("span",{attrs:{slot:"title"},slot:"title"},[t._v("修改密码")])])],1)],1),a("el-col",{attrs:{span:12}},[a("keep-alive",[a("router-view")],1)],1)],1)},i=[],n={name:"Index",data:function(){return{active:"/admin/storage"}}},l=n,r=(a("76fb"),a("2877")),o=Object(r["a"])(l,s,i,!1,null,"11c58ddb",null);e["default"]=o.exports},efec:function(t,e,a){}}]);

src/main/resources/static/js/install.7e582096.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["install"],{"45a3":function(e,t,a){},6796:function(e,t,a){"use strict";var r=a("45a3"),o=a.n(r);o.a},f8a7:function(e,t,a){"use strict";a.r(t);var r=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("el-row",{attrs:{gutter:20}},[a("el-col",{attrs:{span:8,offset:8}},[a("el-card",{staticClass:"box-card",attrs:{"align-center":"",shadow:"always"}},[a("el-form",{ref:"form",attrs:{rules:e.rules,model:e.form,"label-width":"auto","status-icon":!0}},[a("el-form-item",{attrs:{label:"站点名称",prop:"siteName"}},[a("el-input",{model:{value:e.form.siteName,callback:function(t){e.$set(e.form,"siteName",t)},expression:"form.siteName"}})],1),a("el-form-item",{attrs:{label:"管理员账号",prop:"username"}},[a("el-input",{model:{value:e.form.username,callback:function(t){e.$set(e.form,"username","string"===typeof t?t.trim():t)},expression:"form.username"}})],1),a("el-form-item",{attrs:{label:"管理员密码",prop:"password"}},[a("el-input",{model:{value:e.form.password,callback:function(t){e.$set(e.form,"password","string"===typeof t?t.trim():t)},expression:"form.password"}})],1),a("el-form-item",{attrs:{label:"站点地址/域名",prop:"domain"}},[a("el-input",{model:{value:e.form.domain,callback:function(t){e.$set(e.form,"domain","string"===typeof t?t.trim():t)},expression:"form.domain"}})],1),a("el-form-item",{attrs:{label:"存储策略"}},[a("el-select",{attrs:{placeholder:"请选择存储策略"},model:{value:e.form.storageStrategy,callback:function(t){e.$set(e.form,"storageStrategy",t)},expression:"form.storageStrategy"}},[a("el-option",{attrs:{label:"阿里云 OSS",value:"aliyun"}}),a("el-option",{attrs:{label:"腾讯云 COS",value:"tencent"}}),a("el-option",{attrs:{label:"华为云 OBS",value:"huawei"}}),a("el-option",{attrs:{label:"七牛云 KODO",value:"qiniu"}}),a("el-option",{attrs:{label:"又拍云 USS",value:"upyun"}}),a("el-option",{attrs:{label:"FTP",value:"ftp"}}),a("el-option",{attrs:{label:"本地存储",value:"local"}}),a("el-option",{attrs:{label:"minio",value:"minio"}})],1)],1),e._l(e.storageStrategyForm,(function(t){return a("el-form-item",{key:t.title,attrs:{label:t.title}},["endPoint"===t.key&&e.region.hasOwnProperty(e.form.storageStrategy)?a("el-select",{model:{value:e.form.storageStrategyConfig.endPoint,callback:function(t){e.$set(e.form.storageStrategyConfig,"endPoint",t)},expression:"form.storageStrategyConfig.endPoint"}},e._l(e.region[e.form.storageStrategy],(function(e){return a("el-option",{key:e.name,attrs:{label:e.name,value:e.val}})})),1):a("el-input",{model:{value:e.form.storageStrategyConfig[t.key],callback:function(a){e.$set(e.form.storageStrategyConfig,t.key,"string"===typeof a?a.trim():a)},expression:"form.storageStrategyConfig[item.key]"}})],1)})),a("el-form-item",[a("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.submitForm("form")}}},[e._v("确认")])],1)],2)],1)],1)],1)},o=[],n=a("4328"),s=a.n(n),i=a("245d"),l={name:"Install",data:function(){return{active:1,form:{siteName:"",storageStrategy:"",username:"",password:"",domain:window.location.protocol+"//"+window.location.host,storageStrategyConfig:{endPoint:""}},storageStrategyForm:[],region:i["a"],rules:{siteName:[{required:!0,message:"请输入站点名称",trigger:"change"}],username:[{required:!0,message:"请输入管理员账号",trigger:"change"}],password:[{required:!0,message:"请输入管理员密码",trigger:"change"}],domain:[{required:!0,type:"url",message:"请输入正确的域名, 需以 http:// 或 https:// 开头",trigger:"change"}]}}},watch:{"form.storageStrategy":function(e){var t=this;this.$http.get("form",{params:{storageType:e}}).then((function(e){t.form.storageStrategyConfig.endPoint=null,t.storageStrategyForm=e.data.data}))}},methods:{submitForm:function(e){var t=this;this.$refs[e].validate((function(e){if(!e)return!1;var a=t;t.$http.post("install",s.a.stringify(t.form)).then((function(e){var r=e.data;t.$message({message:r.msg,type:0===r.code?"success":"error",duration:1500,onClose:function(){a.$router.push("/main")}})}))}))}},created:function(){var e=this;this.$http.get("is-installed").then((function(t){var a=t.data;0!==a.code&&e.$router.push("/main")}))}},m=l,u=(a("6796"),a("2877")),f=Object(u["a"])(m,r,o,!1,null,"23a15e8c",null);t["default"]=f.exports}}]);