diff --git a/pom.xml b/pom.xml index 5d1218c..16f148e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.27 + 2.0.27-shuibo pom springboot-parent 杭州铁晟科技有限公司基础依赖 @@ -58,49 +58,49 @@ com.tiesheng.springboot-parent springboot-database - 2.0.27 + 2.0.27-shuibo com.tiesheng.springboot-parent springboot-login - 2.0.27 + 2.0.27-shuibo com.tiesheng.springboot-parent springboot-web - 2.0.27 + 2.0.27-shuibo com.tiesheng.springboot-parent springboot-util - 2.0.27 + 2.0.27-shuibo com.tiesheng.springboot-parent springboot-platform - 2.0.27 + 2.0.27-shuibo com.tiesheng.springboot-parent springboot-message - 2.0.27 + 2.0.27-shuibo com.tiesheng.springboot-parent springboot-role - 2.0.27 + 2.0.27-shuibo com.tiesheng.springboot-parent springboot-annotation - 2.0.27 + 2.0.27-shuibo diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml index 3a25adf..9b2ef69 100644 --- a/springboot-ademo/pom.xml +++ b/springboot-ademo/pom.xml @@ -6,11 +6,11 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.27 + 2.0.27-shuibo springboot-ademo - 2.0.27 + 2.0.27-shuibo 8 diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml index cbbab2b..02fd1ea 100644 --- a/springboot-annotation/pom.xml +++ b/springboot-annotation/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.27 + 2.0.27-shuibo springboot-annotation diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml index e53d440..812e4f0 100644 --- a/springboot-database/pom.xml +++ b/springboot-database/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.27 + 2.0.27-shuibo springboot-database diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml index 289961c..26bdfa9 100644 --- a/springboot-login/pom.xml +++ b/springboot-login/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.27 + 2.0.27-shuibo springboot-login diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml index 62aaa32..7c3f3e9 100644 --- a/springboot-message/pom.xml +++ b/springboot-message/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.27 + 2.0.27-shuibo springboot-message diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml index 2136041..5f44117 100644 --- a/springboot-platform/pom.xml +++ b/springboot-platform/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.27 + 2.0.27-shuibo springboot-platform diff --git a/springboot-role/pom.xml b/springboot-role/pom.xml index ae5b9b8..68dde05 100644 --- a/springboot-role/pom.xml +++ b/springboot-role/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.27 + 2.0.27-shuibo springboot-role diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml index ca8e39e..d933419 100644 --- a/springboot-util/pom.xml +++ b/springboot-util/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.27 + 2.0.27-shuibo springboot-util diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml index 536f3aa..fca862a 100644 --- a/springboot-web/pom.xml +++ b/springboot-web/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.27 + 2.0.27-shuibo springboot-web diff --git a/springboot-web/src/main/java/com/tiesheng/web/controller/comm/ToolController.java b/springboot-web/src/main/java/com/tiesheng/web/controller/comm/ToolController.java index 34c4a13..68e3445 100644 --- a/springboot-web/src/main/java/com/tiesheng/web/controller/comm/ToolController.java +++ b/springboot-web/src/main/java/com/tiesheng/web/controller/comm/ToolController.java @@ -122,8 +122,10 @@ public class ToolController { */ @TokenIgnore @PostMapping("/file/chunk_upload") - public ApiResp fileChunkUpload(@RequestParam("file") MultipartFile file, String fileMd5, Integer chunk) { - fileUploadService.chunkUpload(file, fileMd5, chunk); + public ApiResp fileChunkUpload(@RequestParam("file") MultipartFile file, + String fileMd5, Integer chunk, + String flowFilename) { + fileUploadService.chunkUpload(file, fileMd5, chunk, flowFilename); return ApiResp.respOK(""); } @@ -211,7 +213,8 @@ public class ToolController { /////////////////////////////////////////////////////////////////////////// // export - /////////////////////////////////////////////////////////////////////////// + + /// //////////////////////////////////////////////////////////////////////// @TokenIgnore @OperationIgnore diff --git a/springboot-web/src/main/java/com/tiesheng/web/service/FileUploadService.java b/springboot-web/src/main/java/com/tiesheng/web/service/FileUploadService.java index 16a9dab..7805f0a 100644 --- a/springboot-web/src/main/java/com/tiesheng/web/service/FileUploadService.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/FileUploadService.java @@ -92,11 +92,14 @@ public class FileUploadService { * @param fileMd5 * @param chunk */ - public void chunkUpload(MultipartFile file, String fileMd5, Integer chunk) { + public void chunkUpload(MultipartFile file, String fileMd5, Integer chunk, String flowFilename) { if (file == null) { throw new ApiException("请选择文件后上传"); } + String fileType = FileUtil.extName(flowFilename); + tieshengWebConfigurer.uploadFileCheck(fileType); + try { // 块文件 FileUploadPath folder = FileUploadPath.folder(fileMd5);