🔖 发布 2.8.1 版

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,48 @@
+---
+name: BUG 反馈
+about: 事情不像预期的那样工作吗？
+title: ''
+labels: 'bug'
+assignees: ''
+---
+
+<!--
+  你好！感谢你正在考虑为 ZFile 提交一个 bug。请花一点点时间尽量详细地回答以下基础问题。
+
+  谢谢！
+-->
+
+<!--
+  请确认你已经做了下面这些事情，若 bug 还是未解决，那么请尽可详细地描述你的问题。
+
+  - 我已经安装了最新版的 ZFile
+  - 我已经阅读了 ZFile 的文档：http://docs.zhaojun.im/zfile
+  - 我已经搜索了已有的 Issues 列表中有关的信息
+  - 我已经清理过浏览器缓存并重试
+-->
+
+## 我的环境
+
+<!--
+  请登录到管理后台，点击左侧系统监控, 复制或截图此页内容.
+-->
+
+## 错误日志
+
+<!--
+  请登录到管理后台，点击左侧系统监控, 点击右上角诊断日志下载, 然后上传到此 Issue 中.
+-->
+
+## 期望行为
+
+<!--
+  你期望会发生什么？
+-->
+
+## 当前行为
+
+<!--
+  描述 bug 细节，确认出现此问题的复现步骤，例如点击了哪里，发生了什么情况？
+
+  你可以粘贴截图或附件。
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,34 @@
+---
+name: 功能建议
+about: 想让我们为 ZFile 增加什么功能吗？
+title: 'feat: '
+labels: 'Feature Request'
+assignees: ''
+
+---
+
+<!--
+  你好！感谢你愿意考虑希望 ZFile 增加某个新功能。请花一点点时间尽量详细地回答以下基础问题。
+
+  谢谢！
+-->
+
+## 概述
+
+<!--
+  对这个新功能的一段描述
+-->
+
+## 动机
+
+<!--
+  为什么你希望在 ZFile 中使用这个功能？
+-->
+
+## 详细解释
+
+<!--
+  详细描述这个新功能。
+
+  如果这是一个小功能，你可以忽略这部分。
+-->

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,14 @@
+---
+name: Question
+about: 对 ZFile 有任何问题吗？
+title: ''
+labels: 'question'
+assignees: ''
+
+---
+
+<!--
+  如果你有任何问题也可以通过此渠道来向我们反馈。
+
+  谢谢！
+-->

API.md

@@ -10,22 +10,14 @@
 
 当 `code == 0` 时, `data` 中为请求所需数据.
 
-当 `code != 0` 时, 应当将 `msg` 中的属性作为参考值.
+当 `code != 0` 时, 应当将 `msg` 中的内容作为参考值.
 
 
-## 获取文件列表
+## 驱动器列表
 
 ### 请求 URL
 
-`/api/list`  `GET`
+`/api/drive/list`  `GET`
-
-### 参数
-
-|  参数名  |    描述    | 是否必填 |            参考值            |
-| :------: | :--------: | :------: | :--------------------------: |
-|   path   |    路径    |    是    |      `/`, `/文件夹名称`      |
-| password | 文件夹密码 |    否    |     当文件夹需要密码时,      |
-|   page   |    页数    |    否    | 默认取第一页, 每页固定 30 条 |
 
 ### 响应
 
@@ -35,41 +27,52 @@
     "code": 0,
     "data": [
         {
-            "name": "密码文件夹",
+            "id": 3,                        --- 此 ID 是驱动器 ID, 用来唯一区分驱动器
-            "time": "2020-01-28 13:17",
+            "name": "演示 A 盘",            --- 驱动器名称
-            "size": 4096,
+            "enableCache": true,            --- 是否开启了缓存
-            "type": "FOLDER",
+            "autoRefreshCache": false,      --- 是否开启了缓存自动刷新
-            "path": "/",
+            "type": {                       --- 存储源类型
-            "url": null
+                "key": "upyun",
-        },
+                "description": "又拍云 USS"
-        {
+            },
-            "name": "新建 文本文档.txt",
+            "searchEnable": false,          --- 是否开启搜索
-            "time": "2020-01-28 13:16",
+            "searchIgnoreCase": false,      --- 搜索是否忽略大小写
-            "size": 3,
+            "searchContainEncryptedFile": false     --- 搜索是否包含加密文件夹
-            "type": "FILE",
-            "path": "/",
-            "url": "http://127.0.0.1:8080/file/新建 文本文档.txt"
         }
     ]
 }
 ```
 
-## 搜索
 
 
+## 获取文件列表
+
 ### 请求 URL
 
-`/api/search`  `GET`
+`/api/list/{driveId}`  `GET`
 
-### 参数
 
-| 参数名 |  描述  | 是否必填 |            参考值            |
+### URL 参数
-| :----: | :----: | :------: | :--------------------------: |
+
-|  name  | 搜索值 |    是    |           模糊匹配           |
+
-|  page  |  页数  |    否    | 默认取第一页, 每页固定 30 条 |
+| 参数名  |         描述          | 是否必填 |                 参考值                 |
+| :-----: | :-------------------: | :------: | :------------------------------------: |
+| driveId | 驱动器 ID |    是    | 参考 `获取驱动器列表` 接口返回的 id 值 |
+
+
+### 请求参数
+
+
+|  参数名  |    描述    | 是否必填 |            参考值            |
+| :------: | :--------: | :------: | :--------------------------: |
+|   path   |    路径    |    是    |      `/`, `/文件夹名称`      |
+| password | 文件夹密码 |    否    |     当文件夹需要密码时,      |
+|   page   |    页数    |    否    | 默认取第一页, 每页固定 30 条 |
+
 
 ### 响应
 
+
 ```json
 {
     "msg": "操作成功",
@@ -100,7 +103,14 @@
 
 ### 请求 URL
 
-`/api/directlink`  `GET`
+`/api/directlink/{driveId}`  `GET`
+
+
+### URL 参数
+
+| 参数名  |         描述          | 是否必填 |                 参考值                 |
+| :-----: | :-------------------: | :------: | :------------------------------------: |
+| driveId | 驱动器 ID |    是    | 参考 `获取驱动器列表` 接口返回的 id 值 |
 
 ### 参数
 
@@ -130,7 +140,15 @@
 
 ### 请求 URL
 
-`/api/config`  `GET`
+`/api/config/{driveId}`  `GET`
+
+
+### URL 参数
+
+| 参数名  |         描述          | 是否必填 |                 参考值                 |
+| :-----: | :-------------------: | :------: | :------------------------------------: |
+| driveId | 驱动器 ID |    是    | 参考 `获取驱动器列表` 接口返回的 id 值 |
+
 
 ### 参数
 
@@ -145,20 +163,19 @@
     "msg": "操作成功",
     "code": 0,
     "data": {
-        "header": null,     # 头部文件名称
+        "siteName": "ZFile 演示站",
-        "viewConfig": {
+        "searchEnable": false,
-            "siteName": "站点名称",     # 站点名称
+        "username": "zhao",
-            "infoEnable": false,        # 是否开启右侧信息框
+        "domain": "https://zfile.jun6.net",
-            "searchEnable": false,      # 是否开启搜索
+        "customJs": "",
-            "searchIgnoreCase": true,   # 搜索是否忽略大小写
+        "customCss": "",
-            "storageStrategy": "local", # 当前启用存储引擎
+        "tableSize": "small",
-            "username": "2",            # 用户名
+        "showOperator": true,
-            "domain": "http://127.0.0.1:8080",  # 域名
+        "showDocument": true,
-            "enableCache": false,               # 是否开启缓存
+        "announcement": "本站是 ZFile 演示站，交流反馈群 180605017",
-            "searchContainEncryptedFile": false,    # 搜索是否包含加密文件夹
+        "showAnnouncement": true,
-            "customJs": "",             # 自定义 js 片段
+        "layout": "full",
-            "customCss": ""             # 自定义 css 片段
+        "readme": null
-        }
     }
 }
-```
+```

README.md

@@ -11,18 +11,21 @@
 
 预览地址: [https://zfile.jun6.net](https://zfile.jun6.net)
 
+文档地址: [http://docs.zhaojun.im/zfile](http://docs.zhaojun.im/zfile)
+
 ## 系统特色
 
 * 内存缓存 (免安装)
 * 内存数据库 (免安装)
 * 个性化配置
-* 自定义目录的 header 说明文件
+* 自定义目录的 readme 说明文件
 * 自定义 JS, CSS
 * 文件夹密码
 * 支持在线浏览文本文件, 视频, 图片, 音乐. (支持 FLV 和 HLS)
 * 文件/目录二维码
-* 缓存动态开启, 缓存自动刷新
+* 缓存动态开启, ~~缓存自动刷新 (v2.2 及以前版本支持)~~
-* 全局搜索
+* ~~全局搜索 (v2.2 及以前版本支持)~~
+* 同时挂载多个存储策略
 * 支持 阿里云 OSS, FTP, 华为云 OBS, 本地存储, MINIO, OneDrive 国际/家庭/个人版, OneDrive 世纪互联版, 七牛云 KODO, 腾讯云 COS, 又拍云 USS.
 
 ## 快速开始
@@ -32,23 +35,37 @@
 ```bash
 # CentOS系统
 yum install -y java-1.8.0-openjdk unzip
+```
 
-# Debian/Ubuntu系统
+```bash
+# Debian 9 / Ubuntu 14+
 apt update
 apt install -y openjdk-8-jre-headless unzip
 ```
 
-> 如为更新程序, 则请先执行 `rm -rf ~/zfile` 清理旧程序. 首次安装请忽略此选项.
+```bash
+# Debian 10 (Buster) 系统
+apt update && apt install -y apt-transport-https software-properties-common ca-certificates dirmngr gnupg
+wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
+add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
+apt update && apt install -y adoptopenjdk-8-hotspot-jre
+```
+
+
+> 如为更新程序, 则请先执行 `~/zfile/bin/stop.sh && rm -rf ~/zfile` 清理旧程序. 首次安装请忽略此选项.
+
 
 下载项目:
 
 ```bash
-wget -P ~ https://c.jun6.net/ZFILE/zfile-1.3.war
 cd ~
-mkdir zfile && unzip zfile-1.3.war -d zfile && rm -rf zfile-1.3.war
+wget https://c.jun6.net/ZFILE/zfile-release.war
-chmod +x ~/zfile/bin/*.sh
+mkdir zfile && unzip zfile-release.war -d zfile && rm -rf zfile-release.war
+chmod +x zfile/bin/*.sh
 ```
 
+> 下载指定版本可以将 `zfile-release.war` 改为 `zfile-x.x.war`，如 `zfile-2.2.war`。
+
 程序的目录结构为:
 ```
 ├── zfile
@@ -66,7 +83,7 @@ chmod +x ~/zfile/bin/*.sh
  ~/zfile/bin/start.sh
 ```
 
-篇幅有限, 更详细的安装教程请参考: [安装文档](http://zhaojun.im/zfile-install)
+篇幅有限, 更详细的安装教程及介绍请参考: [ZFile 文档](http://zhaojun.im/zfile-install)
 
 访问地址:
 
@@ -77,66 +94,51 @@ chmod +x ~/zfile/bin/*.sh
 管理后台: http://127.0.0.1:8080/#/admin
 
 
-## OneDrive 使用教程.
-
-访问地址进行授权, 获取 accessToken 和 refreshToken:
-
-
-国际/家庭/个人版:
-
-https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=09939809-c617-43c8-a220-a93c1513c5d4&response_type=code&redirect_uri=https://zfile.jun6.net/onedirve/callback&scope=offline_access%20User.Read%20Files.ReadWrite.All
-
-
-世纪互联版:
-
-https://login.chinacloudapi.cn/common/oauth2/v2.0/authorize?client_id=4a72d927-1907-488d-9eb2-1b465c53c1c5&response_type=code&redirect_uri=https://zfile.jun6.net/onedirve/china-callback&scope=offline_access%20User.Read%20Files.ReadWrite.All
-
-
-然后分别填写至访问令牌和刷新令牌即可:
-
-![http://cdn.jun6.net/2020-01-24_18-57-06.png](http://cdn.jun6.net/2020-01-24_18-57-06.png)
-
-## 运行环境
-
-* JDK: `1.8`
-* 缓存: `caffeine`
-* 数据库: `h2/mysql`
-
 ## 预览
 
-![前台首页](http://cdn.jun6.net/2020/01/29/a252a5cec7134.png)
+![前台首页](https://cdn.jun6.net/2020/04/19/d590d2bde13bb.png)
-![后台设置](http://cdn.jun6.net/2020/01/29/d5c85221bcffc.png)
+![后台设置-驱动器设置](https://cdn.jun6.net/2020/04/19/d58fc2debcce8.png)
-![存储策略](http://cdn.jun6.net/2020/01/29/4b79bfba4e003.png)
+![后台设置-驱动器设置](https://cdn.jun6.net/2020/04/19/0f321e47fc18c.png)
-![缓存管理](http://cdn.jun6.net/2020/01/29/60b0538e50f9f.png)
+![后台设置-显示设置](https://cdn.jun6.net/2020/04/19/6d7c300b89671.png)
 
 ## 常见问题
 
-### 数据库
-
-缓存默认支持 `h2` 和 `mysql`, 前者为嵌入式数据库, 无需安装, 但后者相对性能更好.
 
 ### 默认路径
 
-默认 H2 数据库文件地址: `~/.zfile/db/`, `~` 表示用户目录, windows 为 `C:/Users/用户名/`, linux 为 `/home/用户名/`, root 用户为 `/root/`
+默认 H2 数据库文件地址: `~/.zfile/db/`, `~` 表示用户目录
 
-### 头尾文件和加密文件
+windows 为 `C:/Users/用户名/`
 
-- 目录头部显示文件名为 `header.md`
+linux 为 `/home/用户名/`, root 用户为 `/root/`
+
+> 2.3 及以后版本路径为 `~/.zfile-new/db/`
+
+### 文档文件和加密文件
+
+- 目录文档显示文件名为 `readme.md`
 - 目录需要密码访问, 添加文件 `password.txt` (无法拦截此文件被下载, 但可以改名文件)
 
-## TODO
+## 开发计划
 
 - [x] API 支持 [点击查看文档](https://github.com/zhaojun1998/zfile/blob/master/API.md)
 - [x] 更方便的部署方式
-- [ ] 文本预览更换更好用的编辑器
+- [x] 布局优化 - 自定义操作按钮 (现为右键实现)
-- [ ] 后台支持上传、编辑、删除等操作
+- [x] 后台优化 - 设置按照其功能进行分离
-- [ ] WebDav 支持
+- [x] 体验优化 - 支持前后端分离部署
-- [ ] Docker 支持
+- [x] 体验优化 - 文本预览更换 vscode 同款编辑器 monaco editor
+- [x] 新功能 - Docker 支持
+- [x] 架构调整 - 支持多存储策略
+- [ ] 新功能 - 后台支持上传、编辑、删除等操作
+- [ ] 新功能 - WebDav 支持
+- [ ] 新功能 - 离线下载 (aria2)
+- [ ] 体验优化 - 忽略文件列表 (正则表达式)
+- [ ] 体验优化 - 自定义支持预览的文件后缀 (正则表达式)
+- [ ] 体验优化 - 一键安装脚本
 
 ## 支持作者
 
 如果本项目对你有帮助，请作者喝杯咖啡吧。
 
-
 <img src="http://cdn.jun6.net/alipay.png" width="200" height="312">
 <img src="http://cdn.jun6.net/wechat.png" width="222" height="300">

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>im.zhaojun</groupId>
     <artifactId>zfile</artifactId>
-    <version>1.3</version>
+    <version>2.8.1</version>
     <name>zfile</name>
     <packaging>war</packaging>
     <description>一个在线的文件浏览系统</description>
@@ -45,6 +45,10 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -67,7 +71,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>4.5.11</version>
+            <version>5.1.3</version>
         </dependency>
 
         <!-- 存储策略相关 API, 对象存储、FTP、 Rest API-->
@@ -106,23 +110,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.alicp.jetcache</groupId>
+            <groupId>com.alibaba</groupId>
-            <artifactId>jetcache-starter-redis</artifactId>
+            <artifactId>fastjson</artifactId>
-            <version>2.5.14</version>
+            <version>1.2.61</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>
@@ -147,9 +137,8 @@
                 </executions>
                 <configuration>
                     <jvms>
-                        <jvm>-server</jvm>
-                        <jvm>-Xmx512m</jvm>
                         <jvm>-Djava.security.egd=file:/dev/./urandom</jvm>
+                        <jvm>-Dfile.encoding=utf-8</jvm>
                     </jvms>
                 </configuration>
             </plugin>

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

@@ -1,61 +0,0 @@
-package im.zhaojun.aliyun.service;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @author zhaojun
- */
-@Service
-public class AliyunServiceImpl extends AbstractS3FileService implements FileService {
-
-    private static final Logger log = LoggerFactory.getLogger(AliyunServiceImpl.class);
-
-    @Override
-    public void init() {
-        try {
-            Map<String, StorageConfig> stringStorageConfigMap =
-                    storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum());
-            String accessKey = stringStorageConfigMap.get(StorageConfigConstant.ACCESS_KEY).getValue();
-            String secretKey = stringStorageConfigMap.get(StorageConfigConstant.SECRET_KEY).getValue();
-            String endPoint = stringStorageConfigMap.get(StorageConfigConstant.ENDPOINT_KEY).getValue();
-
-            super.domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
-            super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
-            super.bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
-
-            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();
-            }
-        } catch (Exception e) {
-            log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过");
-        }
-    }
-
-    @Override
-    public StorageTypeEnum getStorageTypeEnum() {
-        return StorageTypeEnum.ALIYUN;
-    }
-
-}

src/main/java/im/zhaojun/common/annotation/CheckStorageStrategyInit.java

@@ -1,15 +0,0 @@
-package im.zhaojun.common.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 标记注解, 用于在调用前检查是否已存储策略
- * @author zhaojun
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface CheckStorageStrategyInit {
-}

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

@@ -1,31 +0,0 @@
-package im.zhaojun.common.aspect;
-
-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 org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.springframework.stereotype.Component;
-
-/**
- * @author zhaojun
- */
-@Aspect
-@Component
-public class StorageStrategyInitCheckAspect {
-
-    @Before("@annotation(im.zhaojun.common.annotation.CheckStorageStrategyInit)")
-    public void logStart() {
-        SystemConfigService systemConfigService = SpringContextHolder.getBean(SystemConfigService.class);
-        AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
-        if (currentFileService == null) {
-            throw new StorageStrategyUninitializedException("存储策略尚未初始化, 请联系管理员!");
-        }
-        if (currentFileService.getIsUnInitialized()) {
-            throw new StorageStrategyUninitializedException("存储策略异常, 请联系管理员!");
-        }
-
-    }
-
-}

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

@@ -1,103 +0,0 @@
-package im.zhaojun.common.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.AbstractFileService;
-import im.zhaojun.common.service.StorageConfigService;
-import im.zhaojun.common.service.SystemConfigService;
-import im.zhaojun.onedrive.china.service.OneDriveChinaService;
-import im.zhaojun.onedrive.china.service.OneDriveServiceChinaImpl;
-import im.zhaojun.onedrive.common.model.OneDriveToken;
-import im.zhaojun.onedrive.international.service.OneDriveService;
-import im.zhaojun.onedrive.international.service.OneDriveServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * @author zhaojun
- */
-@Configuration
-@EnableScheduling
-@Slf4j
-public class GlobalScheduleTask {
-
-    @Resource
-    private StorageConfigService storageConfigService;
-
-    @Resource
-    private OneDriveService oneDriveService;
-
-    @Resource
-    private OneDriveChinaService oneDriveChinaService;
-
-    @Resource
-    private SystemConfigService systemConfigService;
-
-    /**
-     * 项目启动 30 秒后, 每 15 分支执行一次刷新 OneDrive Token 的定时任务.
-     */
-    @Scheduled(fixedRate = 1000 * 60 * 15, initialDelay = 1000 * 30)
-    public void autoRefreshOneDriveToken() {
-
-        AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
-
-        if (!(currentFileService instanceof OneDriveServiceImpl
-            || currentFileService instanceof OneDriveServiceChinaImpl)) {
-            log.debug("当前启用存储类型, 不是 OneDrive, 跳过自动刷新 AccessToken");
-            return;
-        }
-
-        if (currentFileService.getIsUnInitialized()) {
-            log.debug("当前启用 OneDrive 未初始化成功, 跳过自动刷新 AccessToken");
-            return;
-        }
-
-        try {
-            refreshOneDriveToken(StorageTypeEnum.ONE_DRIVE);
-        } catch (Exception e) {
-            log.debug("刷新 OneDrive Token 失败.", e);
-        }
-
-        try {
-            refreshOneDriveToken(StorageTypeEnum.ONE_DRIVE_CHINA);
-        } catch (Exception e) {
-            log.debug("刷新 OneDrive 世纪互联 Token 失败.", e);
-        }
-    }
-
-    /**
-     * 调用刷新 OneDrive Token
-     */
-    public void refreshOneDriveToken(StorageTypeEnum storageType) {
-
-        OneDriveToken refreshToken;
-        if (Objects.equals(storageType, StorageTypeEnum.ONE_DRIVE_CHINA)) {
-            refreshToken = oneDriveChinaService.getRefreshToken(storageType);
-        } else {
-            refreshToken = oneDriveService.getRefreshToken(storageType);
-        }
-
-
-        if (refreshToken.getAccessToken() == null || refreshToken.getRefreshToken() == null) {
-            return;
-        }
-
-        StorageConfig accessTokenConfig =
-                storageConfigService.selectByTypeAndKey(storageType, StorageConfigConstant.ACCESS_TOKEN_KEY);
-        StorageConfig refreshTokenConfig =
-                storageConfigService.selectByTypeAndKey(storageType, StorageConfigConstant.REFRESH_TOKEN_KEY);
-        accessTokenConfig.setValue(refreshToken.getAccessToken());
-        refreshTokenConfig.setValue(refreshToken.getRefreshToken());
-
-        storageConfigService.updateStorageConfig(Arrays.asList(accessTokenConfig, refreshTokenConfig));
-        log.info("刷新 {} key 时间: {}", storageType.getDescription(), LocalDateTime.now());
-    }
-}

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

@@ -1,18 +0,0 @@
-package im.zhaojun.common.config;
-
-import im.zhaojun.common.model.enums.StorageTypeEnumDeSerializerConvert;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.format.FormatterRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @author zhaojun
- */
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
-
-    @Override
-    public void addFormatters(FormatterRegistry registry) {
-        registry.addConverter(new StorageTypeEnumDeSerializerConvert());
-    }
-}

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

@@ -1,173 +0,0 @@
-package im.zhaojun.common.controller;
-
-import im.zhaojun.common.config.StorageTypeFactory;
-import im.zhaojun.common.model.StorageConfig;
-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 org.slf4j.Logger;
-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.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * 后台管理
- * @author zhaojun
- */
-@RestController
-@RequestMapping("/admin")
-public class AdminController {
-
-    private static final Logger log = LoggerFactory.getLogger(AdminController.class);
-
-    @Resource
-    private StorageConfigService storageConfigService;
-
-    @Resource
-    private SystemConfigService systemConfigService;
-
-    @Resource
-    private FileAsyncCacheService fileAsyncCacheService;
-
-    /**
-     * 获取系统配置
-     */
-    @GetMapping("/config")
-    public ResultBean getConfig() {
-        SystemConfigDTO systemConfigDTO = systemConfigService.getSystemConfig();
-        return ResultBean.success(systemConfigDTO);
-    }
-
-    /**
-     * 更新系统配置
-     */
-    @PostMapping("/config")
-    public ResultBean updateConfig(SystemConfigDTO systemConfigDTO) throws Exception {
-        AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
-        systemConfigDTO.setId(1);
-        systemConfigService.updateSystemConfig(systemConfigDTO);
-
-        StorageTypeEnum currentStorageStrategy = currentFileService.getStorageTypeEnum();
-        if (!Objects.equals(currentStorageStrategy, systemConfigDTO.getStorageStrategy())) {
-            log.info("已将存储策略由 {} 切换为 {}",
-                    currentStorageStrategy.getDescription(),
-                    systemConfigDTO.getStorageStrategy().getDescription());
-            refreshStorageStrategy();
-        }
-
-        return ResultBean.success();
-    }
-
-    /**
-     * 修改管理员登陆密码
-     */
-    @PostMapping("/update-pwd")
-    public ResultBean updatePwd(String username, String password) {
-        systemConfigService.updateUsernameAndPwd(username, password);
-        return ResultBean.success();
-    }
-
-    /**
-     * 获取指定存储策略的设置
-     * @param storageType   存储策略
-     * @return              所有设置
-     */
-    @GetMapping("/strategy-form")
-    public ResultBean getFormByStorageType(StorageTypeEnum storageType) {
-        List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageType);
-        return ResultBean.success(storageConfigList);
-    }
-
-    @GetMapping("/support-strategy")
-    public ResultBean supportStrategy() {
-        List<StorageStrategyDTO> result = new ArrayList<>();
-        StorageTypeEnum[] values = StorageTypeEnum.values();
-        for (StorageTypeEnum value : values) {
-            AbstractFileService storageTypeService = StorageTypeFactory.getStorageTypeService(value);
-            result.add(new StorageStrategyDTO(value.getKey(),
-                                    value.getDescription(),
-                                    storageTypeService.getIsInitialized()));
-        }
-        return ResultBean.successData(result);
-    }
-
-    /**
-     * 保存存储策略
-     * @param storageStrategyConfig     保存表单值
-     * @param storageStrategy           所属策略
-     * @return                          操作结果
-     * @throws Exception                表单解析出错异常
-     */
-    @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);
-
-        // 获取当前修改的存储策略 Service, 尝试调用初始化.
-        AbstractFileService updateStorageStrategyService = StorageTypeFactory.getStorageTypeService(storageStrategy);
-        updateStorageStrategyService.init();
-
-        // 如果修改的为当前启用的缓存, 则重新进行缓存.
-        StorageTypeEnum currentStorageStrategy = systemConfigService.getCurrentStorageStrategy();
-        if (Objects.equals(storageStrategy, currentStorageStrategy)) {
-            if (log.isDebugEnabled()) {
-                log.debug("检测到更新了当前启用的存储策略 {}, 已清理缓存.", currentStorageStrategy);
-            }
-
-            AbstractFileService fileService = systemConfigService.getCurrentFileService();
-            fileService.clearFileCache();
-            fileAsyncCacheService.cacheGlobalFile();
-        }
-
-        // 返回是否初始化成功.
-        if (updateStorageStrategyService.getIsInitialized()) {
-            return ResultBean.success();
-        } else {
-            return ResultBean.error("保存成功, 但尝试初始化异常, 请检查设置.");
-        }
-    }
-
-    /**
-     * 更新存储策略
-     */
-    public void refreshStorageStrategy() throws Exception {
-        StorageTypeEnum storageStrategy = systemConfigService.getCurrentStorageStrategy();
-        refreshStorageStrategy(storageStrategy);
-    }
-
-    /**
-     * 更新存储策略
-     */
-    public void refreshStorageStrategy(StorageTypeEnum storageStrategy) throws Exception {
-        if (storageStrategy == null) {
-            log.info("尚未配置存储策略.");
-        } else {
-            AbstractFileService fileService = systemConfigService.getCurrentFileService();
-            fileService.init();
-            fileService.clearFileCache();
-            log.info("切换至存储类型: {}", storageStrategy.getDescription());
-            fileAsyncCacheService.cacheGlobalFile();
-        }
-    }
-
-}

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

