From e8360c8be22cf009a9c3dc6e545f3036e12da14e Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 9 Sep 2018 18:32:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E8=B7=AF?= =?UTF-8?q?=E5=BE=84][=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/controller/UploadController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java index bdb965383..ed7b541d8 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java @@ -38,7 +38,7 @@ import java.util.UUID; @RestController @RequestMapping(value = "upload") @Api(description = "文件上传接口") -public class UploadController { +public class UploadController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -83,7 +83,7 @@ public class UploadController { fs.close(); data.code = ResultData.SUCCESS; Map map = new HashMap<>(); - map.put("imgarray", server + "/" + fileName); + map.put("url", server + "/" + fileName); data.data = map; } catch (Exception e) { e.printStackTrace(); @@ -146,7 +146,7 @@ public class UploadController { .build(); String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); - fileName = fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileName = getTenantId() + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); s3.putObject( new PutObjectRequest(awsProperty.getBucketName(), fileName, multiReq.getInputStream(), metadata) @@ -157,7 +157,7 @@ public class UploadController { data.code = ResultData.SUCCESS; Map map = new HashMap<>(); - map.put("imgarray", url.toString()); + map.put("url", url.toString()); data.data = map; return data; } catch (AmazonServiceException ase) {