|
@ -254,13 +254,6 @@ public class OssController { |
|
|
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode() |
|
|
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode() |
|
|
, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg()); |
|
|
, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg()); |
|
|
} |
|
|
} |
|
|
} else { |
|
|
|
|
|
// 校验文件大小,不超过2m
|
|
|
|
|
|
long maxSize = 2 * 1024 * 1024; |
|
|
|
|
|
if (size > maxSize) { |
|
|
|
|
|
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode() |
|
|
|
|
|
, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
Result<UploadImgResultDTO> result =null; |
|
|
Result<UploadImgResultDTO> result =null; |
|
|
String originFileName = file.getOriginalFilename(); |
|
|
String originFileName = file.getOriginalFilename(); |
|
@ -268,7 +261,8 @@ public class OssController { |
|
|
format = format.toLowerCase(); |
|
|
format = format.toLowerCase(); |
|
|
int compressSize = 2 * 1024 * 1024; |
|
|
int compressSize = 2 * 1024 * 1024; |
|
|
// 如果是图片,超过2M的压缩一下
|
|
|
// 如果是图片,超过2M的压缩一下
|
|
|
if (ModuleConstant.PROJECT_FILE_IMAGE.contains(format) && file.getSize() > compressSize) {// 单个图片10M
|
|
|
if (ModuleConstant.PROJECT_FILE_IMAGE.contains(format) && file.getSize() > compressSize) { |
|
|
|
|
|
// 单个图片10M
|
|
|
result= ossService.compressUploadImg(file, null, 2 * 1024); |
|
|
result= ossService.compressUploadImg(file, null, 2 * 1024); |
|
|
} else { |
|
|
} else { |
|
|
result=ossService.uploadImg(file, null); |
|
|
result=ossService.uploadImg(file, null); |
|
|