@@ -1,80 +0,0 @@
-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
- */
-@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();
-        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/CommonController.java

@@ -1,65 +0,0 @@
-package im.zhaojun.common.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 org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author zhaojun
- */
-@RestController
-@RequestMapping("/common")
-public class CommonController {
-
-    @GetMapping("/support-strategy")
-    public ResultBean supportStrategy() {
-        return ResultBean.successData(StorageTypeEnum.values());
-    }
-
-    /**
-     * 获取文件内容, 仅限用于, txt, md, ini 等普通文本文件.
-     * @param url       文件路径
-     * @return          文件内容
-     */
-    @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 url       文件 URL
-     * @return          音频信息, 标题封面等信息
-     */
-    @GetMapping("/audio-info")
-    public ResultBean getAudioInfo(String url) throws Exception {
-        return ResultBean.success(AudioHelper.getAudioInfo(url));
-    }
-}

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

@@ -1,155 +0,0 @@
-package im.zhaojun.common.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.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 org.springframework.web.bind.annotation.GetMapping;
-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.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * 前台文件管理
- * @author zhaojun
- */
-@RequestMapping("/api")
-@RestController
-public class FileController {
-
-    @Resource
-    private SystemService systemService;
-
-    @Resource
-    private SystemConfigService systemConfigService;
-
-    @Resource
-    private FileAsyncCacheService fileAsyncCacheService;
-
-    /**
-     * 滚动加载每页条数.
-     */
-    private static final Integer PAGE_SIZE = 30;
-
-    @CheckStorageStrategyInit
-    @GetMapping("/list")
-    public ResultBean list(@RequestParam(defaultValue = "/") String path,
-                           @RequestParam(defaultValue = "name") String sortBy,
-                           @RequestParam(defaultValue = "asc") String order,
-                           @RequestParam(required = false) String password,
-                           @RequestParam(defaultValue = "1") Integer page) throws Exception {
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
-        List<FileItemDTO> fileItemList = fileService.fileList(StringUtils.removeDuplicateSeparator("/" + path + "/"));
-        for (FileItemDTO fileItemDTO : fileItemList) {
-            if (ZFileConstant.PASSWORD_FILE_NAME.equals(fileItemDTO.getName())
-                && !HttpUtil.getTextContent(fileItemDTO.getUrl()).equals(password)) {
-                if (password != null && !"".equals(password)) {
-                    return ResultBean.error("密码错误.");
-                }
-                return ResultBean.error("此文件夹需要密码.", ResultBean.REQUIRED_PASSWORD);
-            }
-        }
-
-        List<FileItemDTO> sortedPagingData = getSortedPagingData(fileItemList, page);
-        return ResultBean.successData(sortedPagingData);
-    }
-
-
-    /**
-     * 获取系统配置信息和当前页的标题, 文件头, 文件尾信息
-     * @param path          路径
-     */
-    @CheckStorageStrategyInit
-    @GetMapping("/config")
-    public ResultBean getConfig(String path) throws Exception {
-        SiteConfigDTO config = systemService.getConfig(StringUtils.removeDuplicateSeparator("/" + path + "/"));
-        config.setSystemConfigDTO(systemConfigService.getSystemConfig());
-        return ResultBean.successData(config);
-    }
-
-
-    @CheckStorageStrategyInit
-    @GetMapping("/search")
-    public ResultBean search(@RequestParam(value = "name", defaultValue = "/") String name,
-                             @RequestParam(defaultValue = "name") String sortBy,
-                             @RequestParam(defaultValue = "asc") String order,
-                             @RequestParam(defaultValue = "1") Integer page) {
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
-        SystemConfigDTO systemConfigDTO = systemConfigService.getSystemConfig();
-        if (BooleanUtil.isFalse(systemConfigDTO.getSearchEnable())) {
-            throw new SearchDisableException("搜索功能未开启");
-        }
-        if (!fileAsyncCacheService.isCacheFinish()) {
-            throw new SearchDisableException("搜索功能缓存预热中, 请稍后再试");
-        }
-        List<FileItemDTO> fileItemList = fileService.search(URLUtil.decode(name));
-        List<FileItemDTO> sortedPagingData = getSortedPagingData(fileItemList, page);
-        return ResultBean.successData(sortedPagingData);
-    }
-
-
-    /**
-     * 过滤文件列表, 不显示密码, 头部和尾部文件.
-     */
-    private void filterFileList(List<FileItemDTO> fileItemList) {
-        if (fileItemList == null) {
-            return;
-        }
-
-        fileItemList.removeIf(fileItem -> ZFileConstant.PASSWORD_FILE_NAME.equals(fileItem.getName())
-                || ZFileConstant.HEADER_FILE_NAME.equals(fileItem.getName()));
-    }
-
-
-    private List<FileItemDTO> getSortedPagingData(List<FileItemDTO> fileItemList, Integer page) {
-        ArrayList<FileItemDTO> copy = new ArrayList<>(Arrays.asList(new FileItemDTO[fileItemList.size()]));
-        Collections.copy(copy, fileItemList);
-
-        // 排序, 先按照文件类型比较, 文件夹在前, 文件在后, 然后根据 sortBy 字段排序, 默认为升序;
-        copy.sort(new FileComparator());
-        filterFileList(copy);
-
-        int total = copy.size();
-        int totalPage = (total + PAGE_SIZE - 1) / PAGE_SIZE;
-
-        if (page > totalPage) {
-            return new ArrayList<>();
-        }
-
-        int start = (page - 1) * PAGE_SIZE;
-        int end = page * PAGE_SIZE;
-        end = Math.min(end, total);
-        return new ArrayList<>(copy.subList(start, end));
-    }
-
-
-    /**
-     * 获取指定路径下的文件信息内容
-     * @param path      文件全路径
-     * @return          该文件的名称, 路径, 大小, 下载地址等信息.
-     */
-    @CheckStorageStrategyInit
-    @GetMapping("/directlink")
-    public ResultBean directlink(String path) {
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
-        return ResultBean.successData(fileService.getFileItem(path));
-    }
-}

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

