|
|
@ -262,7 +262,17 @@ public class OssController { |
|
|
|
, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg()); |
|
|
|
} |
|
|
|
} |
|
|
|
Result<UploadImgResultDTO> result = ossService.uploadImg(file, null); |
|
|
|
Result<UploadImgResultDTO> result =null; |
|
|
|
String originFileName = file.getOriginalFilename(); |
|
|
|
String format = "-" + originFileName.substring(originFileName.lastIndexOf(".") + NumConstant.ONE) + "-"; |
|
|
|
format = format.toLowerCase(); |
|
|
|
int compressSize = 2 * 1024 * 1024; |
|
|
|
// 如果是图片,超过2M的压缩一下
|
|
|
|
if (ModuleConstant.PROJECT_FILE_IMAGE.contains(format) && file.getSize() > compressSize) {// 单个图片10M
|
|
|
|
result= ossService.compressUploadImg(file, null, 2 * 1024); |
|
|
|
} else { |
|
|
|
result=ossService.uploadImg(file, null); |
|
|
|
} |
|
|
|
if (result != null && result.success() ){ |
|
|
|
UploadImgResultDTO data = result.getData(); |
|
|
|
if ( data!= null && StringUtils.isNotBlank(data.getUrl())){ |
|
|
@ -350,7 +360,13 @@ public class OssController { |
|
|
|
if (size > maxSize) { |
|
|
|
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode(), EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg()); |
|
|
|
} |
|
|
|
|
|
|
|
// 如果是图片,超过2M的压缩一下
|
|
|
|
if (ModuleConstant.PROJECT_FILE_IMAGE.contains(format)) {//单个图片10M
|
|
|
|
int compressSize = 2 * 1024 * 1024; |
|
|
|
if(file.getSize()>compressSize){ |
|
|
|
return ossService.compressUploadImg(file, null,2 * 1024); |
|
|
|
} |
|
|
|
} |
|
|
|
return ossService.uploadVariedFile(file); |
|
|
|
} |
|
|
|
|
|
|
|