🔖 发布 1.2.1 版

README.md

@@ -43,9 +43,9 @@ apt install -y openjdk-8-jre-headless unzip
 下载项目:
 
 ```bash
-wget -P ~ https://c.jun6.net/ZFILE/zfile-1.0.war
+wget -P ~ https://c.jun6.net/ZFILE/zfile-1.2.1.war
 cd ~
-mkdir zfile && unzip zfile-1.0.war -d zfile && rm -rf zfile-1.0.war
+mkdir zfile && unzip zfile-1.2.1.war -d zfile && rm -rf zfile-1.2.1.war
 chmod +x ~/zfile/bin/*.sh
 ```
 
@@ -66,26 +66,7 @@ chmod +x ~/zfile/bin/*.sh
  ~/zfile/bin/start.sh
 ```
 
-停止项目:
-
-```bash
- ~/zfile/bin/stop.sh
-```
-
-重启项目:
-
-```bash
- ~/zfile/bin/restart.sh
-```
-
-
-修改配置文件:
-
-```bash
-vim ~/zfile/WEB-INF/classes/application.yml
-```
-
-> 默认启动端口为 8080, 如需请配置文件请编辑上述文件, 修改后重启程序生效.
+篇幅有限, 更详细的安装教程请参考: [安装文档](http://zhaojun.im/zfile-install)
 
 访问地址:
 
@@ -121,7 +102,6 @@ https://login.chinacloudapi.cn/common/oauth2/v2.0/authorize?client_id=4a72d927-1
 * 缓存: `caffeine`
 * 数据库: `h2/mysql`
 
-
 ## 预览
 
 ![前台首页](http://cdn.jun6.net/2020/01/29/a252a5cec7134.png)
@@ -129,8 +109,6 @@ https://login.chinacloudapi.cn/common/oauth2/v2.0/authorize?client_id=4a72d927-1
 ![存储策略](http://cdn.jun6.net/2020/01/29/4b79bfba4e003.png)
 ![缓存管理](http://cdn.jun6.net/2020/01/29/60b0538e50f9f.png)
 
-
-
 ## 常见问题
 
 ### 数据库

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>im.zhaojun</groupId>
     <artifactId>zfile</artifactId>
-    <version>1.0</version>
+    <version>1.2.1</version>
     <name>zfile</name>
     <packaging>war</packaging>
     <description>一个在线的文件浏览系统</description>

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

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

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

@@ -27,7 +27,7 @@ public class StorageConfig {
 
     private String title;
 
-    @Column(length = 2048)
+    @Column(length = 4000)
     private String value;
 
     public Integer getId() {

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

@@ -42,6 +42,8 @@ public abstract class AbstractFileService extends FileCacheService implements Fi
 
     protected boolean isInitialized = false;
 
+    protected String basePath;
+
     @Resource
     private SystemConfigService systemConfigService;
 

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

@@ -29,8 +29,6 @@ public abstract class AbstractS3FileService extends AbstractFileService {
 
     protected String path;
 
-    protected String basePath;
-
     protected String bucketName;
 
     protected String domain;
@@ -58,7 +56,7 @@ public abstract class AbstractS3FileService extends AbstractFileService {
      */
     public List<FileItemDTO> s3FileList(String path) {
         path = StringUtils.removeFirstSeparator(path);
-        String fullPath = StringUtils.removeFirstSeparator(getFullPath());
+        String fullPath = StringUtils.removeFirstSeparator(StringUtils.getFullPath(basePath, path));
         List<FileItemDTO> fileItemList = new ArrayList<>();
         ObjectListing objectListing = s3Client.listObjects(new ListObjectsRequest(bucketName, fullPath, "", "/", 1000));
 
@@ -112,16 +110,6 @@ public abstract class AbstractS3FileService extends AbstractFileService {
         return URLUtil.decode(defaultUrl);
     }
 
-    /**
-     * 获取 basePath + path 的全路径地址.
-     * @return basePath + path 的全路径地址.
-     */
-    public String getFullPath() {
-        String basePath = ObjectUtil.defaultIfNull(this.basePath, "");
-        String path = ObjectUtil.defaultIfNull(this.path, "");
-        return StringUtils.removeDuplicateSeparator(basePath + "/" + path);
-    }
-
     @Override
     public FileItemDTO getFileItem(String path) {
         List<FileItemDTO> list = fileList(path);

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

@@ -1,5 +1,7 @@
 package im.zhaojun.common.util;
 
+import cn.hutool.core.util.ObjectUtil;
+
 /**
  * @author zhaojun
  */
@@ -88,4 +90,14 @@ public class StringUtils {
     public static boolean isNotNullOrEmpty(String s) {
         return !isNullOrEmpty(s);
     }
+
+    /**
+     * 获取 basePath + path 的全路径地址.
+     * @return basePath + path 的全路径地址.
+     */
+    public static String getFullPath(String basePath, String path) {
+        basePath = ObjectUtil.defaultIfNull(basePath, "");
+        path = ObjectUtil.defaultIfNull(path, "");
+        return StringUtils.removeDuplicateSeparator(basePath + "/" + path);
+    }
 }

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

@@ -40,6 +40,7 @@ public class OneDriveServiceChinaImpl extends AbstractFileService implements Fil
                     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());
@@ -55,7 +56,7 @@ public class OneDriveServiceChinaImpl extends AbstractFileService implements Fil
 
     @Override
     public List<FileItemDTO> fileList(String path) {
-        return oneDriveChinaService.list(path);
+        return oneDriveChinaService.list(basePath, path);
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 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;
@@ -18,6 +19,7 @@ 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;
 
@@ -83,7 +85,10 @@ public abstract class AbstractOneDriveService {
         return oneDriveRestTemplate.getForObject(DRIVER_INFO_URL, String.class);
     }
 
-    public List<FileItemDTO> list(String path) {
+    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;
 
@@ -92,15 +97,15 @@ public abstract class AbstractOneDriveService {
             String requestUrl;
 
             if (nextLink != null) {
-                requestUrl = nextLink;
-            }else if ("/".equalsIgnoreCase(path)) {
+                requestUrl = URLUtil.decode(nextLink);
+            }else if ("/".equalsIgnoreCase(fullPath) || "".equalsIgnoreCase(fullPath)) {
                 requestUrl = DRIVER_ROOT_URL;
             } else {
                 requestUrl = DRIVER_ITEMS_URL;
             }
-            path = StringUtils.removeLastSeparator(path);
+            fullPath = StringUtils.removeLastSeparator(fullPath);
 
-            ResponseEntity<String> responseEntity = oneDriveRestTemplate.getForEntity(requestUrl, String.class, getGraphEndPoint(), path);
+            ResponseEntity<String> responseEntity = oneDriveRestTemplate.getForEntity(requestUrl, String.class, getGraphEndPoint(), fullPath);
             String body = responseEntity.getBody();
 
             JSONObject root = JSON.parseObject(body);

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

@@ -40,6 +40,7 @@ public class OneDriveServiceImpl extends AbstractFileService implements FileServ
                     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());
@@ -55,7 +56,7 @@ public class OneDriveServiceImpl extends AbstractFileService implements FileServ
 
     @Override
     public List<FileItemDTO> fileList(String path) {
-        return oneDriveService.list(path);
+        return oneDriveService.list(basePath, path);
     }
 
     @Override

src/main/resources/application.yml

@@ -45,7 +45,7 @@ spring:
     chain:
       gzipped: true
   profiles:
-    active: dev
+    active: prod
 zfile:
   cache:
     timeout: 300

src/main/resources/db/data.sql

@@ -51,7 +51,7 @@ INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (37, 'endPoint',
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (38, 'base-path', '基路径', 'qiniu');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (39, 'base-path', '基路径', 'aliyun');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (40, 'base-path', '基路径', 'huawei');
-INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (41, 'ftp', '基路径', 'ftp');
+INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (41, 'base-path', '基路径', 'ftp');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (42, 'accessToken', '访问令牌', 'onedrive');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (43, 'refreshToken', '刷新令牌', 'onedrive');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (44, 'accessToken', '访问令牌', 'onedrive-china');
@@ -63,4 +63,6 @@ INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (49, 'bucket-name
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (50, 'base-path', '基路径', 's3');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (51, 'domain', '加速域名', 's3');
 INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (52, 'pathStyle', '域名风格', 's3');
-INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (53, 'isPrivate', '是否是私有空间', 's3');
+INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (53, 'isPrivate', '是否是私有空间', 's3');
+INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (54, 'base-path', '基路径', 'onedrive');
+INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (55, 'base-path', '基路径', 'onedrive-china');

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.9c87dd59.css rel=prefetch><link href=/css/install.b4e8b552.css rel=prefetch><link href=/js/adminIndex.f735b8ee.js rel=prefetch><link href=/js/dplayer.acc587f7.js rel=prefetch><link href=/js/install.6a075002.js rel=prefetch><link href=/css/app.9fc46f34.css rel=preload as=style><link href=/css/chunk-vendors.25ca87c4.css rel=preload as=style><link href=/js/app.4cf356b4.js rel=preload as=script><link href=/js/chunk-vendors.9beeab56.js rel=preload as=script><link href=/css/chunk-vendors.25ca87c4.css rel=stylesheet><link href=/css/app.9fc46f34.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.9beeab56.js></script><script src=/js/app.4cf356b4.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title></title><link href=/css/adminIndex.9c87dd59.css rel=prefetch><link href=/css/install.b4e8b552.css rel=prefetch><link href=/js/adminIndex.f735b8ee.js rel=prefetch><link href=/js/dplayer.acc587f7.js rel=prefetch><link href=/js/install.6a075002.js rel=prefetch><link href=/css/app.a2e3ef88.css rel=preload as=style><link href=/css/chunk-vendors.6ed6dc12.css rel=preload as=style><link href=/js/app.9d145c66.js rel=preload as=script><link href=/js/chunk-vendors.1f42ad6f.js rel=preload as=script><link href=/css/chunk-vendors.6ed6dc12.css rel=stylesheet><link href=/css/app.a2e3ef88.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.1f42ad6f.js></script><script src=/js/app.9d145c66.js></script></body></html>