@@ -1,83 +0,0 @@
-package im.zhaojun.common.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 org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 系统安装初始化
- * @author zhaojun
- */
-@RestController
-public class InstallController {
-
-    @Resource
-    private SystemConfigService systemConfigService;
-
-    @Resource
-    private StorageConfigService storageConfigService;
-
-    @Resource
-    private AdminController adminController;
-
-    @GetMapping("/is-installed")
-    public ResultBean isInstall() {
-        if (systemConfigService.getCurrentStorageStrategy() == null) {
-            return ResultBean.success();
-        }
-        return ResultBean.error("请勿重复初始化");
-    }
-
-
-    @PostMapping("/install")
-    public ResultBean install(InstallModelDTO installModelDTO) throws Exception {
-        SystemConfigDTO systemConfigDTO = systemConfigService.getSystemConfig();
-
-        if (systemConfigDTO.getStorageStrategy() != null) {
-            return ResultBean.error("请勿重复初始化.");
-        }
-
-        systemConfigDTO.setSiteName(installModelDTO.getSiteName());
-        StorageTypeEnum storageTypeEnum = installModelDTO.getStorageStrategy();
-        systemConfigDTO.setStorageStrategy(storageTypeEnum);
-        systemConfigDTO.setUsername(installModelDTO.getUsername());
-        systemConfigDTO.setPassword(SecureUtil.md5(installModelDTO.getPassword()));
-        systemConfigDTO.setDomain(installModelDTO.getDomain());
-        systemConfigService.updateSystemConfig(systemConfigDTO);
-
-        Map<String, String> storageStrategyConfig = installModelDTO.getStorageStrategyConfig();
-
-        List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageTypeEnum);
-        for (StorageConfig storageConfig : storageConfigList) {
-            String key = storageConfig.getKey();
-            String value = storageStrategyConfig.get(key);
-            storageConfig.setValue(value);
-        }
-
-        storageConfigService.updateStorageConfig(storageConfigList);
-        adminController.refreshStorageStrategy();
-        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/exception/InitializeException.java

@@ -1,29 +0,0 @@
-package im.zhaojun.common.exception;
-
-/**
- * 对象存储初始化异常
- * @author zhaojun
- */
-public class InitializeException extends RuntimeException {
-
-    private static final long serialVersionUID = -1920550904063819880L;
-
-    public InitializeException() {
-    }
-
-    public InitializeException(String message) {
-        super(message);
-    }
-
-    public InitializeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public InitializeException(Throwable cause) {
-        super(cause);
-    }
-
-    public InitializeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}

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

@@ -1,26 +0,0 @@
-package im.zhaojun.common.exception;
-
-/**
- * @author zhaojun
- */
-public class SearchDisableException extends RuntimeException {
-
-    public SearchDisableException() {
-    }
-
-    public SearchDisableException(String message) {
-        super(message);
-    }
-
-    public SearchDisableException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public SearchDisableException(Throwable cause) {
-        super(cause);
-    }
-
-    public SearchDisableException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}

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

@@ -1,29 +0,0 @@
-package im.zhaojun.common.exception;
-
-/**
- * 未知的存储类型异常
- * @author zhaojun
- */
-public class UnknownStorageTypeException extends RuntimeException {
-
-    private static final long serialVersionUID = -4853756482605773655L;
-
-    public UnknownStorageTypeException() {
-    }
-
-    public UnknownStorageTypeException(String message) {
-        super(message);
-    }
-
-    public UnknownStorageTypeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public UnknownStorageTypeException(Throwable cause) {
-        super(cause);
-    }
-
-    public UnknownStorageTypeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}

src/main/java/im/zhaojun/common/model/StorageConfig.java

@@ -1,72 +0,0 @@
-package im.zhaojun.common.model;
-
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * @author zhaojun
- */
-@Entity(name = "STORAGE_CONFIG")
-@Data
-public class StorageConfig {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
-
-    private StorageTypeEnum type;
-
-    @Column(name = "k")
-    private String key;
-
-    private String title;
-
-    @Column(length = 4000)
-    private String value;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public StorageTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(StorageTypeEnum type) {
-        this.type = type;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/im/zhaojun/common/model/SystemConfig.java

@@ -1,60 +0,0 @@
-package im.zhaojun.common.model;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * @author zhaojun
- */
-@Entity(name = "SYSTEM_CONFIG")
-@Data
-public class SystemConfig {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
-
-    @Column(name = "k")
-    private String key;
-
-    private String value;
-
-    private String remark;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-}

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

@@ -1,37 +0,0 @@
-package im.zhaojun.common.model.constant;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author zhaojun
- */
-@Configuration
-public class ZFileConstant {
-
-    public final static String USER_HOME = System.getProperty("user.home");
-
-    public static final String AUDIO_TMP_PATH = "/.zfile/tmp/audio/";
-
-    /**
-     * 页面头部文件
-     */
-    public static String HEADER_FILE_NAME = "header.md";
-
-    /**
-     * 密码文件
-     */
-    public static String PASSWORD_FILE_NAME = "password.txt";
-
-    @Autowired(required = false)
-    public void setHeaderFileName(@Value("${zfile.constant.header}") String headerFileName) {
-        ZFileConstant.HEADER_FILE_NAME = headerFileName;
-    }
-
-    @Autowired(required = false)
-    public void setPasswordFileName(@Value("${zfile.constant.password}") String passwordFileName) {
-        ZFileConstant.PASSWORD_FILE_NAME = passwordFileName;
-    }
-
-}

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

@@ -1,53 +0,0 @@
-package im.zhaojun.common.model.dto;
-
-/**
- * @author zhaojun
- */
-public class AudioInfoDTO {
-    private String title;
-    private String artist;
-    private String cover;
-    private String src;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getArtist() {
-        return artist;
-    }
-
-    public void setArtist(String artist) {
-        this.artist = artist;
-    }
-
-    public String getCover() {
-        return cover;
-    }
-
-    public void setCover(String cover) {
-        this.cover = cover;
-    }
-
-    public String getSrc() {
-        return src;
-    }
-
-    public void setSrc(String src) {
-        this.src = src;
-    }
-
-    @Override
-    public String toString() {
-        return "AudioInfoDTO{" +
-                "title='" + title + '\'' +
-                ", artist='" + artist + '\'' +
-                ", cover='" + cover + '\'' +
-                ", src='" + src + '\'' +
-                '}';
-    }
-}

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

@@ -1,17 +0,0 @@
-package im.zhaojun.common.model.dto;
-
-import lombok.Data;
-
-import java.util.Set;
-
-/**
- * @author zhaojun
- */
-@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/dto/InstallModelDTO.java

@@ -1,77 +0,0 @@
-package im.zhaojun.common.model.dto;
-
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-
-import java.util.Map;
-
-/**
- * @author zhaojun
- */
-public class InstallModelDTO {
-    private String siteName;
-    private StorageTypeEnum storageStrategy;
-    private String username;
-    private String password;
-    private String domain;
-    private Map<String, String> storageStrategyConfig;
-
-    public String getSiteName() {
-        return siteName;
-    }
-
-    public void setSiteName(String siteName) {
-        this.siteName = siteName;
-    }
-
-    public StorageTypeEnum getStorageStrategy() {
-        return storageStrategy;
-    }
-
-    public void setStorageStrategy(StorageTypeEnum storageStrategy) {
-        this.storageStrategy = storageStrategy;
-    }
-
-    public Map<String, String> getStorageStrategyConfig() {
-        return storageStrategyConfig;
-    }
-
-    public void setStorageStrategyConfig(Map<String, String> storageStrategyConfig) {
-        this.storageStrategyConfig = storageStrategyConfig;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getDomain() {
-        return domain;
-    }
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
-    @Override
-    public String toString() {
-        return "InstallModelDTO{" +
-                "siteName='" + siteName + '\'' +
-                ", storageStrategy=" + storageStrategy +
-                ", username='" + username + '\'' +
-                ", password='" + password + '\'' +
-                ", domain='" + domain + '\'' +
-                ", storageStrategyConfig=" + storageStrategyConfig +
-                '}';
-    }
-}

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

@@ -1,23 +0,0 @@
-package im.zhaojun.common.model.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * @author zhaojun
- */
-@Data
-@ToString
-public class SiteConfigDTO implements Serializable {
-
-    private static final long serialVersionUID = 8811196207046121740L;
-
-    private String header;
-
-    @JsonProperty("viewConfig")
-    private SystemConfigDTO systemConfigDTO;
-
-}

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

@@ -1,31 +0,0 @@
-package im.zhaojun.common.repository;
-
-import im.zhaojun.common.model.StorageConfig;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author zhaojun
- */
-@Repository
-public interface StorageConfigRepository extends JpaRepository<StorageConfig, Integer> {
-
-    /**
-     * 根据存储类型找对应的配置信息
-     * @param type  存储类型
-     * @return      此类型所有的配置信息
-     */
-    List<StorageConfig> findByTypeOrderById(StorageTypeEnum type);
-
-    /**
-     * 根据存储类型找到某个 KEY 的值
-     * @param type  存储类型
-     * @param key   KEY
-     * @return      KEY 对应的对象
-     */
-    StorageConfig findByTypeAndKey(StorageTypeEnum type, String key);
-
-}

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

@@ -1,245 +0,0 @@
-package im.zhaojun.common.service;
-
-import cn.hutool.core.util.BooleanUtil;
-import cn.hutool.core.util.StrUtil;
-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;
-import com.alicp.jetcache.anno.CreateCache;
-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.FileTypeEnum;
-import im.zhaojun.common.model.enums.StorageTypeEnum;
-import im.zhaojun.common.util.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-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.Objects;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-/**
- * @author zhaojun
- */
-@Slf4j
-public abstract class AbstractFileService extends FileCacheService implements FileService {
-
-    private static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-cache:";
-
-    @Value("${zfile.cache.timeout}")
-    protected Long timeout;
-
-    protected boolean isInitialized = false;
-
-    protected String basePath;
-
-    @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 分钟刷新一次.
-     * @param path 文件路径
-     * @return     文件及文件夹列表
-     * @throws Exception  获取文件列表中出现的异常
-     */
-    @Override
-    @Cached(name = SYSTEM_CONFIG_CACHE_PREFIX,
-            key =  "args[0]",
-            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;
-
-    /**
-     * 清理当前存储策略的缓存
-     * 1. 删除全部缓存
-     * 2. 关闭自动刷新
-     * 3. 重置缓存个数
-     * 4. 标记为当前处于未完成缓存状态
-     */
-    public void clearFileCache() throws Exception {
-        Set<String> cacheKeys = getCacheKeys();
-        cache.removeAll(cacheKeys);
-        closeCacheAutoRefresh();
-        fileAsyncCacheService.resetCacheCount();
-        fileAsyncCacheService.setCacheFinish(false);
-    }
-
-    /**
-     * 初始化方法, 启动时自动调用实现类的此方法进行初始化.
-     */
-    @PostConstruct
-    public abstract void init();
-
-    protected boolean testConnection() {
-        boolean flag = true;
-        try {
-            fileList("/");
-        } catch (Exception e) {
-            log.debug(getStorageTypeEnum().getDescription() + " 初始化异常", e);
-            flag = false;
-        }
-        return flag;
-    }
-
-    /**
-     * 获取是否初始化成功
-     * @return              初始化成功与否
-     */
-    public boolean getIsUnInitialized() {
-        return !isInitialized;
-    }
-
-    /**
-     * 获取是否初始化成功
-     * @return              初始化成功与否
-     */
-    public boolean getIsInitialized() {
-        return isInitialized;
-    }
-
-    /**
-     * 获取存储策略类型
-     * @return              存储策略类型枚举
-     */
-    public abstract StorageTypeEnum getStorageTypeEnum();
-
-    /**
-     * 搜索文件
-     * @param name          文件名
-     * @return              包含该文件名的所有文件或文件夹
-     */
-    public List<FileItemDTO> search(String name) {
-        List<FileItemDTO> result = new ArrayList<>();
-
-        boolean searchIgnoreCase = systemConfigService.getSearchIgnoreCase();
-
-        List<FileItemDTO> fileItemList = selectAllFileList();
-        for (FileItemDTO fileItemDTO : fileItemList) {
-
-            boolean testResult;
-
-            if (searchIgnoreCase) {
-                testResult = StrUtil.containsIgnoreCase(fileItemDTO.getName(), name);
-            } else {
-                testResult = fileItemDTO.getName().contains(name);
-            }
-
-            if (testResult) {
-                result.add(fileItemDTO);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 查询所有文件, 仅去缓存中查询.
-     * @return              所有文件
-     */
-    public List<FileItemDTO> selectAllFileList() {
-        List<FileItemDTO> result = new ArrayList<>();
-        boolean enableCache = systemConfigService.getEnableCache();
-        if (!enableCache) {
-            log.debug("未开启缓存, 不支持查询所有文件.");
-            return null;
-        }
-        String path = "/";
-
-        List<FileItemDTO> fileItemList = cache.get(path);
-        fileItemList = fileItemList == null ? new ArrayList<>() : fileItemList;
-        ArrayDeque<FileItemDTO> queue = new ArrayDeque<>(fileItemList);
-
-        while (!queue.isEmpty()) {
-            FileItemDTO fileItemDTO = queue.pop();
-            result.add(fileItemDTO);
-            if (fileItemDTO.getType() == FileTypeEnum.FOLDER) {
-                String filePath = StringUtils.removeDuplicateSeparator("/" + fileItemDTO.getPath() + "/" + fileItemDTO.getName() + "/");
-                List<FileItemDTO> cacheList = cache.get(filePath);
-                if (cacheList != null && isNotEncryptedFolder(cacheList)) {
-                    queue.addAll(cacheList);
-                }
-            }
-
-        }
-        return result;
-    }
-
-    /**
-     * 不是加密文件夹
-     * @param list      文件夹中的内容
-     * @return          返回此文件夹是否加密.
-     */
-    private boolean isNotEncryptedFolder(List<FileItemDTO> list) {
-        // 如果开启了 "搜索包含加密文件" 选项, 则直接返回 true.
-        SystemConfigDTO systemConfig = systemConfigService.getSystemConfig();
-        if (BooleanUtil.isFalse(systemConfig.getSearchContainEncryptedFile())) {
-            return true;
-        }
-
-        // 遍历文件判断是否包含
-        for (FileItemDTO fileItemDTO : list) {
-            if (Objects.equals(ZFileConstant.PASSWORD_FILE_NAME, fileItemDTO.getName())) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * 获取所有缓存的 Key, 仅当开启缓存, 且缓存完成时, 可获取.
-     * @return              所有缓存的 Key
-     */
-    public Set<String> getCacheKeys() {
-        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);
-    }
-
-    public abstract FileItemDTO getFileItem(String path);
-
-}

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

@@ -1,140 +0,0 @@
-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 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 {
-
-    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;
-
-    @Async
-    public void cacheGlobalFile() {
-        StorageTypeEnum storageStrategy = systemConfigService.getCurrentStorageStrategy();
-
-        if (storageStrategy == null) {
-            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 {
-            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 ), 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

@@ -1,38 +0,0 @@
-package im.zhaojun.common.service;
-
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * @author zhaojun
- */
-@Service
-public class FileCacheService {
-
-    @Resource
-    private SystemConfigService systemConfigService;
-
-    @Resource
-    @Lazy
-    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/SystemConfigService.java

@@ -1,158 +0,0 @@
-package im.zhaojun.common.service;
-
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.BooleanUtil;
-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 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 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) {
-            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) throws Exception {
-        List<SystemConfig> systemConfigList = new ArrayList<>();
-
-        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);
-                }
-            }
-        }
-
-        boolean oldEnableCache = getEnableCache();
-        boolean curEnableCache = BooleanUtil.isTrue(systemConfigDTO.getEnableCache());
-
-        configCache.remove(SYSTEM_CONFIG_CACHE_KEY);
-
-        systemConfigRepository.saveAll(systemConfigList);
-
-        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);
-        systemConfigRepository.save(usernameConfig);
-
-        String encryptionPassword = SecureUtil.md5(password);
-        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 BooleanUtil.isTrue(systemConfigDTO.getEnableCache());
-    }
-
-    public boolean getSearchIgnoreCase() {
-        SystemConfigDTO systemConfigDTO = getSystemConfig();
-        return BooleanUtil.isTrue(systemConfigDTO.getSearchIgnoreCase());
-    }
-
-
-}

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

@@ -1,40 +0,0 @@
-package im.zhaojun.common.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.util.HttpUtil;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author zhaojun
- */
-@Service
-public class SystemService {
-
-    @Resource
-    private SystemConfigService systemConfigService;
-
-    /**
-     * 构建指定路径下标题, 页头, 页尾
-     * @param path          路径
-     */
-    public synchronized SiteConfigDTO getConfig(String path) throws Exception {
-
-        SiteConfigDTO siteConfigDTO = new SiteConfigDTO();
-        AbstractFileService fileService = systemConfigService.getCurrentFileService();
-
-        List<FileItemDTO> fileItemList = new ArrayList<>(fileService.fileList(path));
-        for (FileItemDTO fileItemDTO : fileItemList) {
-            if (ZFileConstant.HEADER_FILE_NAME.equalsIgnoreCase(fileItemDTO.getName())) {
-                siteConfigDTO.setHeader(HttpUtil.getTextContent(fileItemDTO.getUrl()));
-            }
-        }
-        return siteConfigDTO;
-    }
-
-}

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

@@ -1,29 +0,0 @@
-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) {
-        RestTemplate restTemplate = SpringContextHolder.getBean("restTemplate");
-        String result = restTemplate.getForObject(url, String.class);
-        return result == null ? "" : result;
-    }
-
-    public static boolean checkUrlExist(String url) {
-        RestTemplate restTemplate = SpringContextHolder.getBean("restTemplate");
-        try {
-            restTemplate.headForHeaders(url);
-            return true;
-        } catch (RestClientException ignored) {
-        }
-        return false;
-    }
-
-}

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

@@ -1,101 +0,0 @@
-package im.zhaojun.ftp.service;
-
-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 org.apache.commons.net.ftp.FTPFile;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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
- */
-@Service
-public class FtpServiceImpl extends AbstractFileService implements FileService {
-
-    private static final Logger log = LoggerFactory.getLogger(FtpServiceImpl.class);
-
-    @Resource
-    private StorageConfigService storageConfigService;
-
-    private Ftp ftp;
-
-    private String domain;
-
-    @Override
-    public void init() {
-        try {
-            Map<String, StorageConfig> stringStorageConfigMap =
-                    storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum());
-            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();
-
-            if (Objects.isNull(host) || Objects.isNull(port) || Objects.isNull(username) || Objects.isNull(password)) {
-                isInitialized = false;
-            } else {
-                ftp = new Ftp(host, Integer.parseInt(port), username, password);
-                isInitialized = testConnection();
-            }
-
-        } catch (Exception e) {
-            log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过");
-        }
-    }
-
-    @Override
-    public List<FileItemDTO> fileList(String path) {
-        FTPFile[] ftpFiles = ftp.lsFiles(path);
-
-        List<FileItemDTO> fileItemList = new ArrayList<>();
-
-        for (FTPFile ftpFile : ftpFiles) {
-            FileItemDTO fileItemDTO = new FileItemDTO();
-            fileItemDTO.setName(ftpFile.getName());
-            fileItemDTO.setSize(ftpFile.getSize());
-            fileItemDTO.setTime(ftpFile.getTimestamp().getTime());
-            fileItemDTO.setType(ftpFile.isDirectory() ? FileTypeEnum.FOLDER : FileTypeEnum.FILE);
-            fileItemDTO.setPath(path);
-            if (ftpFile.isFile()) {
-                fileItemDTO.setUrl(getDownloadUrl(StringUtils.concatUrl(path, fileItemDTO.getName())));
-            }
-            fileItemList.add(fileItemDTO);
-        }
-        return fileItemList;
-    }
-
-    @Override
-    public String getDownloadUrl(String path) {
-        return URLUtil.complateUrl(domain, path);
-    }
-
-    @Override
-    public StorageTypeEnum getStorageTypeEnum() {
-        return StorageTypeEnum.FTP;
-    }
-
-    @Override
-    public FileItemDTO getFileItem(String path) {
-        FileItemDTO fileItemDTO = new FileItemDTO();
-        fileItemDTO.setUrl(getDownloadUrl(path));
-        return fileItemDTO;
-    }
-
-}

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

@@ -1,61 +0,0 @@
-package im.zhaojun.huawei.service;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @author zhaojun
- */
-@Service
-public class HuaweiServiceImpl extends AbstractS3FileService implements FileService {
-
-    private static final Logger log = LoggerFactory.getLogger(HuaweiServiceImpl.class);
-
-    @Override
-    public void init() {
-        try {
-            Map<String, StorageConfig> stringStorageConfigMap =
-                    storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum());
-            String accessKey = stringStorageConfigMap.get(StorageConfigConstant.ACCESS_KEY).getValue();
-            String secretKey = stringStorageConfigMap.get(StorageConfigConstant.SECRET_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();
-
-            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();
-            }
-        } catch (Exception e) {
-            log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过");
-        }
-    }
-
-    @Override
-    public StorageTypeEnum getStorageTypeEnum() {
-        return StorageTypeEnum.HUAWEI;
-    }
-
-}

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

@@ -1,69 +0,0 @@
-package im.zhaojun.local.controller;
-
-import cn.hutool.core.util.URLUtil;
-import im.zhaojun.common.exception.NotExistFileException;
-import im.zhaojun.common.util.StringUtils;
-import im.zhaojun.local.service.LocalServiceImpl;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.AntPathMatcher;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.HandlerMapping;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.util.Date;
-
-/**
- * @author zhaojun
- */
-@Controller
-public class LocalController {
-
-    @Resource
-    private LocalServiceImpl localServiceImpl;
-
-    @GetMapping("/file/**")
-    @ResponseBody
-    public ResponseEntity<Object> 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);
-        AntPathMatcher apm = new AntPathMatcher();
-        String filePath = apm.extractPathWithinPattern(bestMatchPattern, path);
-
-        return export(new File(StringUtils.concatPath(localServiceImpl.getFilePath(), URLUtil.decode(filePath))));
-    }
-
-    private ResponseEntity<Object> export(File file) {
-
-        if (!file.exists()) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body("404 FILE NOT FOUND");
-        }
-
-
-        MediaType mediaType = MediaType.APPLICATION_OCTET_STREAM;
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Cache-Control", "no-cache, no-store, must-revalidate");
-        headers.setContentDispositionFormData("attachment", URLUtil.encode(file.getName()));
-
-        headers.add("Pragma", "no-cache");
-        headers.add("Expires", "0");
-        headers.add("Last-Modified", new Date().toString());
-        headers.add("ETag", String.valueOf(System.currentTimeMillis()));
-        return ResponseEntity
-                .ok()
-                .headers(headers)
-                .contentLength(file.length())
-                .contentType(mediaType)
-                .body(new FileSystemResource(file));
-    }
-
-}

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

