diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 22fb44aa7..2d63b7e0d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -2,6 +2,7 @@ package com.iformall.controller.sys; import com.amazonaws.services.s3.model.*; import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.service.QrCodeService; @@ -78,7 +79,11 @@ public class UploadController extends BaseController { @SystemControllerLog(description = "上传图片") public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::awsImgUpload"); - + long size = multiReq.getSize(); + final long length = 2097152; + if (size > length) { + return new ResultData(ErrorCode.PICTURE_SIZE_EXCEED); + } String fileName = UUID.randomUUID().toString(); String tempFileName = fileName; String fileFormat = ""; @@ -124,7 +129,7 @@ public class UploadController extends BaseController { } else { ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); + metadata.setContentLength(size); ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantId()); return data; } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index c2510352d..bc029f63e 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -451,6 +451,13 @@ public enum ErrorCode{ ACTIVITY_JOIN_TIME_END(30003, "活动报名时间已结束"), ACTIVITY_SEND_ERROR(30004, "活动投放到宣传页失败,宣传页显示已达七条上限!"), ACTIVITY_TIME_ERROR(30005, "活动报名结束时间不能大于活动结束时间"), + + /** + * 文件上传 + */ + PICTURE_SIZE_EXCEED(40001, "图片超过2M限制"), + + ; private int code;