tieshengkeji/tiesheng-springboot
1
1
Fork 0
Code Pull Requests Actions Packages Releases Activity

perf：文件上传保留后缀

Browse Source
This commit is contained in:
曾文豪
2023-01-12 11:58:23 +08:00
parent ebb99ced78
commit 2e8969f249
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
springboot-web/src/main/java/com/tiesheng/core/controller/ToolController.java
View File

@@ -108,8 +108,8 @@ public class ToolController {
*/ */
@TokenIgnore @TokenIgnore
@PostMapping("/file/chunk_merge") @PostMapping("/file/chunk_merge")
public ApiResp<String> fileChunkMerge(String fileMd5) { public ApiResp<String> fileChunkMerge(String fileMd5, String fileExt) {
String path = fileUploadService.chunkMerge(fileMd5); String path = fileUploadService.chunkMerge(fileMd5, fileExt);
return ApiResp.respOK(path); return ApiResp.respOK(path);
} }

6
springboot-web/src/main/java/com/tiesheng/core/service/FileUploadService.java
View File

@@ -40,7 +40,7 @@ public class FileUploadService {
String fileType = FileTypeUtil.getType(file.getInputStream(), file.getOriginalFilename()); String fileType = FileTypeUtil.getType(file.getInputStream(), file.getOriginalFilename());
tieshengWebConfigurer.uploadFileCheck(fileType); tieshengWebConfigurer.uploadFileCheck(fileType);
FileUploadPath filePath = FileUploadPath.random(); FileUploadPath filePath = FileUploadPath.random(fileType);
InputStream stream = file.getInputStream(); InputStream stream = file.getInputStream();
FileUtil.writeFromStream(stream, filePath.getAbsolutePath()); FileUtil.writeFromStream(stream, filePath.getAbsolutePath());
@@ -107,7 +107,7 @@ public class FileUploadService {
* *
* @param fileMd5 * @param fileMd5
*/ */
public String chunkMerge(String fileMd5) { public String chunkMerge(String fileMd5, String fileExt) {
// 1，获取文件块的目录 // 1，获取文件块的目录
FileUploadPath folder = FileUploadPath.folder(fileMd5); FileUploadPath folder = FileUploadPath.folder(fileMd5);
@@ -118,7 +118,7 @@ public class FileUploadService {
} }
// 3，生成保存文件的路径 // 3，生成保存文件的路径
FileUploadPath uploadPath = FileUploadPath.random(); FileUploadPath uploadPath = FileUploadPath.random(fileExt);
// 4，获取块文件，此列表是已经排好序的列表 // 4，获取块文件，此列表是已经排好序的列表
List<File> chunkFiles = getSortedChunkFiles(new File(folder.getAbsolutePath())); List<File> chunkFiles = getSortedChunkFiles(new File(folder.getAbsolutePath()));