@@ -1,62 +0,0 @@
-package im.zhaojun.minio;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @author zhaojun
- */
-@Service
-public class MinIOServiceImpl extends AbstractS3FileService implements FileService {
-
-    private static final Logger log = LoggerFactory.getLogger(MinIOServiceImpl.class);
-
-    @Override
-    public void init() {
-        try {
-            Map<String, StorageConfig> stringStorageConfigMap =
-                    storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum());
-            String accessKey = stringStorageConfigMap.get(StorageConfigConstant.ACCESS_KEY).getValue();
-            String secretKey = stringStorageConfigMap.get(StorageConfigConstant.SECRET_KEY).getValue();
-            String endPoint = stringStorageConfigMap.get(StorageConfigConstant.ENDPOINT_KEY).getValue();
-            bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
-            basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
-
-            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()
-                        .withPathStyleAccessEnabled(true)
-                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "minio")).build();
-
-                isInitialized = testConnection();
-            }
-        } catch (Exception e) {
-            log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过");
-        }
-    }
-
-
-
-    @Override
-    public StorageTypeEnum getStorageTypeEnum() {
-        return StorageTypeEnum.MINIO;
-    }
-
-}

src/main/java/im/zhaojun/onedrive/china/service/OneDriveChinaService.java

@@ -1,54 +0,0 @@
-package im.zhaojun.onedrive.china.service;
-
-import im.zhaojun.onedrive.common.service.AbstractOneDriveService;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-/**
- * @author zhaojun
- */
-@Service
-public class OneDriveChinaService extends AbstractOneDriveService {
-
-    @Value("${zfile.onedirve-china.clientId}")
-    private String clientId;
-
-    @Value("${zfile.onedirve-china.redirectUri}")
-    private String redirectUri;
-
-    @Value("${zfile.onedirve-china.clientSecret}")
-    private String clientSecret;
-
-    @Value("${zfile.onedirve-china.scope}")
-    private String scope;
-
-    @Override
-    public String getGraphEndPoint() {
-        return "microsoftgraph.chinacloudapi.cn";
-    }
-
-    @Override
-    public String getAuthenticateEndPoint() {
-        return "login.partner.microsoftonline.cn";
-    }
-
-    @Override
-    public String getClientId() {
-        return clientId;
-    }
-
-    @Override
-    public String getRedirectUri() {
-        return redirectUri;
-    }
-
-    @Override
-    public String getClientSecret() {
-        return clientSecret;
-    }
-
-    @Override
-    public String getScope() {
-        return scope;
-    }
-}

src/main/java/im/zhaojun/onedrive/china/service/OneDriveServiceChinaImpl.java

@@ -1,83 +0,0 @@
-package im.zhaojun.onedrive.china.service;
-
-import im.zhaojun.common.config.GlobalScheduleTask;
-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.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractFileService;
-import im.zhaojun.common.service.FileService;
-import im.zhaojun.common.service.StorageConfigService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author zhaojun
- */
-@Service
-@Slf4j
-public class OneDriveServiceChinaImpl extends AbstractFileService implements FileService {
-
-    @Resource
-    private GlobalScheduleTask globalScheduleTask;
-
-    @Resource
-    private StorageConfigService storageConfigService;
-
-    @Resource
-    private OneDriveChinaService oneDriveChinaService;
-
-    @Override
-    public void init() {
-        try {
-            Map<String, StorageConfig> stringStorageConfigMap =
-                    storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum());
-            String accessToken = stringStorageConfigMap.get(StorageConfigConstant.ACCESS_TOKEN_KEY).getValue();
-            String refreshToken = stringStorageConfigMap.get(StorageConfigConstant.REFRESH_TOKEN_KEY).getValue();
-            super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
-
-            if (StringUtils.isEmpty(accessToken) || StringUtils.isEmpty(refreshToken)) {
-                log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());
-                isInitialized = false;
-            } else {
-                globalScheduleTask.refreshOneDriveToken(getStorageTypeEnum());
-                isInitialized = testConnection();
-            }
-        } catch (Exception e) {
-            log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过");
-        }
-    }
-
-    @Override
-    public List<FileItemDTO> fileList(String path) {
-        return oneDriveChinaService.list(basePath, path);
-    }
-
-    @Override
-    public String getDownloadUrl(String path) {
-        return null;
-    }
-
-    @Override
-    public StorageTypeEnum getStorageTypeEnum() {
-        return StorageTypeEnum.ONE_DRIVE_CHINA;
-    }
-
-    @Override
-    public FileItemDTO getFileItem(String path) {
-        FileItemDTO fileItemDTO ;
-
-        try {
-            fileItemDTO = oneDriveChinaService.getItem(path);
-        } catch (Exception e) {
-            throw new NotExistFileException();
-        }
-        return fileItemDTO;
-    }
-}

src/main/java/im/zhaojun/onedrive/common/config/OneDriveConfig.java

@@ -1,61 +0,0 @@
-package im.zhaojun.onedrive.common.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.OneDriveChinaService;
-import im.zhaojun.onedrive.international.service.OneDriveService;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import java.util.Collections;
-
-/**
- * @author zhaojun
- */
-@Configuration
-public class OneDriveConfig {
-
-    @Resource
-    private StorageConfigService storageConfigService;
-
-    @Resource
-    @Lazy
-    private OneDriveService oneDriveService;
-
-    @Resource
-    @Lazy
-    private OneDriveChinaService oneDriveChinaService;
-
-    @Bean
-    public RestTemplate oneDriveRestTemplate() {
-        RestTemplate restTemplate = new RestTemplate();
-
-        ClientHttpRequestInterceptor interceptor = (httpRequest, bytes, clientHttpRequestExecution) -> {
-            String host = httpRequest.getURI().getHost();
-            StorageTypeEnum type;
-            if (oneDriveChinaService.getGraphEndPoint().contains(host)) {
-                type = StorageTypeEnum.ONE_DRIVE_CHINA;
-            } else if  (oneDriveService.getGraphEndPoint().contains(host)) {
-                type = StorageTypeEnum.ONE_DRIVE;
-            } else {
-                return clientHttpRequestExecution.execute(httpRequest, bytes);
-            }
-
-            StorageConfig accessTokenConfig =
-                    storageConfigService.selectByTypeAndKey(type, StorageConfigConstant.ACCESS_TOKEN_KEY);
-
-            String tokenValue = String.format("%s %s", "Bearer", accessTokenConfig.getValue());
-            httpRequest.getHeaders().add("Authorization", tokenValue);
-            return clientHttpRequestExecution.execute(httpRequest, bytes);
-        };
-        restTemplate.setInterceptors(Collections.singletonList(interceptor));
-        return restTemplate;
-    }
-
-}

src/main/java/im/zhaojun/onedrive/common/service/AbstractOneDriveService.java

@@ -1,177 +0,0 @@
-package im.zhaojun.onedrive.common.service;
-
-import cn.hutool.core.util.URLUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
-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.model.enums.StorageTypeEnum;
-import im.zhaojun.common.repository.StorageConfigRepository;
-import im.zhaojun.common.util.StringUtils;
-import im.zhaojun.onedrive.common.model.OneDriveToken;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Zhao Jun
- * 2020/1/29 11:54
- */
-public abstract class AbstractOneDriveService {
-
-    protected static final String DRIVER_INFO_URL = "https://{graphEndPoint}/v1.0/me/drives";
-
-    protected static final String DRIVER_ROOT_URL = "https://{graphEndPoint}/v1.0/me/drive/root/children";
-
-    protected static final String DRIVER_ITEMS_URL = "https://{graphEndPoint}/v1.0/me/drive/root:{path}:/children";
-
-    protected static final String DRIVER_ITEM_URL = "https://{graphEndPoint}/v1.0/me/drive/root:{path}";
-
-    protected static final String AUTHENTICATE_URL = "https://{authenticateEndPoint}/common/oauth2/v2.0/token";
-
-    @Resource
-    private RestTemplate oneDriveRestTemplate;
-
-    @Resource
-    private StorageConfigRepository storageConfigRepository;
-
-    public OneDriveToken getRefreshToken(StorageTypeEnum storageType) {
-        StorageConfig refreshStorageConfig =
-                storageConfigRepository.findByTypeAndKey(storageType, StorageConfigConstant.REFRESH_TOKEN_KEY);
-
-        String param = "client_id=" + getClientId() +
-                "&redirect_uri=" + getRedirectUri() +
-                "&client_secret=" + getClientSecret() +
-                "&refresh_token=" + refreshStorageConfig.getValue() +
-                "&grant_type=refresh_token";
-
-        String fullAuthenticateUrl = AUTHENTICATE_URL.replace("{authenticateEndPoint}", getAuthenticateEndPoint());
-        HttpRequest post = HttpUtil.createPost(fullAuthenticateUrl);
-
-        post.body(param, "application/x-www-form-urlencoded");
-        HttpResponse response = post.execute();
-        return JSONObject.parseObject(response.body(), OneDriveToken.class);
-    }
-
-    public OneDriveToken getToken(String code) {
-        String param = "client_id=" + getClientId() +
-                "&redirect_uri=" + getRedirectUri() +
-                "&client_secret=" + getClientSecret() +
-                "&code=" + code +
-                "&scope=" + getScope() +
-                "&grant_type=authorization_code";
-
-        String fullAuthenticateUrl = AUTHENTICATE_URL.replace("{authenticateEndPoint}", getAuthenticateEndPoint());
-        HttpRequest post = HttpUtil.createPost(fullAuthenticateUrl);
-
-        post.body(param, "application/x-www-form-urlencoded");
-        HttpResponse response = post.execute();
-        return JSONObject.parseObject(response.body(), OneDriveToken.class);
-    }
-
-
-
-    public String getUserInfo() {
-        return oneDriveRestTemplate.getForObject(DRIVER_INFO_URL, String.class);
-    }
-
-    public List<FileItemDTO> list(String basePath, String path) {
-        path = StringUtils.removeFirstSeparator(path);
-        String fullPath = StringUtils.getFullPath(basePath, path);
-
-        List<FileItemDTO> result = new ArrayList<>();
-        String nextLink = null;
-
-        do {
-
-            String requestUrl;
-
-            if (nextLink != null) {
-                requestUrl = URLUtil.decode(nextLink);
-            }else if ("/".equalsIgnoreCase(fullPath) || "".equalsIgnoreCase(fullPath)) {
-                requestUrl = DRIVER_ROOT_URL;
-            } else {
-                requestUrl = DRIVER_ITEMS_URL;
-            }
-            fullPath = StringUtils.removeLastSeparator(fullPath);
-
-            ResponseEntity<String> responseEntity = oneDriveRestTemplate.getForEntity(requestUrl, String.class, getGraphEndPoint(), fullPath);
-            String body = responseEntity.getBody();
-
-            JSONObject root = JSON.parseObject(body);
-
-            nextLink = root.getString("@odata.nextLink");
-
-            JSONArray fileList = root.getJSONArray("value");
-
-            for (int i = 0; i < fileList.size(); i++) {
-
-                FileItemDTO fileItemDTO = new FileItemDTO();
-                JSONObject fileItem = fileList.getJSONObject(i);
-                fileItemDTO.setName(fileItem.getString("name"));
-                fileItemDTO.setSize(fileItem.getLong("size"));
-                fileItemDTO.setTime(fileItem.getDate("lastModifiedDateTime"));
-
-                if (fileItem.containsKey("file")) {
-                    fileItemDTO.setUrl(fileItem.getString("@microsoft.graph.downloadUrl"));
-                    fileItemDTO.setType(FileTypeEnum.FILE);
-                } else {
-                    fileItemDTO.setType(FileTypeEnum.FOLDER);
-                }
-
-                fileItemDTO.setPath(path);
-                result.add(fileItemDTO);
-            }
-        } while (nextLink != null);
-
-        return result;
-    }
-
-
-    public FileItemDTO getItem(String path) {
-        String requestUrl;
-
-        ResponseEntity<String> responseEntity = oneDriveRestTemplate.getForEntity(DRIVER_ITEM_URL, String.class, path);
-        String body = responseEntity.getBody();
-
-        JSONObject fileItem = JSON.parseObject(body);
-
-        FileItemDTO fileItemDTO = new FileItemDTO();
-        fileItemDTO.setName(fileItem.getString("name"));
-        fileItemDTO.setSize(fileItem.getLong("size"));
-        fileItemDTO.setTime(fileItem.getDate("lastModifiedDateTime"));
-
-        if (fileItem.containsKey("file")) {
-            fileItemDTO.setUrl(fileItem.getString("@microsoft.graph.downloadUrl"));
-            fileItemDTO.setType(FileTypeEnum.FILE);
-        } else {
-            fileItemDTO.setType(FileTypeEnum.FOLDER);
-        }
-
-        fileItemDTO.setPath(path);
-        return fileItemDTO;
-    }
-
-
-    public abstract String getGraphEndPoint();
-
-    public abstract String getAuthenticateEndPoint();
-
-    public abstract String getClientId();
-
-    public abstract String getRedirectUri();
-
-    public abstract String getClientSecret();
-
-    public abstract String getScope();
-}

src/main/java/im/zhaojun/onedrive/international/service/OneDriveService.java

@@ -1,54 +0,0 @@
-package im.zhaojun.onedrive.international.service;
-
-import im.zhaojun.onedrive.common.service.AbstractOneDriveService;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-/**
- * @author zhaojun
- */
-@Service
-public class OneDriveService extends AbstractOneDriveService {
-
-    @Value("${zfile.onedirve.clientId}")
-    protected String clientId;
-
-    @Value("${zfile.onedirve.redirectUri}")
-    protected String redirectUri;
-
-    @Value("${zfile.onedirve.clientSecret}")
-    protected String clientSecret;
-
-    @Value("${zfile.onedirve.scope}")
-    protected String scope;
-
-    @Override
-    public String getGraphEndPoint() {
-        return "graph.microsoft.com";
-    }
-
-    @Override
-    public String getAuthenticateEndPoint() {
-        return "login.microsoftonline.com";
-    }
-
-    @Override
-    public String getClientId() {
-        return clientId;
-    }
-
-    @Override
-    public String getRedirectUri() {
-        return redirectUri;
-    }
-
-    @Override
-    public String getClientSecret() {
-        return clientSecret;
-    }
-
-    @Override
-    public String getScope() {
-        return scope;
-    }
-}

src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java

@@ -1,83 +0,0 @@
-package im.zhaojun.onedrive.international.service;
-
-import im.zhaojun.common.config.GlobalScheduleTask;
-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.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractFileService;
-import im.zhaojun.common.service.FileService;
-import im.zhaojun.common.service.StorageConfigService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author zhaojun
- */
-@Service
-@Slf4j
-public class OneDriveServiceImpl extends AbstractFileService implements FileService {
-
-    @Resource
-    private GlobalScheduleTask globalScheduleTask;
-
-    @Resource
-    private StorageConfigService storageConfigService;
-
-    @Resource
-    private OneDriveService oneDriveService;
-
-    @Override
-    public void init() {
-        try {
-            Map<String, StorageConfig> stringStorageConfigMap =
-                    storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum());
-            String accessToken = stringStorageConfigMap.get(StorageConfigConstant.ACCESS_TOKEN_KEY).getValue();
-            String refreshToken = stringStorageConfigMap.get(StorageConfigConstant.REFRESH_TOKEN_KEY).getValue();
-            super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
-
-            if (StringUtils.isEmpty(accessToken) || StringUtils.isEmpty(refreshToken)) {
-                log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());
-                isInitialized = false;
-            } else {
-                globalScheduleTask.refreshOneDriveToken(getStorageTypeEnum());
-                isInitialized = testConnection();
-            }
-        } catch (Exception e) {
-            log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过");
-        }
-    }
-
-    @Override
-    public List<FileItemDTO> fileList(String path) {
-        return oneDriveService.list(basePath, path);
-    }
-
-    @Override
-    public String getDownloadUrl(String path) {
-        return null;
-    }
-
-    @Override
-    public StorageTypeEnum getStorageTypeEnum() {
-        return StorageTypeEnum.ONE_DRIVE;
-    }
-
-    @Override
-    public FileItemDTO getFileItem(String path) {
-        FileItemDTO fileItemDTO ;
-
-        try {
-            fileItemDTO = oneDriveService.getItem(path);
-        } catch (Exception e) {
-            throw new NotExistFileException();
-        }
-        return fileItemDTO;
-    }
-}

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

