🔖 发布 1.8 版

README.md

@@ -10,6 +10,7 @@
 前端基于 [h5ai](https://larsjung.de/h5ai/) 的原有功能使用 Vue 重新开发了一遍. 后端采用 SpringBoot, 数据库采用内嵌数据库.
 
 预览地址: [https://zfile.jun6.net](https://zfile.jun6.net)
+文档地址: [http://docs.zhaojun.im/zfile](http://docs.zhaojun.im/zfile)
 
 ## 系统特色
 
@@ -84,12 +85,12 @@ chmod +x ~/zfile/bin/*.sh
 
 国际/家庭/个人版:
 
-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.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=09939809-c617-43c8-a220-a93c1513c5d4&response_type=code&redirect_uri=https://zfile.jun6.net/onedrive/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
+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/onedrive/china-callback&scope=offline_access%20User.Read%20Files.ReadWrite.All
 
 
 然后分别填写至访问令牌和刷新令牌即可:
@@ -128,6 +129,9 @@ https://login.chinacloudapi.cn/common/oauth2/v2.0/authorize?client_id=4a72d927-1
 
 - [x] API 支持 [点击查看文档](https://github.com/zhaojun1998/zfile/blob/master/API.md)
 - [x] 更方便的部署方式
+- [x] 布局优化 - 自定义操作按钮 (现为右键实现)
+- [x] 后台优化 - 设置按照其功能进行分离
+- [x] 体验优化 - 支持前后端分离部署
 - [ ] 新功能 - 后台支持上传、编辑、删除等操作
 - [ ] 新功能 - WebDav 支持
 - [ ] 新功能 - Docker 支持
@@ -135,9 +139,6 @@ https://login.chinacloudapi.cn/common/oauth2/v2.0/authorize?client_id=4a72d927-1
 - [ ] 体验优化 - 文本预览更换 vscode 同款编辑器 monaco editor
 - [ ] 体验优化 - 忽略文件列表 (正则表达式)
 - [ ] 体验优化 - 自定义支持预览的文件后缀 (正则表达式)
-- [ ] 布局优化 - 底部增加固定栏, 用于填写备案信息, 友情链接等信息.
-- [ ] 布局优化 - 自定义操作按钮 (现为右键实现)
-- [ ] 后台优化 - 设置按照其功能进行分离
 - [ ] 架构调整 - 支持多存储策略
 - [ ] 体验优化 - 一键安装脚本
 

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>im.zhaojun</groupId>
     <artifactId>zfile</artifactId>
-    <version>1.5</version>
+    <version>1.8</version>
     <name>zfile</name>
     <packaging>war</packaging>
     <description>一个在线的文件浏览系统</description>
@@ -67,7 +67,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-->
@@ -147,9 +147,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/common/config/GlobalScheduleTask.java

@@ -36,7 +36,7 @@ public class GlobalScheduleTask {
     private SystemConfigService systemConfigService;
 
     /**
-     * 项目启动 30 秒后, 每 15 分支执行一次刷新 OneDrive Token 的定时任务.
+     * 项目启动 30 秒后, 每 15 分钟执行一次刷新 OneDrive Token 的定时任务.
      */
     @Scheduled(fixedRate = 1000 * 60 * 15, initialDelay = 1000 * 30)
     public void autoRefreshOneDriveToken() {

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

@@ -1,7 +1,10 @@
 package im.zhaojun.common.controller;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ZipUtil;
 import im.zhaojun.common.config.StorageTypeFactory;
 import im.zhaojun.common.model.StorageConfig;
+import im.zhaojun.common.model.SystemMonitorInfo;
 import im.zhaojun.common.model.dto.ResultBean;
 import im.zhaojun.common.model.dto.StorageStrategyDTO;
 import im.zhaojun.common.model.dto.SystemConfigDTO;
@@ -10,8 +13,10 @@ import im.zhaojun.common.service.AbstractFileService;
 import im.zhaojun.common.service.FileAsyncCacheService;
 import im.zhaojun.common.service.StorageConfigService;
 import im.zhaojun.common.service.SystemConfigService;
+import im.zhaojun.common.util.FileUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +24,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -92,6 +100,9 @@ public class AdminController {
         return ResultBean.success(storageConfigList);
     }
 
+    /**
+     * 返回支持的存储引擎.
+     */
     @GetMapping("/support-strategy")
     public ResultBean supportStrategy() {
         List<StorageStrategyDTO> result = new ArrayList<>();
@@ -170,4 +181,23 @@ public class AdminController {
         }
     }
 
+    /**
+     * 系统日志下载
+     */
+    @GetMapping("/log")
+    public ResponseEntity<Object> downloadLog(HttpServletResponse response) {
+        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");
+    }
+
+    /**
+     * 获取系统监控信息
+     */
+    @GetMapping("monitor")
+    public ResultBean monitor() {
+        return ResultBean.success(new SystemMonitorInfo());
+    }
+
 }

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

@@ -0,0 +1,39 @@
+package im.zhaojun.common.model;
+
+import lombok.Data;
+
+/**
+ * @author zhaojun
+ */
+@Data
+public class Jvm {
+
+    /**
+     * 当前 JVM 占用的内存总数 (M)
+     */
+    private double total;
+
+    /**
+     * JVM 最大可用内存总数 (M)
+     */
+    private double max;
+
+    /**
+     * JVM 空闲内存 (M)
+     */
+    private double free;
+
+    /**
+     * JDK 版本
+     */
+    private String version;
+
+    public Jvm() {
+        Runtime runtime = Runtime.getRuntime();
+        this.total = runtime.totalMemory();
+        this.free = runtime.freeMemory();
+        this.max = runtime.maxMemory();
+        this.version = System.getProperty("java.version");
+    }
+
+}

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

@@ -0,0 +1,41 @@
+package im.zhaojun.common.model;
+
+import com.sun.management.OperatingSystemMXBean;
+import lombok.Data;
+
+import java.lang.management.ManagementFactory;
+
+/**
+ * @author zhaojun
+ */
+@Data
+public class Mem {
+
+    /**
+     * 内存总量
+     */
+    private double total;
+
+    /**
+     * 已用内存
+     */
+    private double used;
+
+    /**
+     * 剩余内存
+     */
+    private double free;
+
+    public Mem() {
+        OperatingSystemMXBean operatingSystemMXBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
+        // 总的物理内存+虚拟内存
+        long totalVirtualMemory = operatingSystemMXBean.getTotalSwapSpaceSize();
+        // 剩余的物理内存
+        long freePhysicalMemorySize = operatingSystemMXBean.getFreePhysicalMemorySize();
+        this.total = totalVirtualMemory;
+        this.free = freePhysicalMemorySize;
+        this.used = totalVirtualMemory - freePhysicalMemorySize;
+    }
+
+
+}

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

@@ -0,0 +1,58 @@
+package im.zhaojun.common.model;
+
+import cn.hutool.core.date.BetweenFormater;
+import cn.hutool.core.date.DateUtil;
+import lombok.Data;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+
+/**
+ * @author zhaojun
+ */
+@Data
+public class Sys {
+
+    /**
+     * 项目路径
+     */
+    private String projectDir;
+
+    /**
+     * 操作系统
+     */
+    private String osName;
+
+    /**
+     * 系统架构
+     */
+    private String osArch;
+
+    /**
+     * 系统版本
+     */
+    private String osVersion;
+
+    /**
+     * 启动时间
+     */
+    private String upTime;
+
+    public Sys() {
+        this.osName = System.getProperty("os.name");
+        this.osArch = System.getProperty("os.arch");
+        this.osVersion = System.getProperty("os.version");
+        Resource resource = new ClassPathResource("");
+        try {
+            this.projectDir = resource.getFile().getAbsolutePath();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        long uptime = ManagementFactory.getRuntimeMXBean().getUptime();
+        this.upTime = DateUtil.formatBetween(uptime, BetweenFormater.Level.SECOND);
+    }
+
+}

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

@@ -0,0 +1,34 @@
+package im.zhaojun.common.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaojun
+ */
+@Data
+public class SystemMonitorInfo implements Serializable {
+
+    /**
+     * 服务器基本信息
+     */
+    private Sys sys;
+
+    /**
+     * JVM 信息
+     */
+    private Jvm jvm;
+
+    /**
+     * 系统内存
+     */
+    private Mem mem;
+
+    public SystemMonitorInfo() {
+        this.jvm = new Jvm();
+        this.sys = new Sys();
+        this.mem = new Mem();
+    }
+
+}

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

@@ -0,0 +1,15 @@
+package im.zhaojun.common.service;
+
+import im.zhaojun.common.model.SystemMonitorInfo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhaojun
+ */
+@Service
+public class SystemMonitorService {
+
+    public SystemMonitorInfo systemMonitorInfo() {
+        return new SystemMonitorInfo();
+    }
+}

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

@@ -0,0 +1,68 @@
+package im.zhaojun.common.util;
+
+import cn.hutool.core.util.URLUtil;
+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 java.io.File;
+import java.util.Date;
+
+/**
+ * @author zhaojun
+ */
+public class FileUtil {
+
+    public static ResponseEntity<Object> export(File file, String fileName) {
+        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");
+
+        if (StringUtils.isNullOrEmpty(fileName)) {
+            fileName = file.getName();
+        }
+
+        headers.setContentDispositionFormData("attachment", URLUtil.encode(fileName));
+
+        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));
+    }
+
+    public static 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/ftp/service/FtpServiceImpl.java

@@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -37,17 +38,25 @@ public class FtpServiceImpl extends AbstractFileService implements FileService {
 
     private String domain;
 
+    private String host;
+
+    private String port;
+
+    private String username;
+
+    private String password;
+
     @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();
+            host = stringStorageConfigMap.get(StorageConfigConstant.HOST_KEY).getValue();
+            port = stringStorageConfigMap.get(StorageConfigConstant.PORT_KEY).getValue();
+            username = stringStorageConfigMap.get(StorageConfigConstant.USERNAME_KEY).getValue();
+            password = stringStorageConfigMap.get(StorageConfigConstant.PASSWORD_KEY).getValue();
             domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
-
+            super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();;
             if (Objects.isNull(host) || Objects.isNull(port) || Objects.isNull(username) || Objects.isNull(password)) {
                 isInitialized = false;
             } else {
@@ -61,8 +70,9 @@ public class FtpServiceImpl extends AbstractFileService implements FileService {
     }
 
     @Override
-    public List<FileItemDTO> fileList(String path) {
-        FTPFile[] ftpFiles = ftp.lsFiles(path);
+    public synchronized List<FileItemDTO> fileList(String path) throws IOException {
+        String fullPath = StringUtils.getFullPath(basePath, path);
+        FTPFile[] ftpFiles = ftp.lsFiles(fullPath);
 
         List<FileItemDTO> fileItemList = new ArrayList<>();
 
@@ -83,7 +93,17 @@ public class FtpServiceImpl extends AbstractFileService implements FileService {
 
     @Override
     public String getDownloadUrl(String path) {
-        return URLUtil.complateUrl(domain, path);
+        String fullPath = StringUtils.getFullPath(basePath, path);
+        if (StringUtils.isNullOrEmpty(domain)) {
+            return "ftp://"
+                    + URLUtil.encodeQuery(username)
+                    + ":"
+                    + URLUtil.encodeQuery(password)
+                    + "@"
+                    + host + ":" + port + fullPath;
+        }
+
+        return URLUtil.complateUrl(domain, fullPath);
     }
 
     @Override

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

@@ -1,12 +1,8 @@
 package im.zhaojun.local.controller;
 
-import cn.hutool.core.util.URLUtil;
+import im.zhaojun.common.util.FileUtil;
 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;
@@ -17,7 +13,6 @@ 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
@@ -37,32 +32,6 @@ public class LocalController {
         AntPathMatcher apm = new AntPathMatcher();
         String filePath = apm.extractPathWithinPattern(bestMatchPattern, path);
 
-        return export(new File(StringUtils.concatPath(localServiceImpl.getFilePath(), URLUtil.decode(filePath))));
+        return FileUtil.export(new File(StringUtils.concatPath(localServiceImpl.getFilePath(), 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/local/service/LocalServiceImpl.java

@@ -90,7 +90,7 @@ public class LocalServiceImpl extends AbstractFileService implements FileService
     @Override
     public String getDownloadUrl(String path) {
         SystemConfig usernameConfig = systemConfigRepository.findByKey(SystemConfigConstant.DOMAIN);
-        return URLUtil.encode(StringUtils.removeDuplicateSeparator(usernameConfig.getValue() + "/file/" + path));
+        return StringUtils.removeDuplicateSeparator(usernameConfig.getValue() + "/file/" + path);
     }
 
     public String getFilePath() {

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

@@ -28,16 +28,16 @@ public class OneDriveChinaServiceImpl extends AbstractOneDriveService implements
     @Resource
     private StorageConfigService storageConfigService;
 
-    @Value("${zfile.onedirve-china.clientId}")
+    @Value("${zfile.onedrive-china.clientId}")
     private String clientId;
 
-    @Value("${zfile.onedirve-china.redirectUri}")
+    @Value("${zfile.onedrive-china.redirectUri}")
     private String redirectUri;
 
-    @Value("${zfile.onedirve-china.clientSecret}")
+    @Value("${zfile.onedrive-china.clientSecret}")
     private String clientSecret;
 
-    @Value("${zfile.onedirve-china.scope}")
+    @Value("${zfile.onedrive-china.scope}")
     private String scope;
 
     @Override

src/main/java/im/zhaojun/onedrive/common/controller/OneDriveController.java

@@ -14,7 +14,7 @@ import javax.annotation.Resource;
  * @author zhaojun
  */
 @Controller
-@RequestMapping("/onedirve")
+@RequestMapping("/onedrive")
 public class OneDriveController {
 
     @Resource

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

@@ -20,6 +20,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -100,6 +102,7 @@ public abstract class AbstractOneDriveService extends AbstractFileService {
             String requestUrl;
 
             if (nextLink != null) {
+                nextLink = nextLink.replace("+", "%2B");
                 requestUrl = URLUtil.decode(nextLink);
             }else if ("/".equalsIgnoreCase(fullPath) || "".equalsIgnoreCase(fullPath)) {
                 requestUrl = DRIVER_ROOT_URL;

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

@@ -28,16 +28,16 @@ public class OneDriveServiceImpl extends AbstractOneDriveService implements File
     @Resource
     private StorageConfigService storageConfigService;
 
-    @Value("${zfile.onedirve.clientId}")
+    @Value("${zfile.onedrive.clientId}")
     protected String clientId;
 
-    @Value("${zfile.onedirve.redirectUri}")
+    @Value("${zfile.onedrive.redirectUri}")
     protected String redirectUri;
 
-    @Value("${zfile.onedirve.clientSecret}")
+    @Value("${zfile.onedrive.clientSecret}")
     protected String clientSecret;
 
-    @Value("${zfile.onedirve.scope}")
+    @Value("${zfile.onedrive.scope}")
     protected String scope;
 
     @Override

src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -18,22 +18,22 @@
             "description": "密码文件 文件名."
         },
         {
-            "name": "zfile.onedirve.clientId",
+            "name": "zfile.onedrive.clientId",
             "type": "java.lang.String",
             "description": "OneDrive ClientId."
         },
         {
-            "name": "zfile.onedirve.clientSecret",
+            "name": "zfile.onedrive.clientSecret",
             "type": "java.lang.String",
             "description": "OneDrive ClientSecret."
         },
         {
-            "name": "zfile.onedirve.redirectUri",
+            "name": "zfile.onedrive.redirectUri",
             "type": "java.lang.String",
             "description": "OneDrive 认证重定向地址."
         },
         {
-            "name": "zfile.onedirve.scope",
+            "name": "zfile.onedrive.scope",
             "type": "java.lang.String",
             "description": "OneDrive 认证权限."
         }

src/main/resources/application.yml

@@ -17,6 +17,8 @@ spring:
   datasource:
     # 初始化数据导入
     data: classpath*:db/data.sql
+    sql-script-encoding: utf-8
+
     initialization-mode: always
     continue-on-error: true
 
@@ -27,7 +29,7 @@ spring:
     password: 123456
 
     # MySQL 配置
-#    driver-class-name: com.mysql.jdbc.Driver
+  #    driver-class-name: com.mysql.jdbc.Driver
 #    url: jdbc:mysql://127.0.0.1:3306/zfile?characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
 #    username: root
 #    password: 123456
@@ -46,21 +48,25 @@ spring:
       gzipped: true
   profiles:
     active: prod
+
+  boot:
+    admin:
+      context-path: /act
 zfile:
   cache:
     timeout: 300
   constant:
     readme: readme.md
     password: password.txt
-  onedirve:
+  onedrive:
     clientId: 09939809-c617-43c8-a220-a93c1513c5d4
     clientSecret: _l:zI-_yrW75lV8M61K@z.I2K@B/On6Q
-    redirectUri: https://zfile.jun6.net/onedirve/callback
+    redirectUri: https://zfile.jun6.net/onedrive/callback
     scope: offline_access User.Read Files.ReadWrite.All
-  onedirve-china:
+  onedrive-china:
     clientId: 4a72d927-1907-488d-9eb2-1b465c53c1c5
     clientSecret: Y9CEA=82da5n-y_]KAWAgLH3?R9xf7Uw
-    redirectUri: https://zfile.jun6.net/onedirve/china-callback
+    redirectUri: https://zfile.jun6.net/onedrive/china-callback
     scope: offline_access User.Read Files.ReadWrite.All
 
 jetcache:
@@ -69,4 +75,7 @@ jetcache:
   local:
     default:
       type: caffeine
-      keyConvertor: fastjson
+      keyConvertor: fastjson
+
+
+

src/main/resources/db/data.sql

@@ -40,7 +40,7 @@ INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (20, 'host', '域
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (21, 'port', '端口', 'ftp');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (22, 'username', '用户名', 'ftp');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (23, 'password', '密码', 'ftp');
-INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (24, 'domain', '域名', 'ftp');
+INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (24, 'domain', '加速域名', 'ftp');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (25, 'secretId', 'SecretId', 'tencent');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (26, 'secretKey', 'SecretKey', 'tencent');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (27, 'bucket-name', '云存储服务名称', 'tencent');

src/main/resources/static/css/adminIndex.a8c53261.css

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

src/main/resources/static/css/adminIndex.c226568b.css

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

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

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

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

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

src/main/resources/static/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title></title><link href=/css/adminIndex.a8c53261.css rel=prefetch><link href=/css/install.b4e8b552.css rel=prefetch><link href=/js/adminIndex.0916d17e.js rel=prefetch><link href=/js/dplayer.acc587f7.js rel=prefetch><link href=/js/install.0f6d1155.js rel=prefetch><link href=/css/app.398136f5.css rel=preload as=style><link href=/css/chunk-vendors.cb63319e.css rel=preload as=style><link href=/js/app.945e1d35.js rel=preload as=script><link href=/js/chunk-vendors.d1dab075.js rel=preload as=script><link href=/css/chunk-vendors.cb63319e.css rel=stylesheet><link href=/css/app.398136f5.css rel=stylesheet></head><body><noscript><strong>We're sorry but zfile doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.d1dab075.js></script><script src=/js/app.945e1d35.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title></title><link href=/css/adminIndex.c226568b.css rel=prefetch><link href=/css/install.c1550f52.css rel=prefetch><link href=/js/adminIndex.e930ce30.js rel=prefetch><link href=/js/dplayer.acc587f7.js rel=prefetch><link href=/js/install.575ebeb6.js rel=prefetch><link href=/css/app.f59b1def.css rel=preload as=style><link href=/css/chunk-vendors.bc21228d.css rel=preload as=style><link href=/js/app.3d5f33b3.js rel=preload as=script><link href=/js/chunk-vendors.b8b2057a.js rel=preload as=script><link href=/css/chunk-vendors.bc21228d.css rel=stylesheet><link href=/css/app.f59b1def.css rel=stylesheet></head><body><noscript><strong>We're sorry but zfile doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.b8b2057a.js></script><script src=/js/app.3d5f33b3.js></script></body></html>

src/main/resources/static/js/adminIndex.e930ce30.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["adminIndex"],{"366e":function(t,e,i){"use strict";var a=i("479f"),s=i.n(a);s.a},"479f":function(t,e,i){},adf4:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("el-row",[i("el-col",{attrs:{span:3}},[i("el-menu",{staticClass:"el-menu-vertical-demo",attrs:{"default-active":"/admin"!==this.$route.path?this.$route.path:"/admin/site",router:!0}},[i("el-menu-item",{attrs:{index:"/admin/site"}},[i("i",{staticClass:"el-icon-setting"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("基本设置")])]),i("el-menu-item",{attrs:{index:"/admin/view"}},[i("i",{staticClass:"el-icon-view"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("显示设置")])]),i("el-menu-item",{attrs:{index:"/admin/storage"}},[i("i",{staticClass:"el-icon-s-operation"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("存储策略")])]),i("el-menu-item",{attrs:{index:"/admin/password"}},[i("i",{staticClass:"el-icon-key"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("修改密码")])]),i("el-menu-item",{attrs:{index:"/admin/cache"}},[i("i",{staticClass:"el-icon-collection"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("缓存管理")])]),i("el-menu-item",{attrs:{index:"/admin/api"}},[i("i",{staticClass:"el-icon-document"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("API 文档")])])],1)],1),i("el-col",{attrs:{span:16}},[i("keep-alive",{attrs:{exclude:"CacheManager,SiteSetting"}},[i("router-view")],1)],1)],1)},s=[],n={name:"Index",data:function(){return{active:"/admin/storage"}}},l=n,o=(i("366e"),i("2877")),r=Object(o["a"])(l,a,s,!1,null,"7f233ce7",null);e["default"]=r.exports}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["adminIndex"],{"1f8d":function(t,e,i){"use strict";var a=i("872f"),s=i.n(a);s.a},"872f":function(t,e,i){},adf4:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("el-row",[i("el-col",{attrs:{span:3}},[i("el-menu",{staticClass:"el-menu-vertical-demo",attrs:{"default-active":"/admin"!==this.$route.path?this.$route.path:"/admin/site",router:!0}},[i("el-menu-item",{attrs:{index:"/admin/site"}},[i("i",{staticClass:"el-icon-setting"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("基本设置")])]),i("el-menu-item",{attrs:{index:"/admin/view"}},[i("i",{staticClass:"el-icon-view"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("显示设置")])]),i("el-menu-item",{attrs:{index:"/admin/storage"}},[i("i",{staticClass:"el-icon-s-operation"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("存储策略")])]),i("el-menu-item",{attrs:{index:"/admin/password"}},[i("i",{staticClass:"el-icon-key"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("修改密码")])]),i("el-menu-item",{attrs:{index:"/admin/cache"}},[i("i",{staticClass:"el-icon-collection"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("缓存管理")])]),i("el-menu-item",{attrs:{index:"/admin/api"}},[i("i",{staticClass:"el-icon-document"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("API 文档")])]),i("el-menu-item",{attrs:{index:"/admin/monitor"}},[i("i",{staticClass:"el-icon-monitor"}),i("span",{attrs:{slot:"title"},slot:"title"},[t._v("系统监控")])])],1)],1),i("el-col",{attrs:{span:16}},[i("keep-alive",{attrs:{exclude:"CacheManager,SiteSetting"}},[i("router-view")],1)],1)],1)},s=[],n={name:"Index",data:function(){return{active:"/admin/storage"}}},l=n,o=(i("1f8d"),i("2877")),r=Object(o["a"])(l,a,s,!1,null,"7e0eaa89",null);e["default"]=r.exports}}]);

src/main/resources/static/js/install.0f6d1155.js

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

src/main/resources/static/js/install.575ebeb6.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["install"],{"06da":function(t,e,r){},"27d7":function(t,e,r){"use strict";var a=r("06da"),o=r.n(a);o.a},f8a7:function(t,e,r){"use strict";r.r(e);var a=function(){var t=this,e=t.$createElement,r=t._self._c||e;return r("el-row",{attrs:{gutter:20}},[r("el-col",{attrs:{span:8,offset:8}},[r("el-card",{staticClass:"box-card",attrs:{"align-center":"",shadow:"always"}},[r("el-form",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],ref:"form",attrs:{rules:t.rules,model:t.form,"label-width":"auto","status-icon":!0,"element-loading-text":"保存并初始化中."}},[r("el-form-item",{attrs:{label:"站点名称",prop:"siteName"}},[r("el-input",{model:{value:t.form.siteName,callback:function(e){t.$set(t.form,"siteName",e)},expression:"form.siteName"}})],1),r("el-form-item",{attrs:{label:"管理员账号",prop:"username"}},[r("el-input",{model:{value:t.form.username,callback:function(e){t.$set(t.form,"username","string"===typeof e?e.trim():e)},expression:"form.username"}})],1),r("el-form-item",{attrs:{label:"管理员密码",prop:"password"}},[r("el-input",{model:{value:t.form.password,callback:function(e){t.$set(t.form,"password","string"===typeof e?e.trim():e)},expression:"form.password"}})],1),r("el-form-item",{attrs:{label:"站点地址/域名",prop:"domain"}},[r("el-input",{model:{value:t.form.domain,callback:function(e){t.$set(t.form,"domain","string"===typeof e?e.trim():e)},expression:"form.domain"}})],1),r("el-form-item",{attrs:{label:"存储策略"}},[r("el-select",{attrs:{placeholder:"请选择存储策略"},model:{value:t.form.storageStrategy,callback:function(e){t.$set(t.form,"storageStrategy",e)},expression:"form.storageStrategy"}},t._l(t.supportStrategy,(function(t){return r("el-option",{key:t.key,attrs:{label:t.description,value:t.key}})})),1)],1),t._l(t.storageStrategyForm,(function(e){return r("el-form-item",{key:e.title,attrs:{label:e.title}},["endPoint"===e.key&&t.region.hasOwnProperty(t.form.storageStrategy)?r("el-select",{model:{value:t.form.storageStrategyConfig.endPoint,callback:function(e){t.$set(t.form.storageStrategyConfig,"endPoint",e)},expression:"form.storageStrategyConfig.endPoint"}},t._l(t.region[t.form.storageStrategy],(function(t){return r("el-option",{key:t.name,attrs:{label:t.name,value:t.val}})})),1):r("el-input",{model:{value:t.form.storageStrategyConfig[e.key],callback:function(r){t.$set(t.form.storageStrategyConfig,e.key,"string"===typeof r?r.trim():r)},expression:"form.storageStrategyConfig[item.key]"}})],1)})),r("el-form-item",[r("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.submitForm("form")}}},[t._v("确认")])],1)],2)],1)],1)],1)},o=[],n=r("4328"),s=r.n(n),i=r("245d"),l={name:"Install",data:function(){return{active:1,form:{siteName:"",storageStrategy:"",username:"",password:"",domain:window.location.protocol+"//"+window.location.host,storageStrategyConfig:{endPoint:""},loading:!0},storageStrategyForm:[],supportStrategy:[],region:i["a"],rules:{siteName:[{required:!0,message:"请输入站点名称",trigger:"change"}],username:[{required:!0,message:"请输入管理员账号",trigger:"change"}],password:[{required:!0,message:"请输入管理员密码",trigger:"change"}],domain:[{required:!0,type:"url",message:"请输入正确的域名, 需以 http:// 或 https:// 开头",trigger:"change"}]}}},watch:{"form.storageStrategy":function(t){var e=this;this.$http.get("form",{params:{storageType:t}}).then((function(t){e.form.storageStrategyConfig.endPoint=null,e.storageStrategyForm=t.data.data}))}},methods:{submitForm:function(t){var e=this;this.loading=!0,this.$refs[t].validate((function(t){if(!t)return!1;var r=e;e.$http.post("install",s.a.stringify(e.form)).then((function(t){e.loading=!1;var a=t.data;e.$message({message:a.msg,type:0===a.code?"success":"error",duration:1500,onClose:function(){r.$router.push("/main")}})}))}))}},created:function(){var t=this;this.$http.get("is-installed").then((function(e){var r=e.data;0!==r.code&&t.$router.push("/main")}))},mounted:function(){var t=this;this.$http.get("common/support-strategy").then((function(e){t.supportStrategy=e.data.data}))}},m=l,g=(r("27d7"),r("2877")),f=Object(g["a"])(m,a,o,!1,null,"680e1b46",null);e["default"]=f.exports}}]);

src/main/resources/static/zfile.config.json

@@ -0,0 +1,3 @@
+{
+  "baseUrl": "http://127.0.0.1:8080/"
+}