From 960810a5ca731f89902bc8eec891b0dadcffbf8f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 30 Nov 2018 14:33:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E5=A4=8D][=E4=BF=AE=E6=94=B9]:=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E6=97=A0=E5=90=8E=E7=BC=80=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/UploadController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java index 5509f3fbb..82c18f5b4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java @@ -114,7 +114,7 @@ public class UploadController extends BaseController { @PostMapping(value = "/awsFileUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("上传文件") public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq) { - logger.debug("[" + getIpAddr() + "] UploadController::awsfileUpload"); + logger.info("[" + getIpAddr() + "] UploadController::awsfileUpload"); ResultData data = new ResultData(); @@ -141,7 +141,12 @@ public class UploadController extends BaseController { .build(); String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); - fileName = getTenantId() + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + if (dot >= 0) { + fileName = getTenantId() + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + } else { + fileName = getTenantId() + "/" + fileName; + } + s3.putObject( new PutObjectRequest(awsProperty.getBucketName(), fileName, multiReq.getInputStream(), metadata)