@@ -1,61 +0,0 @@
-package im.zhaojun.qiniu.service;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @author zhaojun
- */
-@Service
-public class QiniuServiceImpl extends AbstractS3FileService implements FileService {
-
-    private static final Logger log = LoggerFactory.getLogger(QiniuServiceImpl.class);
-
-    @Override
-    public void init() {
-        try {
-            Map<String, StorageConfig> stringStorageConfigMap =
-                    storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum());
-            String accessKey = stringStorageConfigMap.get(StorageConfigConstant.ACCESS_KEY).getValue();
-            String secretKey = stringStorageConfigMap.get(StorageConfigConstant.SECRET_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();
-
-            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();
-            }
-        } catch (Exception e) {
-            log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过");
-        }
-    }
-
-    @Override
-    public StorageTypeEnum getStorageTypeEnum() {
-        return StorageTypeEnum.QINIU;
-    }
-
-}

src/main/java/im/zhaojun/s3/S3ServiceImpl.java

@@ -1,68 +0,0 @@
-package im.zhaojun.s3;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @author zhaojun
- */
-@Service
-public class S3ServiceImpl extends AbstractS3FileService implements FileService {
-
-    private static final Logger log = LoggerFactory.getLogger(S3ServiceImpl.class);
-
-    @Override
-    public void init() {
-        try {
-            Map<String, StorageConfig> stringStorageConfigMap =
-                    storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum());
-            String accessKey = stringStorageConfigMap.get(StorageConfigConstant.ACCESS_KEY).getValue();
-            String secretKey = stringStorageConfigMap.get(StorageConfigConstant.SECRET_KEY).getValue();
-            String endPoint = stringStorageConfigMap.get(StorageConfigConstant.ENDPOINT_KEY).getValue();
-
-            super.domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
-            super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
-            super.bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
-            super.isPrivate = Convert.toBool(stringStorageConfigMap.get(StorageConfigConstant.IS_PRIVATE).getValue(), true);
-
-            String pathStyle = stringStorageConfigMap.get(StorageConfigConstant.PATH_STYLE).getValue();
-
-            boolean isPathStyle = "path-style".equals(pathStyle);
-
-            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()
-                        .withPathStyleAccessEnabled(isPathStyle)
-                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "")).build();
-
-                isInitialized = testConnection();
-            }
-        } catch (Exception e) {
-            log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过");
-        }
-    }
-
-    @Override
-    public StorageTypeEnum getStorageTypeEnum() {
-        return StorageTypeEnum.S3;
-    }
-
-}

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

@@ -1,62 +0,0 @@
-package im.zhaojun.tencent;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @author zhaojun
- */
-@Service
-public class TencentServiceImpl extends AbstractS3FileService implements FileService {
-
-    private static final Logger log = LoggerFactory.getLogger(TencentServiceImpl.class);
-
-    @Override
-    public void init() {
-        try {
-            Map<String, StorageConfig> stringStorageConfigMap =
-                    storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum());
-            String secretId = stringStorageConfigMap.get(StorageConfigConstant.SECRET_ID_KEY).getValue();
-            String secretKey = stringStorageConfigMap.get(StorageConfigConstant.SECRET_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();
-
-            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();
-            }
-        } catch (Exception e) {
-            log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过");
-        }
-    }
-
-
-
-    @Override
-    public StorageTypeEnum getStorageTypeEnum() {
-        return StorageTypeEnum.TENCENT;
-    }
-
-}

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

