From 23d008dda3bf9d93492ad0850eab1cb0d68b567f Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Wed, 31 May 2023 11:45:53 +0800 Subject: [PATCH] =?UTF-8?q?#20230529=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UploadController.java | 4 ++-- .../bean/MultipartConfig.java | 0 .../xymanager_common/util/UploadUtils.java | 2 +- .../impl/UploadServiceImpl.java | 19 +++++++++---------- .../service/UploadService.java | 5 +++-- 5 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/bean/MultipartConfig.java diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UploadController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UploadController.java index 2a5853d..e904419 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UploadController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UploadController.java @@ -36,8 +36,8 @@ public class UploadController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/uploadApk") @Log(title = "上传APK", type = "新增") - public ResponseReult issueApk(@RequestBody TerminalUploadVo vo) { - ServiceBody serviceBody = uploadService.upload(vo); + public ResponseReult issueApk(@RequestParam("file")MultipartFile file,@RequestParam("version")String version) { + ServiceBody serviceBody = uploadService.upload(file,version); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/MultipartConfig.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/MultipartConfig.java new file mode 100644 index 0000000..e69de29 diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/UploadUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/UploadUtils.java index ced9412..f08ed86 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/UploadUtils.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/UploadUtils.java @@ -2,6 +2,7 @@ package com.shxy.xymanager_common.util; import com.shxy.xymanager_common.util.spring.SpringUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.web.multipart.MultipartFile; @@ -24,7 +25,6 @@ public class UploadUtils public static String upload(MultipartFile file,String path) throws IOException { String fileName = file.getOriginalFilename(); String newName = UUID.randomUUID().toString()+fileName.substring(fileName.indexOf(".")); - File saveFile = new File(path+newName); if(!saveFile.getParentFile().exists()){ saveFile.getParentFile().mkdirs(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UploadServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UploadServiceImpl.java index d0920ec..19bffd9 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UploadServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UploadServiceImpl.java @@ -54,15 +54,15 @@ public class UploadServiceImpl implements UploadService { /** * 上传文件 * - * @param vo + * @param file,version * @return */ @Override - public ServiceBody upload(TerminalUploadVo vo) { - String fileName = vo.getFile().getOriginalFilename(); + public ServiceBody upload(MultipartFile file, String version) { + String fileName = file.getOriginalFilename(); try { - path = UploadUtils.upload(vo.getFile(), path); - TerminalUpload upload = new TerminalUpload(path, fileName,vo.getVersion()); + path = UploadUtils.upload(file, path); + TerminalUpload upload = new TerminalUpload(path, fileName, version); uploadDao.insert(upload); } catch (IOException e) { log.info("upload.exception", e); @@ -96,14 +96,13 @@ public class UploadServiceImpl implements UploadService { public ServiceBody issueApk(TerminalApkVo vo) { Cma cma = new Cma(server, port); - vo.getCmdid().stream().forEach(var -> { - cma.upgrade(var, vo.getPath()); - }); + vo.getCmdid().stream().forEach(var -> { + cma.upgrade(var, vo.getPath()); + }); - return Asserts.success(true); + return Asserts.success(true); } - } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UploadService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UploadService.java index 1330e3a..2f1ff22 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UploadService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UploadService.java @@ -5,6 +5,7 @@ import com.shxy.xymanager_common.model.TerminalApkInfoListModel; import com.shxy.xymanager_common.vo.PageVo; import com.shxy.xymanager_common.vo.TerminalApkVo; import com.shxy.xymanager_common.vo.TerminalUploadVo; +import org.springframework.web.multipart.MultipartFile; /** * @@ -14,11 +15,11 @@ import com.shxy.xymanager_common.vo.TerminalUploadVo; public interface UploadService { /** - * 获取所有通道树状列表 + * 上传文件 * * @return */ - ServiceBody upload(TerminalUploadVo vo); + ServiceBody upload(MultipartFile file,String version); /** * 查询APK列表