From 570d49b6b4507d5c20572ab5dcef660344b14892 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 6 Jul 2022 15:09:26 +0800
Subject: [PATCH] =?UTF-8?q?/file/article/upload=E8=B6=85=E8=BF=872M?=
 =?UTF-8?q?=E7=9A=84=E5=8E=8B=E7=BC=A9=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/OssController.java  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
index 9f9994f148..8946e7e73a 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
@@ -254,13 +254,6 @@ public class OssController {
 				throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode()
 						, 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;
 		String originFileName = file.getOriginalFilename();
@@ -268,7 +261,8 @@ public class OssController {
 		format = format.toLowerCase();
 		int compressSize = 2 * 1024 * 1024;
 		// 如果是图片，超过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);
 		} else {
 			result=ossService.uploadImg(file, null);