@@ -1,131 +0,0 @@
-package im.zhaojun.upyun.service;
-
-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 lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @author zhaojun
- */
-@Service
-@Slf4j
-public class UpYunServiceImpl extends AbstractFileService implements FileService {
-
-    private static final String END_MARK = "g2gCZAAEbmV4dGQAA2VvZg";
-
-    @Resource
-    private StorageConfigService storageConfigService;
-
-    private String domain;
-
-    private UpYun upYun;
-
-    private String basePath;
-
-    @Override
-    public void init() {
-        try {
-            Map<String, StorageConfig> stringStorageConfigMap =
-                    storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum());
-            String bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_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();
-            basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
-            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
-    public List<FileItemDTO> fileList(String path) throws Exception {
-        ArrayList<FileItemDTO> fileItemList = new ArrayList<>();
-        String nextMark = null;
-
-        do {
-            HashMap<String, String> hashMap = new HashMap<>(24);
-            hashMap.put("x-list-iter", nextMark);
-            hashMap.put("x-list-limit", "100");
-            UpYun.FolderItemIter folderItemIter = upYun.readDirIter(URLUtil.encode(basePath + path), hashMap);
-            nextMark = folderItemIter.iter;
-            ArrayList<UpYun.FolderItem> folderItems = folderItemIter.files;
-            if (folderItems != null) {
-                for (UpYun.FolderItem folderItem : folderItems) {
-                    FileItemDTO fileItemDTO = new FileItemDTO();
-                    fileItemDTO.setName(folderItem.name);
-                    fileItemDTO.setSize(folderItem.size);
-                    fileItemDTO.setTime(folderItem.date);
-                    fileItemDTO.setPath(path);
-
-                    if ("folder".equals(folderItem.type)) {
-                        fileItemDTO.setType(FileTypeEnum.FOLDER);
-                    } else {
-                        fileItemDTO.setType(FileTypeEnum.FILE);
-                        fileItemDTO.setUrl(getDownloadUrl(StringUtils.concatUrl(basePath + path, fileItemDTO.getName())));
-                    }
-                    fileItemList.add(fileItemDTO);
-                }
-            }
-        } while (!END_MARK.equals(nextMark));
-        return fileItemList;
-
-    }
-
-    @Override
-    public String getDownloadUrl(String path) {
-        return URLUtil.complateUrl(domain, path);
-    }
-
-    @Override
-    public StorageTypeEnum getStorageTypeEnum() {
-        return StorageTypeEnum.UPYUN;
-    }
-
-    @Override
-    public FileItemDTO getFileItem(String path) {
-        List<FileItemDTO> list;
-        try {
-            int end = path.lastIndexOf("/");
-            list = fileList(path.substring(0, end));
-        } catch (Exception e) {
-            throw new NotExistFileException();
-        }
-
-        for (FileItemDTO fileItemDTO : list) {
-            String fullPath = StringUtils.concatUrl(fileItemDTO.getPath(), fileItemDTO.getName());
-            if (Objects.equals(fullPath, path)) {
-                return fileItemDTO;
-            }
-        }
-
-        throw new NotExistFileException();
-    }
-}

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

@@ -1,7 +1,5 @@
-package im.zhaojun;
+package im.zhaojun.zfile;
 
-import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation;
-import com.alicp.jetcache.anno.config.EnableMethodCache;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -12,8 +10,6 @@ import org.springframework.scheduling.annotation.EnableAsync;
  */
 @EnableAsync
 @SpringBootApplication
-@EnableMethodCache(basePackages = "im.zhaojun", proxyTargetClass = true)
-@EnableCreateCacheAnnotation
 @EnableAspectJAutoProxy(exposeProxy = true)
 public class ZfileApplication {
 

src/main/java/im/zhaojun/zfile/aspect/FileListCacheAspect.java

@@ -0,0 +1,65 @@
+package im.zhaojun.zfile.aspect;
+
+import im.zhaojun.zfile.cache.ZFileCache;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
+import im.zhaojun.zfile.model.entity.DriveConfig;
+import im.zhaojun.zfile.service.DriveConfigService;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author zhaojun
+ * 缓存切面类, 用于访问文件夹时, 缓存文件列表内容.
+ */
+@Aspect
+@Component
+public class FileListCacheAspect {
+
+    @Resource
+    private ZFileCache zFileCache;
+
+    @Resource
+    private DriveConfigService driveConfigService;
+
+
+    /**
+     * 缓存切面, 如果此驱动器开启了缓存, 则从缓存中取数据, 没有开启, 则直接调用方法.
+     */
+    @Around(value = "execution(public * im.zhaojun.zfile.service.base.AbstractBaseFileService.fileList(..))")
+    public Object around(ProceedingJoinPoint point) throws Throwable {
+        List<FileItemDTO> result;
+
+        // 获取请求路径
+        Object[] args = point.getArgs();
+        String path = String.valueOf(args[0]);
+
+        // 获取当前驱动器
+        AbstractBaseFileService fileService = ((AbstractBaseFileService) point.getTarget());
+        Integer driveId = fileService.driveId;
+
+        // 判断驱动器是否开启了缓存
+        DriveConfig driveConfig = driveConfigService.findById(driveId);
+        boolean enableCache = driveConfig.getEnableCache();
+
+        if (enableCache) {
+            List<FileItemDTO> cacheFileList = zFileCache.get(driveId, path);
+            if (cacheFileList == null) {
+                result = (List<FileItemDTO>) point.proceed();
+                zFileCache.put(driveId, path, result);
+            } else {
+                result = cacheFileList;
+            }
+        } else {
+            result = (List<FileItemDTO>) point.proceed();
+        }
+
+        return result;
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package im.zhaojun.zfile.cache;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zhaojun
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DriveCacheKey {
+
+    private Integer driveId;
+
+    private String key;
+
+}

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

@@ -0,0 +1,55 @@
+package im.zhaojun.zfile.cache;
+
+import cn.hutool.cache.impl.CacheObj;
+import cn.hutool.cache.impl.TimedCache;
+import im.zhaojun.zfile.context.DriveContext;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
+import im.zhaojun.zfile.util.SpringContextHolder;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Map;
+
+/**
+ * @author zhaojun
+ */
+@Slf4j
+public class MyTimedCache<K, V> extends TimedCache<K, V> {
+
+    private DriveContext driveContext;
+
+    public MyTimedCache(long timeout) {
+        super(timeout);
+    }
+
+    public MyTimedCache(long timeout, Map<K, CacheObj<K, V>> map) {
+        super(timeout, map);
+    }
+
+    @Override
+    protected void onRemove(K key, V cachedObject) {
+        if (driveContext == null) {
+            driveContext = SpringContextHolder.getBean(DriveContext.class);
+        }
+
+        DriveCacheKey cacheKey = (DriveCacheKey) key;
+        AbstractBaseFileService baseFileService = driveContext.get(cacheKey.getDriveId());
+
+        if (log.isDebugEnabled()) {
+            log.debug("尝试刷新缓存: {}", cacheKey);
+        }
+
+        if (baseFileService == null) {
+            log.error("尝试刷新缓存: {}, 时出现异常, 驱动器已不存在", cacheKey);
+            return;
+        }
+
+        try {
+            baseFileService.fileList(cacheKey.getKey());
+        } catch (Exception e) {
+            log.error("尝试刷新缓存 {} 失败", cacheKey);
+            e.printStackTrace();
+        }
+
+    }
+
+}

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

@@ -0,0 +1,331 @@
+package im.zhaojun.zfile.cache;
+
+import cn.hutool.cache.impl.CacheObj;
+import cn.hutool.core.util.StrUtil;
+import im.zhaojun.zfile.model.constant.ZFileConstant;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
+import im.zhaojun.zfile.model.dto.SystemConfigDTO;
+import im.zhaojun.zfile.model.entity.DriveConfig;
+import im.zhaojun.zfile.repository.DriverConfigRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * ZFile 缓存类
+ *
+ * @author zhaojun
+ */
+@Component
+@Slf4j
+public class ZFileCache {
+
+    @Resource
+    private DriverConfigRepository driverConfigRepository;
+
+    /**
+     * 缓存过期时间
+     */
+    @Value("${zfile.cache.timeout}")
+    private long timeout;
+
+    /**
+     * 缓存自动刷新间隔
+     */
+    @Value("${zfile.cache.auto-refresh.interval}")
+    private long autoRefreshInterval;
+
+    /**
+     * 文件/文件对象缓存.
+     *
+     * ConcurrentMap<Integer, ConcurrentHashMap<String, List<FileItemDTO>>>
+     * ConcurrentMap<driveId, ConcurrentHashMap<key, value>>
+     *
+     * driveId: 驱动器 ID
+     * key: 文件夹路径
+     * value: 文件夹中内容
+     */
+    private ConcurrentMap<Integer, MyTimedCache<DriveCacheKey, List<FileItemDTO>>> drivesCache = new ConcurrentHashMap<>();
+
+    /**
+     * 系统设置缓存
+     */
+    private SystemConfigDTO systemConfigCache;
+
+
+    /**
+     * 写入缓存
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @param   key
+     *          文件夹路径
+     *
+     * @param   value
+     *          文件夹中列表
+     */
+    public synchronized void put(Integer driveId, String key, List<FileItemDTO> value) {
+        getCacheByDriveId(driveId).put(new DriveCacheKey(driveId, key), value);
+    }
+
+
+    /**
+     * 获取指定驱动器, 某个文件夹的名称
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @param   key
+     *          文件夹路径
+     *
+     * @return  驱动器中文件夹的内容
+     */
+    public List<FileItemDTO> get(Integer driveId, String key) {
+        return getCacheByDriveId(driveId).get(new DriveCacheKey(driveId, key), false);
+    }
+
+
+    /**
+     * 清空指定驱动器的缓存.
+     *
+     * @param   driveId
+     *          驱动器 ID
+     */
+    public void clear(Integer driveId) {
+        if (log.isDebugEnabled()) {
+            log.debug("清空驱动器所有缓存, driveId: {}", driveId);
+        }
+        getCacheByDriveId(driveId).clear();
+    }
+
+
+    /**
+     * 获取指定驱动器中已缓存文件夹数量
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @return  已缓存文件夹数量
+     */
+    public int cacheCount(Integer driveId) {
+        return getCacheByDriveId(driveId).size();
+    }
+
+
+    /**
+     * 指定驱动器, 根据文件及文件名查找相关的文件
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @param   key
+     *          搜索键, 可匹配文件夹名称和文件名称.
+     *
+     * @return  搜索结果, 包含文件夹和文件.
+     */
+    public List<FileItemDTO> find(Integer driveId, String key) {
+        List<FileItemDTO> result = new ArrayList<>();
+
+        DriveConfig driveConfig = driverConfigRepository.getOne(driveId);
+        boolean searchContainEncryptedFile = driveConfig.getSearchContainEncryptedFile();
+        boolean ignoreCase = driveConfig.getSearchIgnoreCase();
+
+        for (List<FileItemDTO> fileItemList : getCacheByDriveId(driveId)) {
+            // 过滤加密文件
+            if (!searchContainEncryptedFile && isEncryptedFolder(fileItemList)) {
+                continue;
+            }
+
+            for (FileItemDTO fileItemDTO : fileItemList) {
+                boolean testResult;
+
+                // 根据是否需要忽略大小写来匹配文件(夹)名
+                if (ignoreCase) {
+                    testResult = StrUtil.containsIgnoreCase(fileItemDTO.getName(), key);
+                } else {
+                    testResult = fileItemDTO.getName().contains(key);
+                }
+
+                if (testResult) {
+                    result.add(fileItemDTO);
+                }
+            }
+        }
+        return result;
+    }
+
+
+    /**
+     * 获取所有缓存 key (文件夹名称)
+     *
+     * @return      所有缓存 key
+     */
+    public Set<String> keySet(Integer driveId) {
+        Iterator<CacheObj<DriveCacheKey, List<FileItemDTO>>> cacheObjIterator = getCacheByDriveId(driveId).cacheObjIterator();
+        Set<String> keys = new HashSet<>();
+        while (cacheObjIterator.hasNext()) {
+            keys.add(cacheObjIterator.next().getKey().getKey());
+        }
+        return keys;
+    }
+
+
+    /**
+     * 从缓存中删除指定驱动器的某个路径的缓存
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @param   key
+     *          文件夹路径
+     */
+    public void remove(Integer driveId, String key) {
+        getCacheByDriveId(driveId).remove(new DriveCacheKey(driveId, key));
+    }
+
+
+
+    /**
+     * 更新缓存中的系统设置
+     *
+     * @param   systemConfigCache
+     *          系统设置
+     */
+    public void updateConfig(SystemConfigDTO systemConfigCache) {
+        this.systemConfigCache = systemConfigCache;
+    }
+
+
+    /**
+     * 从缓存中获取系统设置
+     *
+     * @return  系统设置
+     */
+    public SystemConfigDTO getConfig() {
+        return this.systemConfigCache;
+    }
+
+
+    /**
+     * 清空系统设置缓存
+     */
+    public void removeConfig() {
+        this.systemConfigCache = null;
+    }
+
+
+    /**
+     * 判断此文件夹是否为加密文件夹 (包含)
+     *
+     * @param   list
+     *          文件夹中的内容
+     *
+     * @return  返回此文件夹是否是加密的 ().
+     */
+    private boolean isEncryptedFolder(List<FileItemDTO> list) {
+        // 遍历文件判断是否包含
+        for (FileItemDTO fileItemDTO : list) {
+            if (Objects.equals(ZFileConstant.PASSWORD_FILE_NAME, fileItemDTO.getName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * 获取指定驱动器对应的缓存
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @return  驱动器对应的缓存
+     */
+    private synchronized MyTimedCache<DriveCacheKey, List<FileItemDTO>> getCacheByDriveId(Integer driveId) {
+        MyTimedCache<DriveCacheKey, List<FileItemDTO>> driveCache = drivesCache.get(driveId);
+        if (driveCache == null) {
+            driveCache = new MyTimedCache<>(timeout * 1000);
+            drivesCache.put(driveId, driveCache);
+            startAutoCacheRefresh(driveId);
+        }
+        return driveCache;
+    }
+
+
+    /**
+     * 获取指定驱动器的缓存命中数
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @return  缓存命中数
+     */
+    public int getHitCount(Integer driveId) {
+        return getCacheByDriveId(driveId).getHitCount();
+    }
+
+
+    /**
+     * 获取指定驱动器的缓存未命中数
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @return  缓存未命中数
+     */
+    public int getMissCount(Integer driveId) {
+        return getCacheByDriveId(driveId).getMissCount();
+    }
+
+
+    /**
+     * 开启缓存自动刷新
+     *
+     * @param   driveId
+     *          驱动器 ID
+     */
+    public void startAutoCacheRefresh(Integer driveId) {
+        if (log.isDebugEnabled()) {
+            log.debug("开启缓存自动刷新 driveId: {}", driveId);
+        }
+        DriveConfig driveConfig = driverConfigRepository.findById(driveId).get();
+        Boolean autoRefreshCache = driveConfig.getAutoRefreshCache();
+        if (autoRefreshCache != null && autoRefreshCache) {
+            MyTimedCache<DriveCacheKey, List<FileItemDTO>> driveCache = drivesCache.get(driveId);
+            if (driveCache == null) {
+                driveCache = new MyTimedCache<>(timeout * 1000);
+                drivesCache.put(driveId, driveCache);
+            }
+            driveCache.schedulePrune(autoRefreshInterval * 1000);
+        }
+    }
+
+
+    /**
+     * 停止缓存自动刷新
+     *
+     * @param   driveId
+     *          驱动器 ID
+     */
+    public void stopAutoCacheRefresh(Integer driveId) {
+        if (log.isDebugEnabled()) {
+            log.debug("停止缓存自动刷新 driveId: {}", driveId);
+        }
+        MyTimedCache<DriveCacheKey, List<FileItemDTO>> driveCache = drivesCache.get(driveId);
+        if (driveCache != null) {
+            driveCache.cancelPruneSchedule();
+        }
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package im.zhaojun.zfile.config;
+
+import im.zhaojun.zfile.model.constant.StorageConfigConstant;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.service.StorageConfigService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.LinkedList;
+
+/**
+ * @author zhaojun
+ */
+@Configuration
+public class OneDriveConfig {
+
+    @Resource
+    private StorageConfigService storageConfigService;
+
+    /**
+     * OneDrive 请求 RestTemplate, 会在请求头中添加 Bearer: Authorization {token} 信息, 用于 API 认证.
+     */
+    @Bean
+    public RestTemplate oneDriveRestTemplate() {
+        RestTemplate restTemplate = new RestTemplate();
+
+        ClientHttpRequestInterceptor interceptor = (httpRequest, bytes, clientHttpRequestExecution) -> {
+            HttpHeaders headers = httpRequest.getHeaders();
+            Integer driveId = Integer.valueOf(((LinkedList)headers.get("driveId")).get(0).toString());
+
+            StorageConfig accessTokenConfig =
+                    storageConfigService.findByDriveIdAndKey(driveId, StorageConfigConstant.ACCESS_TOKEN_KEY);
+
+            String tokenValue = String.format("%s %s", "Bearer", accessTokenConfig.getValue());
+            httpRequest.getHeaders().add("Authorization", tokenValue);
+            return clientHttpRequestExecution.execute(httpRequest, bytes);
+        };
+        restTemplate.setInterceptors(Collections.singletonList(interceptor));
+        return restTemplate;
+    }
+
+}

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

@@ -0,0 +1,34 @@
+package im.zhaojun.zfile.config;
+
+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;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @author zhaojun
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new StorageTypeEnumDeSerializerConvert());
+    }
+
+    @Bean
+    public ServletWebServerFactory webServerFactory() {
+        TomcatServletWebServerFactory webServerFactory = new TomcatServletWebServerFactory();
+
+        // 添加对 URL 中特殊符号的支持.
+        webServerFactory.addConnectorCustomizers(connector -> {
+            connector.setAttribute("relaxedPathChars", "<>[\\]^`{|}");
+            connector.setAttribute("relaxedQueryChars", "<>[\\]^`{|}");
+        });
+        return webServerFactory;
+    }
+
+}

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

@@ -1,11 +1,14 @@
-package im.zhaojun.common.config;
+package im.zhaojun.zfile.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 
 /**
  * @author zhaojun
@@ -17,7 +20,15 @@ public class ZFileConfiguration {
     public RestTemplate restTemplate(){
         RestTemplate restTemplate = new RestTemplate();
         restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+
+        restTemplate.setInterceptors(Collections.singletonList((request, body, execution) -> {
+            ClientHttpResponse response = execution.execute(request, body);
+            HttpHeaders headers = response.getHeaders();
+            headers.put("Content-Type", Collections.singletonList("application/text"));
+            return response;
+        }));
+
         return restTemplate;
     }
 
-}
+}

src/main/java/im/zhaojun/zfile/context/DriveContext.java

@@ -0,0 +1,131 @@
+package im.zhaojun.zfile.context;
+
+import com.alibaba.fastjson.JSON;
+import im.zhaojun.zfile.exception.InvalidDriveException;
+import im.zhaojun.zfile.model.entity.DriveConfig;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.service.DriveConfigService;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
+import im.zhaojun.zfile.util.SpringContextHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 每个驱动器对应一个 Service, 其中初始化好了与对象存储的连接信息.
+ * 此驱动器上下文环境用户缓存每个 Service, 避免重复创建连接.
+ * @author zhaojun
+ */
+@Component
+@DependsOn("springContextHolder")
+@Slf4j
+public class DriveContext implements ApplicationContextAware {
+
+    /**
+     * Map<Integer, AbstractBaseFileService>
+     * Map<驱动器 ID, 驱动器连接 Service>
+     */
+    private static Map<Integer, AbstractBaseFileService> drivesServiceMap = new ConcurrentHashMap<>();
+
+    @Resource
+    private DriveConfigService driveConfigService;
+
+
+    /**
+     * 项目启动时, 自动调用数据库已存储的所有驱动器进行初始化.
+     */
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        List<DriveConfig> list = driveConfigService.list();
+        for (DriveConfig driveConfig : list) {
+            try {
+                init(driveConfig.getId());
+                log.info("启动时初始化驱动器成功, 驱动器信息: {}", JSON.toJSONString(driveConfig));
+            } catch (Exception e) {
+                log.error("启动时初始化驱动器失败, 驱动器信息: {}", JSON.toJSONString(driveConfig), e);
+            }
+        }
+    }
+
+
+    /**
+     * 初始化指定驱动器的 Service, 添加到上下文环境中.
+     *
+     * @param   driveId
+     *          驱动器 ID.
+     */
+    public void init(Integer driveId) {
+        AbstractBaseFileService baseFileService = getBeanByDriveId(driveId);
+        if (baseFileService != null) {
+            if (log.isDebugEnabled()) {
+                log.debug("尝试初始化驱动器, driveId: {}", driveId);
+            }
+            baseFileService.init(driveId);
+            if (log.isDebugEnabled()) {
+                log.debug("初始化驱动器成功, driveId: {}", driveId);
+            }
+            drivesServiceMap.put(driveId, baseFileService);
+        }
+    }
+
+
+    /**
+     * 获取指定驱动器的 Service.
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @return  驱动器对应的 Service
+     */
+    public AbstractBaseFileService get(Integer driveId) {
+        AbstractBaseFileService abstractBaseFileService = drivesServiceMap.get(driveId);
+        if (abstractBaseFileService == null) {
+            throw new InvalidDriveException("此驱动器不存在或初始化失败, 请检查后台参数配置");
+        }
+        return abstractBaseFileService;
+    }
+
+
+    /**
+     * 销毁指定驱动器的 Service.
+     *
+     * @param   driveId
+     *          驱动器 ID
+     */
+    public void destroy(Integer driveId) {
+        if (log.isDebugEnabled()) {
+            log.debug("清理驱动器上下文对象, driveId: {}", driveId);
+        }
+        drivesServiceMap.remove(driveId);
+    }
+
+
+    /**
+     * 获取指定驱动器对应的 Service, 状态为未初始化
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @return  驱动器对应未初始化的 Service
+     */
+    private AbstractBaseFileService getBeanByDriveId(Integer driveId) {
+        StorageTypeEnum storageTypeEnum = driveConfigService.findStorageTypeById(driveId);
+        Map<String, AbstractBaseFileService> beansOfType = SpringContextHolder.getBeansOfType(AbstractBaseFileService.class);
+        for (AbstractBaseFileService value : beansOfType.values()) {
+            if (Objects.equals(value.getStorageTypeEnum(), storageTypeEnum)) {
+                return SpringContextHolder.getBean(value.getClass());
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/im/zhaojun/zfile/context/StorageTypeContext.java

@@ -1,7 +1,7 @@
-package im.zhaojun.common.config;
+package im.zhaojun.zfile.context;
 
-import im.zhaojun.common.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
-import im.zhaojun.common.service.AbstractFileService;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -9,16 +9,19 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
+
 /**
+ * 存储类型工厂类
  * @author zhaojun
  */
 @Component
-public class StorageTypeFactory implements ApplicationContextAware {
+public class StorageTypeContext implements ApplicationContextAware {
 
-    private static Map<String, AbstractFileService> storageTypeEnumFileServiceMap;
+    private static Map<String, AbstractBaseFileService> storageTypeEnumFileServiceMap;
 
     private static ApplicationContext applicationContext;
 
+
     /**
      * 项目启动时执行
      */
@@ -27,15 +30,16 @@ 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) {
+    public static AbstractBaseFileService getStorageTypeService(StorageTypeEnum type) {
-        AbstractFileService result = null;
+        AbstractBaseFileService result = null;
-        for (AbstractFileService fileService : storageTypeEnumFileServiceMap.values()) {
+        for (AbstractBaseFileService fileService : storageTypeEnumFileServiceMap.values()) {
             if (fileService.getStorageTypeEnum() == type) {
                 result = fileService;
                 break;
@@ -44,7 +48,9 @@ public class StorageTypeFactory implements ApplicationContextAware {
         return result;
     }
 
+
     public static ApplicationContext getApplicationContext() {
         return applicationContext;
     }
+
 }

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

@@ -0,0 +1,54 @@
+package im.zhaojun.zfile.controller.admin;
+
+import im.zhaojun.zfile.model.dto.SystemConfigDTO;
+import im.zhaojun.zfile.model.support.ResultBean;
+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;
+
+/**
+ * 管理后台接口
+ * @author zhaojun
+ */
+@RestController
+@RequestMapping("/admin")
+public class AdminController {
+
+    @Resource
+    private SystemConfigService systemConfigService;
+
+    /**
+     * 获取系统配置
+     */
+    @GetMapping("/config")
+    public ResultBean getConfig() {
+        SystemConfigDTO systemConfigDTO = systemConfigService.getSystemConfig();
+        return ResultBean.success(systemConfigDTO);
+    }
+
+
+    /**
+     * 更新系统配置
+     */
+    @PostMapping("/config")
+    public ResultBean updateConfig(SystemConfigDTO systemConfigDTO) {
+        systemConfigDTO.setId(1);
+        systemConfigService.updateSystemConfig(systemConfigDTO);
+        return ResultBean.success();
+    }
+
+
+    /**
+     * 修改管理员登陆密码
+     */
+    @PostMapping("/update-pwd")
+    public ResultBean updatePwd(String username, String password) {
+        systemConfigService.updateUsernameAndPwd(username, password);
+        return ResultBean.success();
+    }
+
+}

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

@@ -0,0 +1,72 @@
+package im.zhaojun.zfile.controller.admin;
+
+import im.zhaojun.zfile.model.dto.CacheInfoDTO;
+import im.zhaojun.zfile.model.support.ResultBean;
+import im.zhaojun.zfile.service.DriveConfigService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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;
+
+/**
+ * 缓存 Controller
+ *
+ * @author zhaojun
+ */
+@RestController
+@RequestMapping("/admin/cache")
+public class CacheController {
+
+    @Resource
+    private DriveConfigService driveConfigService;
+
+    @PostMapping("/{driveId}/enable")
+    public ResultBean enableCache(@PathVariable("driveId") Integer driveId) {
+        driveConfigService.updateCacheStatus(driveId, true);
+        return ResultBean.success();
+    }
+
+
+    @PostMapping("/{driveId}/disable")
+    public ResultBean disableCache(@PathVariable("driveId") Integer driveId) {
+        driveConfigService.updateCacheStatus(driveId, false);
+        return ResultBean.success();
+    }
+
+
+    @GetMapping("/{driveId}/info")
+    public ResultBean cacheInfo(@PathVariable("driveId") Integer driveId) {
+        CacheInfoDTO cacheInfo = driveConfigService.findCacheInfo(driveId);
+        return ResultBean.success(cacheInfo);
+    }
+
+
+    @PostMapping("/{driveId}/refresh")
+    public ResultBean refreshCache(@PathVariable("driveId") Integer driveId, String key) throws Exception {
+        driveConfigService.refreshCache(driveId, key);
+        return ResultBean.success();
+    }
+
+    @PostMapping("/{driveId}/auto-refresh/start")
+    public ResultBean enableAutoRefresh(@PathVariable("driveId") Integer driveId) {
+        driveConfigService.startAutoCacheRefresh(driveId);
+        return ResultBean.success();
+    }
+
+
+    @PostMapping("/{driveId}/auto-refresh/stop")
+    public ResultBean disableAutoRefresh(@PathVariable("driveId") Integer driveId) {
+        driveConfigService.stopAutoCacheRefresh(driveId);
+        return ResultBean.success();
+    }
+
+    @PostMapping("/{driveId}/clear")
+    public ResultBean clearCache(@PathVariable("driveId") Integer driveId) {
+        driveConfigService.clearCache(driveId);
+        return ResultBean.success();
+    }
+
+}

src/main/java/im/zhaojun/zfile/controller/admin/DriveController.java

@@ -0,0 +1,132 @@
+package im.zhaojun.zfile.controller.admin;
+
+import com.alibaba.fastjson.JSONObject;
+import im.zhaojun.zfile.model.dto.DriveConfigDTO;
+import im.zhaojun.zfile.model.entity.DriveConfig;
+import im.zhaojun.zfile.model.entity.FilterConfig;
+import im.zhaojun.zfile.model.support.ResultBean;
+import im.zhaojun.zfile.service.DriveConfigService;
+import im.zhaojun.zfile.service.FilterConfigService;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 驱动器相关操作 Controller
+ * @author zhaojun
+ */
+@RestController
+@RequestMapping("/admin")
+public class DriveController {
+
+    @Resource
+    private DriveConfigService driveConfigService;
+
+    @Resource
+    private FilterConfigService filterConfigService;
+
+    /**
+     * 获取所有驱动器列表
+     *
+     * @return  驱动器列表
+     */
+    @GetMapping("/drives")
+    public ResultBean driveList() {
+        List<DriveConfig> list = driveConfigService.list();
+        return ResultBean.success(list);
+    }
+
+
+    /**
+     * 获取指定驱动器基本信息及其参数
+     *
+     * @param   id
+     *          驱动器 ID
+     *
+     * @return  驱动器基本信息
+     */
+    @GetMapping("/drive/{id}")
+    public ResultBean driveItem(@PathVariable Integer id) {
+        DriveConfigDTO driveConfig = driveConfigService.findDriveConfigDTOById(id);
+        return ResultBean.success(driveConfig);
+    }
+
+
+    /**
+     * 保存驱动器设置
+     */
+    @PostMapping("/drive")
+    public ResultBean saveDriveItem(@RequestBody DriveConfigDTO driveConfigDTO) {
+        driveConfigService.saveDriveConfigDTO(driveConfigDTO);
+        return ResultBean.success();
+    }
+
+
+    /**
+     * 删除驱动器设置
+     *
+     * @param   id
+     *          驱动器 ID
+     */
+    @DeleteMapping("/drive/{id}")
+    public ResultBean deleteDriveItem(@PathVariable Integer id) {
+        driveConfigService.deleteById(id);
+        return ResultBean.success();
+    }
+
+
+    /**
+     * 启用驱动器
+     *
+     * @param   id
+     *          驱动器 ID
+     */
+    @PostMapping("/drive/{id}/enable")
+    public ResultBean enable(@PathVariable("id") Integer id) {
+        DriveConfig driveConfig = driveConfigService.findById(id);
+        driveConfig.setEnable(true);
+        driveConfigService.saveOrUpdate(driveConfig);
+        return ResultBean.success();
+    }
+
+
+    /**
+     * 停止驱动器
+     *
+     * @param   id
+     *          驱动器 ID
+     */
+    @PostMapping("/drive/{id}/disable")
+    public ResultBean disable(@PathVariable("id") Integer id) {
+        DriveConfig driveConfig = driveConfigService.findById(id);
+        driveConfig.setEnable(false);
+        driveConfigService.saveOrUpdate(driveConfig);
+        return ResultBean.success();
+    }
+
+
+    @GetMapping("/drive/{id}/filters")
+    public ResultBean getFilters(@PathVariable("id") Integer id) {
+        return ResultBean.success(filterConfigService.findByDriveId(id));
+    }
+
+    @PostMapping("/drive/{id}/filters")
+    public ResultBean saveFilters(@RequestBody List<FilterConfig> filter, @PathVariable("id") Integer driveId) {
+        filterConfigService.batchSave(filter, driveId);
+        return ResultBean.success();
+    }
+
+    @PostMapping("/drive/drag")
+    public ResultBean saveDriveDrag(@RequestBody List<JSONObject> driveConfigs) {
+        driveConfigService.saveDriveDrag(driveConfigs);
+        return ResultBean.success();
+    }
+
+}

src/main/java/im/zhaojun/zfile/controller/admin/LogController.java

@@ -0,0 +1,39 @@
+package im.zhaojun.zfile.controller.admin;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ZipUtil;
+import im.zhaojun.zfile.util.FileUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.util.Date;
+
+/**
+ * 日志相关 Controller
+ * @author zhaojun
+ */
+@RestController
+@RequestMapping("/admin")
+@Slf4j
+public class LogController {
+
+    /**
+     * 系统日志下载
+     */
+    @GetMapping("/log")
+    public ResponseEntity<Object> downloadLog(HttpServletResponse response) {
+        if (log.isDebugEnabled()) {
+            log.debug("下载诊断日志");
+        }
+        String userHome = System.getProperty("user.home");
+        File fileZip = ZipUtil.zip(userHome + "/.zfile/logs");
+        String currentDate = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+        return FileUtil.export(fileZip, "ZFile 诊断日志 - " + currentDate + ".zip");
+    }
+
+}

src/main/java/im/zhaojun/zfile/controller/admin/MateDataController.java

@@ -0,0 +1,47 @@
+package im.zhaojun.zfile.controller.admin;
+
+import im.zhaojun.zfile.context.StorageTypeContext;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.model.support.ResultBean;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 系统元数据 Controller
+ * @author zhaojun
+ */
+@RestController
+@RequestMapping("/admin")
+public class MateDataController {
+
+    /**
+     * 返回支持的存储引擎.
+     */
+    @GetMapping("/support-strategy")
+    public ResultBean supportStrategy() {
+        StorageTypeEnum[] values = StorageTypeEnum.values();
+        return ResultBean.successData(values);
+    }
+
+
+    /**
+     * 获取指定存储策略的表单域
+     *
+     * @param   storageType
+     *          存储策略
+     *
+     * @return  所有表单域
+     */
+    @GetMapping("/strategy-form")
+    public ResultBean getFormByStorageType(StorageTypeEnum storageType) {
+        AbstractBaseFileService storageTypeService = StorageTypeContext.getStorageTypeService(storageType);
+        List<StorageConfig> storageConfigList = storageTypeService.storageStrategyConfigList();
+        return ResultBean.success(storageConfigList);
+    }
+
+}

src/main/java/im/zhaojun/zfile/controller/admin/MonitorController.java

@@ -0,0 +1,26 @@
+package im.zhaojun.zfile.controller.admin;
+
+import im.zhaojun.zfile.model.support.ResultBean;
+import im.zhaojun.zfile.model.support.SystemMonitorInfo;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 系统监控 Controller
+ * @author zhaojun
+ */
+@RestController
+@RequestMapping("/admin")
+public class MonitorController {
+
+
+    /**
+     * 获取系统监控信息
+     */
+    @GetMapping("monitor")
+    public ResultBean monitor() {
+        return ResultBean.success(new SystemMonitorInfo());
+    }
+
+}

src/main/java/im/zhaojun/zfile/controller/home/DirectLinkController.java

@@ -0,0 +1,71 @@
+package im.zhaojun.zfile.controller.home;
+
+import cn.hutool.core.util.URLUtil;
+import im.zhaojun.zfile.context.DriveContext;
+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 org.springframework.stereotype.Controller;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.servlet.HandlerMapping;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
+
+/**
+ * @author Zhao Jun
+ */
+@Controller
+public class DirectLinkController {
+
+    @Resource
+    private DriveContext driveContext;
+
+    /**
+     * 获取指定驱动器, 某个文件的直链, 然后重定向过去.
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @return  重定向至文件直链
+     */
+    @GetMapping("/directlink/{driveId}/**")
+    public String directlink(@PathVariable("driveId") Integer driveId, 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) != ZFileConstant.PATH_SEPARATOR_CHAR) {
+            filePath = "/" + filePath;
+        }
+
+        AbstractBaseFileService fileService = driveContext.get(driveId);
+        FileItemDTO fileItem = fileService.getFileItem(filePath);
+
+        String url = fileItem.getUrl();
+
+        int queryIndex = url.indexOf('?');
+
+        if (queryIndex != -1) {
+            String origin = url.substring(0, queryIndex);
+            String queryString = url.substring(queryIndex + 1);
+
+            url = URLUtil.encode(origin) + "?" + URLUtil.encode(queryString);
+        } else {
+            url = URLUtil.encode(url);
+        }
+
+
+        if (Objects.equals(fileItem.getType(), FileTypeEnum.FOLDER)) {
+            return "redirect:" + fileItem.getUrl();
+        } else {
+            return "redirect:" + url;
+        }
+    }
+
+}

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

@@ -0,0 +1,243 @@
+package im.zhaojun.zfile.controller.home;
+
+import com.alibaba.fastjson.JSON;
+import im.zhaojun.zfile.context.DriveContext;
+import im.zhaojun.zfile.exception.NotExistFileException;
+import im.zhaojun.zfile.model.constant.ZFileConstant;
+import im.zhaojun.zfile.model.dto.FileItemDTO;
+import im.zhaojun.zfile.model.dto.SystemFrontConfigDTO;
+import im.zhaojun.zfile.model.entity.DriveConfig;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.model.support.FilePageModel;
+import im.zhaojun.zfile.model.support.ResultBean;
+import im.zhaojun.zfile.service.DriveConfigService;
+import im.zhaojun.zfile.service.FilterConfigService;
+import im.zhaojun.zfile.service.SystemConfigService;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
+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.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.HttpClientErrorException;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 前台文件管理
+ * @author zhaojun
+ */
+@Slf4j
+@RequestMapping("/api")
+@RestController
+public class FileController {
+
+    @Resource
+    private SystemConfigService systemConfigService;
+
+    @Resource
+    private DriveContext driveContext;
+
+    @Resource
+    private DriveConfigService driveConfigService;
+
+    @Resource
+    private FilterConfigService filterConfigService;
+
+    /**
+     * 滚动加载每页条数.
+     */
+    private static final Integer PAGE_SIZE = 30;
+
+
+    /**
+     * 获取所有已启用的驱动器
+     *
+     * @return  所有已启用驱动器
+     */
+    @GetMapping("/drive/list")
+    public ResultBean drives() {
+        return ResultBean.success(driveConfigService.listOnlyEnable());
+    }
+
+    /**
+     * 获取某个驱动器下, 指定路径的数据, 每页固定 {@link #PAGE_SIZE} 条数据.
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @param   path
+     *          路径
+     *
+     * @param   password
+     *          文件夹密码, 某些文件夹需要密码才能访问, 当不需要密码时, 此参数可以为空
+     *
+     * @param   page
+     *          页数
+     *
+     * @return  当前路径下所有文件及文件夹
+     */
+    @GetMapping("/list/{driveId}")
+    public ResultBean list(@PathVariable(name = "driveId") Integer driveId,
+                           @RequestParam(defaultValue = "/") String path,
+                           @RequestParam(required = false) String password,
+                           @RequestParam(defaultValue = "1") Integer page) throws Exception {
+        AbstractBaseFileService fileService = driveContext.get(driveId);
+        List<FileItemDTO> fileItemList =
+                fileService.fileList(StringUtils.removeDuplicateSeparator(ZFileConstant.PATH_SEPARATOR + path + ZFileConstant.PATH_SEPARATOR));
+
+        for (FileItemDTO fileItemDTO : fileItemList) {
+            if (ZFileConstant.PASSWORD_FILE_NAME.equals(fileItemDTO.getName())) {
+                String expectedPasswordContent;
+                try {
+                    expectedPasswordContent = HttpUtil.getTextContent(fileItemDTO.getUrl());
+                } catch (HttpClientErrorException httpClientErrorException) {
+                    log.error("尝试重新获取密码文件缓存中链接后仍失败, driveId: {}, path: {}, inputPassword: {}, passwordFile:{} ",
+                            driveId, path, password, JSON.toJSONString(fileItemDTO), httpClientErrorException);
+                    try {
+                        String fullPath = StringUtils.removeDuplicateSeparator(fileItemDTO.getPath() + ZFileConstant.PATH_SEPARATOR + fileItemDTO.getName());
+                        FileItemDTO fileItem = fileService.getFileItem(fullPath);
+                        expectedPasswordContent = HttpUtil.getTextContent(fileItem.getUrl());
+                    } catch (Exception e) {
+                        log.error("尝试重新获取密码文件链接后仍失败, 已暂时取消密码", e);
+                        break;
+                    }
+                }
+
+                if (Objects.equals(expectedPasswordContent, password)) {
+                    break;
+                }
+
+                if (password != null && !"".equals(password)) {
+                    return ResultBean.error("密码错误.", ResultBean.INVALID_PASSWORD);
+                }
+                return ResultBean.error("此文件夹需要密码.", ResultBean.REQUIRED_PASSWORD);
+            }
+        }
+
+        // 过滤掉表达式中不存在的数据.
+        fileItemList.removeIf(next -> filterConfigService.filterResultIsHidden(driveId, StringUtils.concatUrl(next.getPath(), next.getName())));
+        return ResultBean.successData(getSortedPagingData(fileItemList, page));
+    }
+
+    /**
+     * 获取系统配置信息和当前页的标题, 页面文档信息
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @return  返回指定驱动器的系统配置信息
+     */
+    @GetMapping("/config/{driveId}")
+    public ResultBean getConfig(@PathVariable(name = "driveId") Integer driveId, String path) {
+        SystemFrontConfigDTO systemConfig = systemConfigService.getSystemFrontConfig(driveId);
+
+        AbstractBaseFileService fileService = driveContext.get(driveId);
+        DriveConfig driveConfig = driveConfigService.findById(driveId);
+        String fullPath = StringUtils.removeDuplicateSeparator(path + ZFileConstant.PATH_SEPARATOR + ZFileConstant.README_FILE_NAME);
+        FileItemDTO fileItem = null;
+        try {
+            fileItem = fileService.getFileItem(fullPath);
+
+            if (!Objects.equals(driveConfig.getType(), StorageTypeEnum.FTP)) {
+                String readme = HttpUtil.getTextContent(fileItem.getUrl());
+                systemConfig.setReadme(readme);
+            }
+        } catch (Exception e) {
+            if (e instanceof NotExistFileException) {
+                log.debug("不存在 README 文件, 已跳过, fullPath: {}, fileItem: {}", fullPath, JSON.toJSONString(fileItem));
+            } else {
+                log.error("获取 README 文件异常, fullPath: {}, fileItem: {}", fullPath, JSON.toJSONString(fileItem), e);
+            }
+        }
+
+        return ResultBean.successData(systemConfig);
+    }
+
+
+    @GetMapping("/search/{driveId}")
+    public ResultBean search(@RequestParam(value = "name", defaultValue = "/") String name,
+                             @RequestParam(defaultValue = "name") String sortBy,
+                             @RequestParam(defaultValue = "asc") String order,
+                             @RequestParam(defaultValue = "1") Integer page,
+                             @PathVariable("driveId") Integer driveId) {
+        return ResultBean.error("暂不支持搜索功能");
+    }
+
+
+    /**
+     * 过滤文件列表, 去除密码, 文档文件.
+     *
+     * @param   fileItemList
+     *          文件列表
+     */
+    private void filterFileList(List<FileItemDTO> fileItemList) {
+        if (fileItemList == null) {
+            return;
+        }
+
+        fileItemList.removeIf(fileItem -> ZFileConstant.PASSWORD_FILE_NAME.equals(fileItem.getName())
+                || ZFileConstant.README_FILE_NAME.equals(fileItem.getName()));
+    }
+
+
+    /**
+     * 对传入的文件列表, 按照文件名进行排序, 然后取相应页数的文件
+     *
+     * @param   fileItemList
+     *          文件列表
+     *
+     * @param   page
+     *          要取的页数
+     *
+     * @return  排序及分页后的那段数据
+     */
+    private FilePageModel getSortedPagingData(List<FileItemDTO> fileItemList, Integer page) {
+        ArrayList<FileItemDTO> copy = new ArrayList<>(Arrays.asList(new FileItemDTO[fileItemList.size()]));
+        Collections.copy(copy, fileItemList);
+
+        // 排序, 先按照文件类型比较, 文件夹在前, 文件在后, 然后根据 sortBy 字段排序, 默认为升序;
+        copy.sort(new FileComparator());
+        filterFileList(copy);
+
+        int total = copy.size();
+        int totalPage = (total + PAGE_SIZE - 1) / PAGE_SIZE;
+
+        if (page > totalPage) {
+            return new FilePageModel(totalPage, Collections.emptyList());
+        }
+
+        int start = (page - 1) * PAGE_SIZE;
+        int end = page * PAGE_SIZE;
+        end = Math.min(end, total);
+        return new FilePageModel(totalPage, copy.subList(start, end));
+    }
+
+
+    /**
+     * 获取指定路径下的文件信息内容
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @param   path
+     *          文件全路径
+     *
+     * @return  该文件的名称, 路径, 大小, 下载地址等信息.
+     */
+    @GetMapping("/directlink/{driveId}")
+    public ResultBean directlink(@PathVariable(name = "driveId") Integer driveId, String path) {
+        AbstractBaseFileService fileService = driveContext.get(driveId);
+        return ResultBean.successData(fileService.getFileItem(path));
+    }
+
+}

src/main/java/im/zhaojun/zfile/controller/home/FileParseController.java

@@ -0,0 +1,45 @@
+package im.zhaojun.zfile.controller.home;
+
+import im.zhaojun.zfile.model.support.ResultBean;
+import im.zhaojun.zfile.util.AudioUtil;
+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;
+
+/**
+ * 文件解析 Controller
+ * @author zhaojun
+ */
+@RestController
+@RequestMapping("/common")
+public class FileParseController {
+
+    /**
+     * 获取文件内容, 仅限用于 txt, md, ini 等普通文本文件.
+     *
+     * @param   url
+     *          文件路径
+     *
+     * @return  文件内容
+     */
+    @GetMapping("/content")
+    public ResultBean getContent(String url) {
+        return ResultBean.successData(HttpUtil.getTextContent(url));
+    }
+
+
+    /**
+     * 获取音频文件信息
+     *
+     * @param   url
+     *          文件 URL
+     *
+     * @return 音频信息, 标题封面等信息
+     */
+    @GetMapping("/audio-info")
+    public ResultBean getAudioInfo(String url) throws Exception {
+        return ResultBean.success(AudioUtil.getAudioInfo(url));
+    }
+
+}

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

@@ -0,0 +1,49 @@
+package im.zhaojun.zfile.controller.home;
+
+import im.zhaojun.zfile.context.DriveContext;
+import im.zhaojun.zfile.model.constant.ZFileConstant;
+import im.zhaojun.zfile.service.impl.LocalServiceImpl;
+import im.zhaojun.zfile.util.FileUtil;
+import im.zhaojun.zfile.util.StringUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.HandlerMapping;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+
+/**
+ * 本地存储 Controller
+ * @author zhaojun
+ */
+@Controller
+public class LocalController {
+
+    @Resource
+    private DriveContext driveContext;
+
+    /**
+     * 本地存储下载指定文件
+     *
+     * @param   driveId
+     *          驱动器 ID
+     *
+     * @return  文件
+     */
+    @GetMapping("/file/{driveId}/**")
+    @ResponseBody
+    public ResponseEntity<Object> downAttachment(@PathVariable("driveId") Integer driveId, 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);
+        LocalServiceImpl localService = (LocalServiceImpl) driveContext.get(driveId);
+        return FileUtil.export(new File(StringUtils.removeDuplicateSeparator(localService.getFilePath() + ZFileConstant.PATH_SEPARATOR + filePath)));
+    }
+
+}

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

@@ -0,0 +1,45 @@
+package im.zhaojun.zfile.controller.install;
+
+import cn.hutool.crypto.SecureUtil;
+import im.zhaojun.zfile.model.dto.SystemConfigDTO;
+import im.zhaojun.zfile.model.support.ResultBean;
+import im.zhaojun.zfile.service.SystemConfigService;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 系统安装初始化
+ * @author zhaojun
+ */
+@RestController
+public class InstallController {
+
+    @Resource
+    private SystemConfigService systemConfigService;
+
+    @GetMapping("/is-installed")
+    public ResultBean isInstall() {
+        if (!StringUtils.isEmpty(systemConfigService.getAdminUsername())) {
+            return ResultBean.error("请勿重复初始化");
+        }
+        return ResultBean.success();
+    }
+
+
+    @PostMapping("/install")
+    public ResultBean install(SystemConfigDTO systemConfigDTO) {
+        if (!StringUtils.isEmpty(systemConfigService.getAdminUsername())) {
+            return ResultBean.error("请勿重复初始化.");
+        }
+
+        systemConfigDTO.setPassword(SecureUtil.md5(systemConfigDTO.getPassword()));
+        systemConfigService.updateSystemConfig(systemConfigDTO);
+
+        return ResultBean.success();
+    }
+
+}

src/main/java/im/zhaojun/zfile/controller/onedrive/OneDriveCallbackController.java

@@ -1,8 +1,8 @@
-package im.zhaojun.onedrive.common.controller;
+package im.zhaojun.zfile.controller.onedrive;
 
-import im.zhaojun.onedrive.china.service.OneDriveChinaService;
+import im.zhaojun.zfile.model.support.OneDriveToken;
-import im.zhaojun.onedrive.common.model.OneDriveToken;
+import im.zhaojun.zfile.service.impl.OneDriveChinaServiceImpl;
-import im.zhaojun.onedrive.international.service.OneDriveService;
+import im.zhaojun.zfile.service.impl.OneDriveServiceImpl;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,18 +14,18 @@ import javax.annotation.Resource;
  * @author zhaojun
  */
 @Controller
-@RequestMapping("/onedirve")
+@RequestMapping("/onedrive")
-public class OneDriveController {
+public class OneDriveCallbackController {
 
     @Resource
-    private OneDriveService oneDriveService;
+    private OneDriveServiceImpl oneDriveServiceImpl;
 
     @Resource
-    private OneDriveChinaService oneDriveChinaService;
+    private OneDriveChinaServiceImpl oneDriveChinaServiceImpl;
 
     @GetMapping("/callback")
-    public String onedriveCallback(String code, Model model) {
+    public String oneDriveCallback(String code, Model model) {
-        OneDriveToken oneDriveToken = oneDriveService.getToken(code);
+        OneDriveToken oneDriveToken = oneDriveServiceImpl.getToken(code);
         model.addAttribute("accessToken", oneDriveToken.getAccessToken());
         model.addAttribute("refreshToken", oneDriveToken.getRefreshToken());
         return "callback";
@@ -33,8 +33,8 @@ public class OneDriveController {
 
 
     @GetMapping("/china-callback")
-    public String onedriveChinaCallback(String code, Model model) {
+    public String oneDriveChinaCallback(String code, Model model) {
-        OneDriveToken oneDriveToken = oneDriveChinaService.getToken(code);
+        OneDriveToken oneDriveToken = oneDriveChinaServiceImpl.getToken(code);
         model.addAttribute("accessToken", oneDriveToken.getAccessToken());
         model.addAttribute("refreshToken", oneDriveToken.getRefreshToken());
         return "callback";

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.support.ResultBean;
 import org.apache.catalina.connector.ClientAbortException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,28 +20,6 @@ public class GlobleExceptionHandler {
 
     private static final Logger log = LoggerFactory.getLogger(GlobleExceptionHandler.class);
 
-    @ExceptionHandler(SearchDisableException.class)
-    @ResponseBody
-    @ResponseStatus(code= HttpStatus.INTERNAL_SERVER_ERROR)
-    public ResultBean searchDisableExceptionHandler(SearchDisableException e) {
-        if (log.isDebugEnabled()) {
-            log.debug(e.getMessage(), e);
-        }
-        return ResultBean.error(e.getMessage());
-    }
-
-
-    @ExceptionHandler
-    @ResponseBody
-    @ResponseStatus
-    public ResultBean searchDisableExceptionHandler(StorageStrategyUninitializedException e) {
-        if (log.isDebugEnabled()) {
-            log.debug(e.getMessage(), e);
-        }
-        return ResultBean.error(e.getMessage());
-    }
-
-
     /**
      * 不存在的文件异常
      */
@@ -51,6 +29,7 @@ public class GlobleExceptionHandler {
         return ResultBean.error("文件不存在");
     }
 
+
     /**
      * 捕获 ClientAbortException 异常, 不做任何处理, 防止出现大量堆栈日志输出, 此异常不影响功能.
      */
@@ -63,14 +42,40 @@ public class GlobleExceptionHandler {
         // }
     }
 
+
+    /**
+     * 文件预览异常
+     */
+    @ExceptionHandler({PreviewException.class})
+    @ResponseBody
+    @ResponseStatus
+    public ResultBean previewException(PreviewException ex) {
+        return ResultBean.error(ex.getMessage());
+    }
+
+
+    /**
+     * 初始化异常
+     */
+    @ExceptionHandler({InitializeDriveException.class})
+    @ResponseBody
+    @ResponseStatus
+    public ResultBean initializeException(InitializeDriveException ex) {
+        return ResultBean.error(ex.getMessage());
+    }
+
+
     @ExceptionHandler
     @ResponseBody
     @ResponseStatus(code= HttpStatus.INTERNAL_SERVER_ERROR)
     public ResultBean searchDisableExceptionHandler(Exception e) {
-        if (log.isDebugEnabled()) {
+        log.error(e.getMessage(), e);
-            log.debug(e.getMessage(), e);
+
+        if (e.getClass() == Exception.class) {
+            return ResultBean.error("系统异常, 请联系管理员");
+        } else {
+            return ResultBean.error(e.getMessage());
         }
-        return ResultBean.error("系统异常, 请联系管理员");
     }
 
 }

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

@@ -0,0 +1,29 @@
+package im.zhaojun.zfile.exception;
+
+/**
+ * 对象存储初始化异常
+ * @author zhaojun
+ */
+public class InitializeDriveException extends RuntimeException {
+
+    private static final long serialVersionUID = -1920550904063819880L;
+
+    public InitializeDriveException() {
+    }
+
+    public InitializeDriveException(String message) {
+        super(message);
+    }
+
+    public InitializeDriveException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InitializeDriveException(Throwable cause) {
+        super(cause);
+    }
+
+    public InitializeDriveException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

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

@@ -0,0 +1,27 @@
+package im.zhaojun.zfile.exception;
+
+/**
+ * 无效的驱动器异常
+ * @author zhaojun
+ */
+public class InvalidDriveException extends RuntimeException {
+
+    public InvalidDriveException() {
+    }
+
+    public InvalidDriveException(String message) {
+        super(message);
+    }
+
+    public InvalidDriveException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InvalidDriveException(Throwable cause) {
+        super(cause);
+    }
+
+    public InvalidDriveException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

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/PreviewException.java

@@ -0,0 +1,28 @@
+package im.zhaojun.zfile.exception;
+
+/**
+ * 文件预览异常类
+ * @author zhaojun
+ */
+public class PreviewException extends RuntimeException {
+
+    public PreviewException() {
+    }
+
+    public PreviewException(String message) {
+        super(message);
+    }
+
+    public PreviewException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public PreviewException(Throwable cause) {
+        super(cause);
+    }
+
+    public PreviewException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+}

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

@@ -0,0 +1,29 @@
+package im.zhaojun.zfile.exception;
+
+/**
+ * 刷新缓存时出现的异常信息
+ *
+ * @author zhaojun
+ */
+public class RefreshCacheException extends RuntimeException {
+
+    public RefreshCacheException() {
+    }
+
+    public RefreshCacheException(String message) {
+        super(message);
+    }
+
+    public RefreshCacheException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public RefreshCacheException(Throwable cause) {
+        super(cause);
+    }
+
+    public RefreshCacheException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package im.zhaojun.common.exception;
+package im.zhaojun.zfile.exception;
 
 /**
  * 存储策略未初始化异常
@@ -26,4 +26,5 @@ public class StorageStrategyUninitializedException extends RuntimeException {
     public StorageStrategyUninitializedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
         super(message, cause, enableSuppression, writableStackTrace);
     }
-}
+
+}

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

@@ -1,4 +1,4 @@
-package im.zhaojun.common.config;
+package im.zhaojun.zfile.filter;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.cors.CorsUtils;
@@ -23,7 +23,6 @@ public class CorsFilter extends GenericFilterBean {
         HttpServletRequest httpServletRequest = (HttpServletRequest) request;
         HttpServletResponse httpServletResponse = (HttpServletResponse) response;
 
-        // Set customized header
         httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, httpServletRequest.getHeader(HttpHeaders.ORIGIN));
         httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, "Origin, X-Requested-With, Content-Type, Accept");
         httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, "GET, POST, PUT, DELETE, OPTIONS");
@@ -34,4 +33,5 @@ public class CorsFilter extends GenericFilterBean {
             chain.doFilter(httpServletRequest, httpServletResponse);
         }
     }
+
 }

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;
@@ -23,4 +23,5 @@ public class MyCorsFilter {
         urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
         return new CorsFilter(urlBasedCorsConfigurationSource);
     }
-}
+
+}

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

@@ -1,11 +1,11 @@
-package im.zhaojun.common.model.constant;
+package im.zhaojun.zfile.model.constant;
 
 /**
  * @author zhaojun
  */
 public class StorageConfigConstant {
 
-    public static final String BUCKET_NAME_KEY = "bucket-name";
+    public static final String BUCKET_NAME_KEY = "bucketName";
 
     public static final String SECRET_ID_KEY = "secretId";
 
@@ -15,7 +15,7 @@ public class StorageConfigConstant {
 
     public static final String ENDPOINT_KEY = "endPoint";
 
-    public static final String BASE_PATH = "base-path";
+    public static final String BASE_PATH = "basePath";
 
     public static final String DOMAIN_KEY = "domain";
 

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
@@ -7,8 +7,6 @@ public class SystemConfigConstant {
 
     public static final String SITE_NAME = "siteName";
 
-    public static final String INFO_ENABLE = "infoEnable";
-
     public static final String SEARCH_ENABLE = "searchEnable";
 
     public static final String SEARCH_IGNORE_CASE = "searchIgnoreCase";

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

@@ -0,0 +1,72 @@
+package im.zhaojun.zfile.model.constant;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author zhaojun
+ */
+@Configuration
+public class ZFileConstant {
+
+    public final static String USER_HOME = System.getProperty("user.home");
+
+    public static final Character PATH_SEPARATOR_CHAR = '/';
+
+    public static final String PATH_SEPARATOR = "/";
+
+
+    /**
+     * 系统产生的临时文件路径
+     */
+    public static String TMP_FILE_PATH = "/.zfile/tmp2/";
+
+    /**
+     * 页面文档文件
+     */
+    public static String README_FILE_NAME = "readme.md";
+
+    /**
+     * 密码文件
+     */
+    public static String PASSWORD_FILE_NAME = "password.txt";
+
+    /**
+     * 最大支持文件大小为 ? MB 的音乐文件解析封面, 歌手等信息.
+     */
+    public static Long AUDIO_MAX_FILE_SIZE_MB = 1L;
+
+    /**
+     * 最大支持文本文件大小为 ? KB 的文件内容.
+     */
+    public static Long TEXT_MAX_FILE_SIZE_KB = 100L;
+
+    @Autowired(required = false)
+    public void setTmpFilePath(@Value("${zfile.tmp.path}") String tmpFilePath) {
+        ZFileConstant.TMP_FILE_PATH = tmpFilePath;
+    }
+
+
+    @Autowired(required = false)
+    public void setHeaderFileName(@Value("${zfile.constant.readme}") String headerFileName) {
+        ZFileConstant.README_FILE_NAME = headerFileName;
+    }
+
+    @Autowired(required = false)
+    public void setPasswordFileName(@Value("${zfile.constant.password}") String passwordFileName) {
+        ZFileConstant.PASSWORD_FILE_NAME = passwordFileName;
+    }
+
+    @Autowired(required = false)
+    public void setAudioMaxFileSizeMb(@Value("${zfile.preview.audio.maxFileSizeMb}") Long maxFileSizeMb) {
+        ZFileConstant.AUDIO_MAX_FILE_SIZE_MB = maxFileSizeMb;
+    }
+
+    @Autowired(required = false)
+    public void setTextMaxFileSizeMb(@Value("${zfile.preview.text.maxFileSizeKb}") Long maxFileSizeKb) {
+        ZFileConstant.TEXT_MAX_FILE_SIZE_KB = maxFileSizeKb;
+    }
+
+
+}

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

@@ -0,0 +1,27 @@
+package im.zhaojun.zfile.model.dto;
+
+import lombok.Data;
+
+/**
+ * @author zhaojun
+ */
+@Data
+public class AudioInfoDTO {
+
+    private String title;
+
+    private String artist;
+
+    private String cover;
+
+    private String src;
+
+    public static AudioInfoDTO buildDefaultAudioInfoDTO() {
+        AudioInfoDTO audioInfoDTO = new AudioInfoDTO();
+        audioInfoDTO.setTitle("未知歌曲");
+        audioInfoDTO.setArtist("未知");
+        audioInfoDTO.setCover("http://c.jun6.net/audio.png");
+        return audioInfoDTO;
+    }
+
+}

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

@@ -0,0 +1,23 @@
+package im.zhaojun.zfile.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Set;
+
+/**
+ * @author zhaojun
+ */
+@Data
+@AllArgsConstructor
+public class CacheInfoDTO {
+
+    private Integer cacheCount;
+
+    private Integer hitCount;
+
+    private Integer missCount;
+
+    private Set<String> cacheKeys;
+
+}

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

@@ -0,0 +1,37 @@
+package im.zhaojun.zfile.model.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.model.enums.StorageTypeEnumJsonDeSerializerConvert;
+import lombok.Data;
+
+/**
+ * @author zhaojun
+ */
+@Data
+public class DriveConfigDTO {
+
+    private Integer id;
+
+    private String name;
+
+    @JsonDeserialize(using = StorageTypeEnumJsonDeSerializerConvert.class)
+    private StorageTypeEnum type;
+
+    private Boolean enable;
+
+    private boolean enableCache;
+
+    private boolean autoRefreshCache;
+
+    private boolean searchEnable;
+
+    private boolean searchIgnoreCase;
+
+    private boolean searchContainEncryptedFile;
+
+    private Integer orderNum;
+
+    private StorageStrategyConfig storageStrategyConfig;
+
+}

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/StorageStrategyConfig.java

@@ -0,0 +1,43 @@
+package im.zhaojun.zfile.model.dto;
+
+import lombok.Data;
+
+/**
+ * @author zhaojun
+ */
+@Data
+public class StorageStrategyConfig {
+
+    private String endPoint;
+
+    private String pathStyle;
+
+    private Boolean isPrivate;
+
+    private String accessKey;
+
+    private String secretKey;
+
+    private String bucketName;
+
+    private String host;
+
+    private String port;
+
+    private String accessToken;
+
+    private String refreshToken;
+
+    private String secretId;
+
+    private String filePath;
+
+    private String username;
+
+    private String password;
+
+    private String domain;
+
+    private String basePath;
+
+}

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

@@ -1,5 +1,6 @@
-package im.zhaojun.common.model.dto;
+package im.zhaojun.zfile.model.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -16,6 +17,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,14 +1,15 @@
-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.zfile.model.enums.StorageTypeEnum;
-import im.zhaojun.common.model.enums.StorageTypeEnumSerializerConvert;
+import im.zhaojun.zfile.model.enums.StorageTypeEnumSerializerConvert;
 import lombok.Data;
 import lombok.ToString;
 
 /**
  * 系统设置传输类
+ *
  * @author zhaojun
  */
 @ToString
@@ -20,28 +21,29 @@ public class SystemConfigDTO {
 
     private String siteName;
 
-    private Boolean infoEnable;
+    private String username;
-
-    private Boolean searchEnable;
-
-    private Boolean searchIgnoreCase;
 
     @JsonSerialize(using = StorageTypeEnumSerializerConvert.class)
     private StorageTypeEnum storageStrategy;
 
-    private String username;
-
     @JsonIgnore
     private String password;
 
     private String domain;
 
-    private Boolean enableCache;
-
-    private Boolean searchContainEncryptedFile;
-
     private String customJs;
 
     private String customCss;
 
+    private String tableSize;
+
+    private Boolean showOperator;
+
+    private Boolean showDocument;
+
+    private String announcement;
+
+    private Boolean showAnnouncement;
+
+    private String layout;
 }

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

@@ -0,0 +1,44 @@
+package im.zhaojun.zfile.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * 系统设置传输类
+ * @author zhaojun
+ */
+@ToString
+@Data
+public class SystemFrontConfigDTO {
+
+    @JsonIgnore
+    private Integer id;
+
+    private String siteName;
+
+    private Boolean searchEnable;
+
+    private String username;
+
+    private String domain;
+
+    private String customJs;
+
+    private String customCss;
+
+    private String tableSize;
+
+    private Boolean showOperator;
+
+    private Boolean showDocument;
+
+    private String announcement;
+
+    private Boolean showAnnouncement;
+
+    private String layout;
+
+    private String readme;
+
+}

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

@@ -0,0 +1,42 @@
+package im.zhaojun.zfile.model.entity;
+
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * 驱动器
+ *
+ * @author zhaojun
+ */
+@Entity(name = "DRIVER_CONFIG")
+@Data
+public class DriveConfig {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    private Boolean enable;
+
+    private String name;
+
+    private Boolean enableCache;
+
+    private Boolean autoRefreshCache;
+
+    private StorageTypeEnum type;
+
+    private Boolean searchEnable;
+
+    private Boolean searchIgnoreCase;
+
+    private Boolean searchContainEncryptedFile;
+
+    private Integer orderNum;
+
+}

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

@@ -0,0 +1,27 @@
+package im.zhaojun.zfile.model.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+
+/**
+ * @author zhaojun
+ */
+@Entity(name = "FILTER_CONFIG")
+@Data
+public class FilterConfig {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    private Integer driveId;
+
+    private String expression;
+
+}

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

@@ -0,0 +1,41 @@
+package im.zhaojun.zfile.model.entity;
+
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+
+/**
+ * @author zhaojun
+ */
+@Entity(name = "STORAGE_CONFIG")
+@Data
+public class StorageConfig {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    private StorageTypeEnum type;
+
+    @Column(name = "k")
+    private String key;
+
+    private String title;
+
+    @Lob
+    private String value;
+
+    private Integer driveId;
+
+    public StorageConfig(String key, String title) {
+        this.key = key;
+        this.title = title;
+    }
+
+}

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

@@ -0,0 +1,31 @@
+package im.zhaojun.zfile.model.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+
+/**
+ * @author zhaojun
+ */
+@Entity(name = "SYSTEM_CONFIG")
+@Data
+public class SystemConfig {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "k")
+    private String key;
+
+    @Lob
+    private String value;
+
+    private String remark;
+
+}

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
@@ -28,4 +28,5 @@ public enum FileTypeEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
 }

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;
 
@@ -14,18 +14,18 @@ public enum StorageTypeEnum {
     /**
      * 当前系统支持的所有存储策略
      */
-    ALIYUN("aliyun", "阿里云 OSS"),
-    FTP("ftp", "FTP"),
-    HUAWEI("huawei", "华为云 OBS"),
     LOCAL("local", "本地存储"),
+    ALIYUN("aliyun", "阿里云 OSS"),
+    TENCENT("tencent", "腾讯云 COS"),
+    UPYUN("upyun", "又拍云 USS"),
+    FTP("ftp", "FTP"),
+    UFILE("ufile", "UFile"),
+    HUAWEI("huawei", "华为云 OBS"),
     MINIO("minio", "MINIO"),
     S3("s3", "S3通用协议"),
     ONE_DRIVE("onedrive", "OneDrive"),
     ONE_DRIVE_CHINA("onedrive-china", "OneDrive 世纪互联"),
-    QINIU("qiniu", "七牛云 KODO"),
+    QINIU("qiniu", "七牛云 KODO");
-    TENCENT("tencent", "腾讯云 COS"),
-    UPYUN("upyun", "又拍云 USS");
-
 
     private String key;
     private String description;
@@ -63,4 +63,4 @@ public enum StorageTypeEnum {
         return enumMap.get(value.toLowerCase());
     }
 
-}
+}

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;
@@ -12,4 +12,5 @@ public class StorageTypeEnumDeSerializerConvert implements Converter<String, Sto
     public StorageTypeEnum convert(@NonNull String s) {
         return StorageTypeEnum.getEnum(s);
     }
-}
+
+}

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

@@ -0,0 +1,18 @@
+package im.zhaojun.zfile.model.enums;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+
+/**
+ * @author zhaojun
+ */
+public class StorageTypeEnumJsonDeSerializerConvert extends JsonDeserializer<StorageTypeEnum> {
+
+    @Override
+    public StorageTypeEnum deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+        return StorageTypeEnum.getEnum(jsonParser.getText());
+    }
+}

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

@@ -0,0 +1,20 @@
+package im.zhaojun.zfile.model.support;
+
+import im.zhaojun.zfile.model.dto.FileItemDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhaojun
+ */
+@Data
+@AllArgsConstructor
+public class FilePageModel {
+
+    private int totalPage;
+
+    private List<FileItemDTO> fileList;
+
+}