From ac4cef098072e0cf8aaaffd7305b941c1e0a7be9 Mon Sep 17 00:00:00 2001
From: zhaojun1998 <root@zhaojun.im>
Date: Thu, 25 Jun 2020 17:51:35 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE=E9=A1=B9,=20?=
 =?UTF-8?q?=E4=BB=A5=E8=87=AA=E5=AE=9A=E4=B9=89=20'=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6',=20'=E6=95=B0=E6=8D=AE=E6=96=87=E4=BB=B6',?=
 =?UTF-8?q?=20'=E4=B8=B4=E6=97=B6=E6=96=87=E4=BB=B6'=20=E7=9A=84=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zfile/model/constant/ZFileConstant.java       | 15 ++++++++++++---
 .../java/im/zhaojun/zfile/util/AudioUtil.java     |  4 +++-
 .../additional-spring-configuration-metadata.json | 15 +++++++++++++++
 src/main/resources/application.yml                | 10 ++++++++--
 src/main/resources/logback-spring.xml             |  4 +++-
 5 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/main/java/im/zhaojun/zfile/model/constant/ZFileConstant.java b/src/main/java/im/zhaojun/zfile/model/constant/ZFileConstant.java
index db02ae1..888a223 100644
--- a/src/main/java/im/zhaojun/zfile/model/constant/ZFileConstant.java
+++ b/src/main/java/im/zhaojun/zfile/model/constant/ZFileConstant.java
@@ -12,12 +12,16 @@ 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 final Character PATH_SEPARATOR_CHAR = '/';
 
     public static final String PATH_SEPARATOR = "/";
 
+
+    /**
+     * 系统产生的临时文件路径
+     */
+    public static String TMP_FILE_PATH = "/.zfile/tmp2/";
+
     /**
      * 页面文档文件
      */
@@ -38,6 +42,11 @@ public class ZFileConstant {
      */
     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) {
@@ -60,4 +69,4 @@ public class ZFileConstant {
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/im/zhaojun/zfile/util/AudioUtil.java b/src/main/java/im/zhaojun/zfile/util/AudioUtil.java
index c67b087..0a17934 100644
--- a/src/main/java/im/zhaojun/zfile/util/AudioUtil.java
+++ b/src/main/java/im/zhaojun/zfile/util/AudioUtil.java
@@ -41,7 +41,9 @@ public class AudioUtil {
             return AudioInfoDTO.buildDefaultAudioInfoDTO();
         }
 
-        File file = new File(ZFileConstant.USER_HOME + ZFileConstant.AUDIO_TMP_PATH + UUID.fastUUID());
+        String fullFilePath = StringUtils.removeDuplicateSeparator(ZFileConstant.TMP_FILE_PATH + ZFileConstant.PATH_SEPARATOR + UUID.fastUUID());
+
+        File file = new File(fullFilePath);
         FileUtil.mkParentDirs(file);
         HttpUtil.downloadFile(url, file);
         AudioInfoDTO audioInfoDTO = parseAudioInfo(file);
diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index d6ddbf4..580f180 100644
--- a/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -71,6 +71,21 @@
             "name": "zfile.preview.text.maxFileSizeKb",
             "type": "java.lang.Long",
             "description": "允许在线读取文本文件的文件大小, 单位为 KB."
+        },
+        {
+            "name": "zfile.log.path",
+            "type": "java.lang.String",
+            "description": "日志文件路径."
+        },
+        {
+            "name": "zfile.db.path",
+            "type": "java.lang.String",
+            "description": "数据库文件路径."
+        },
+        {
+            "name": "zfile.tmp.path",
+            "type": "java.lang.String",
+            "description": "临时文件路径."
         }
     ]
 }
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fc6c998..a6f9c5d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -24,7 +24,7 @@ spring:
 
     # h2 内存数据库 配置
     driver-class-name: org.h2.Driver
-    url: jdbc:h2:~/.zfile-new/db/zfile
+    url: jdbc:h2:${zfile.db.path}
     username: zfile
     password: 123456
 
@@ -50,6 +50,12 @@ spring:
     active: prod
 
 zfile:
+  log:
+    path: ${user.home}/.zfile/logs
+  db:
+    path: ${user.home}/.zfile/db/zfile
+  tmp:
+    path: ${user.home}/.zfile/tmp
   cache:
     auto-refresh:
       interval: 1
@@ -71,4 +77,4 @@ zfile:
     clientId: 4a72d927-1907-488d-9eb2-1b465c53c1c5
     clientSecret: Y9CEA=82da5n-y_]KAWAgLH3?R9xf7Uw
     redirectUri: https://zfile.jun6.net/onedrive/china-callback
-    scope: offline_access User.Read Files.ReadWrite.All
+    scope: offline_access User.Read Files.ReadWrite.All
\ No newline at end of file
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index b15027e..00fe757 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -14,7 +14,9 @@
                     converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
 
     <!-- 定义日志的根目录 -->
-    <property name="LOG_HOME" value="${user.home}/.zfile/logs"/>
+    <property resource="application.yml"/>
+    <springProperty scope="context" name="LOG_HOME" source="zfile.log.path"/>
+
     <!-- 定义日志文件名称 -->
     <property name="appName" value="zfile"/>