From a1b7c071a1e81094f61ffdf47a5e31c6b74e3f97 Mon Sep 17 00:00:00 2001 From: zhenghuang <236220500@qq.com> Date: Wed, 3 Jun 2020 17:34:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8,=E6=AC=A2=E8=BF=8E?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic/activity/controller/FileController.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/activity/controller/FileController.java b/src/main/java/com/kiisoo/ic/activity/controller/FileController.java index f7ca9c0..3c4303c 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/FileController.java +++ b/src/main/java/com/kiisoo/ic/activity/controller/FileController.java @@ -32,8 +32,7 @@ public class FileController extends BaseController { @ApiOperation(value = "上传文件") @PostMapping(value = "/upload") - public Map upload(@RequestParam(value = "file", required = false) MultipartFile file) throws WxErrorException { - WxCpServiceOkHttpImpl serviceOkHttp = WxCpConfiguration.getCpService(WxCpConfiguration.APPLICATIONID); + public Map upload(@RequestParam(value = "file", required = false) MultipartFile file, String needMediaId) throws WxErrorException { if (file == null) return fail(); String fileName = file.getOriginalFilename(); if (fileName == null) return fail(); @@ -51,12 +50,15 @@ public class FileController extends BaseController { log.error("上传出错", e); return fail(); } - WxMediaUploadResult result = serviceOkHttp.getMediaService().upload("image", new File(uploadPath + fileName)); - log.info("上传成功: {}", result); Map ret = new HashMap<>(); - ret.put("mediaId", result.getMediaId()); + if(needMediaId != null) { + WxCpServiceOkHttpImpl serviceOkHttp = WxCpConfiguration.getCpService(WxCpConfiguration.APPLICATIONID); + WxMediaUploadResult result = serviceOkHttp.getMediaService().upload("image", new File(uploadPath + fileName)); + log.info("上传成功: {}", result); + ret.put("mediaId", result.getMediaId()); + } ret.put("localPath", "/upload/" + fileName); - return data("/upload/" + fileName); + return data(ret); } private String renameToUUID(String filename) {