diff --git a/src/main/java/cn/somkit/fmt/action/DownloadAction.java b/src/main/java/cn/somkit/fmt/action/DownloadAction.java index 9556cf9..c685809 100644 --- a/src/main/java/cn/somkit/fmt/action/DownloadAction.java +++ b/src/main/java/cn/somkit/fmt/action/DownloadAction.java @@ -125,13 +125,9 @@ public class DownloadAction { public Map packZip(String filenames) throws Exception{ try { PathUtils.directory(FmtConfig.Upload_File_Path); - //临时文件目录 - String temp = "temp"; - String zipPath = FmtConfig.Upload_File_Path + File.separator + temp; - File zipFile = new File(zipPath); - if (!zipFile.exists()) zipFile.mkdirs(); + PathUtils.directory(FmtConfig.Temp_File_Path); String zipName = String.valueOf(System.currentTimeMillis()); - String zipDir = zipPath + File.separator + zipName + ".zip"; + String zipDir = FmtConfig.Temp_File_Path + File.separator + zipName + ".zip"; ZipOutputStream out = new ZipOutputStream(new FileOutputStream(zipDir)); File folder = new File(FmtConfig.Upload_File_Path); File[] listOfFiles = folder.listFiles(); diff --git a/src/main/java/cn/somkit/fmt/config/FmtConfig.java b/src/main/java/cn/somkit/fmt/config/FmtConfig.java index 3a1a70a..54c8778 100644 --- a/src/main/java/cn/somkit/fmt/config/FmtConfig.java +++ b/src/main/java/cn/somkit/fmt/config/FmtConfig.java @@ -15,6 +15,8 @@ public class FmtConfig { public static String Upload_File_Path = "./data/files"; + public static String Temp_File_Path = "./data/files/temp"; + @Value("${somkit.upload.path}") public void setUpload_File_Path(String upload_file_path) { if(StringUtils.hasText(upload_file_path)){ @@ -25,4 +27,15 @@ public class FmtConfig { Upload_File_Path = upload_file_path; } } + + @Value("${somkit.upload.temp-path}") + public void setTemp_File_Path(String temp_file_path) { + if(StringUtils.hasText(temp_file_path)){ + //如果使用相对路径,转换为绝对路径 + if(temp_file_path.startsWith("./")){ + temp_file_path = PathUtils.resolve(temp_file_path); + } + Temp_File_Path = temp_file_path; + } + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7402e7b..e546413 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -19,6 +19,7 @@ spring: somkit: upload: path: ./data/files #上传文件路径 可以使用绝对路径,也可使用相对路径 + temp-path: ./data/files/temp #临时文件存放地址 可以使用绝对路径,也可使用相对路径 cache: rocks-db: path: ./cache/rocksdb # RocksDB缓存路径 可以使用绝对路径,也可使用相对路径 diff --git a/版本记录/readme.md b/版本记录/readme.md index cc89a6a..ae85579 100644 --- a/版本记录/readme.md +++ b/版本记录/readme.md @@ -21,4 +21,5 @@ ``` 修改RocksDB文件目录配置,使其支持使用相对路径 修改上传文件目录配置,使其支持使用相对路径 + 新增临时文件存放地址配置,支持相对路径 ``` \ No newline at end of file