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"/> - + + +