Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 2 years ago
parent
commit
abe7c7dfaa

+ 1 - 1
src/main/java/com/goafanti/common/controller/BaseApiController.java

@@ -86,7 +86,7 @@ public class BaseApiController extends BaseController {
 				fileName = FileUtils.orderFileName(mf,id,path,sign);
 				File file=toFile(fileName);
 				mf.transferTo(file);
-//				fileName=compressFile(file,fileName);
+				fileName=compressFile(file,fileName);
 				LoggerUtils.debug(getClass(), fileName + " 文件上传成功");
 			} catch (Exception e) {
 				LoggerUtils.error(getClass(), "文件上传失败", e);

+ 19 - 14
src/main/java/com/goafanti/common/error/SystemExceptionResolver.java

@@ -1,22 +1,21 @@
 package com.goafanti.common.error;
 
-import java.text.MessageFormat;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.shiro.filter.ShiroFilterUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.support.ResourcePropertySource;
+import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
 
-import com.goafanti.common.bo.Error;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.core.shiro.filter.ShiroFilterUtils;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.MessageFormat;
 
 public class SystemExceptionResolver extends SimpleMappingExceptionResolver{
 	@Resource(name = "errorResource")
@@ -50,7 +49,7 @@ public class SystemExceptionResolver extends SimpleMappingExceptionResolver{
 				return getModelAndView(viewName, ex, request);
 			} else {// JSON
 				Result res = new Result();
-				res.getError().add(new Error(viewName,ex.getMessage())); 
+				res.getError().add(new Error(viewName,ex.getMessage()));
 				shiroFilterUtils.out(response, res);
 				return null;
 			}
@@ -81,7 +80,13 @@ public class SystemExceptionResolver extends SimpleMappingExceptionResolver{
 				message = errorResource.getProperty(ex.getClass().getName());
 			}
 			error = new Error((String) message);
-		} else {
+		}else if (ex instanceof MaxUploadSizeExceededException) {
+			Object message = errorResource.getProperty(ex.getMessage());
+			if (message == null) {
+				message = errorResource.getProperty(ex.getClass().getName());
+			}
+			error = new Error((String) message);
+		}else {
 			error = new Error((String) errorResource.getProperty(ex.getClass().getName()));
 			LoggerUtils.fmtError(getClass(), ex, "系统异常。",ex.getClass().getName());
 		}
@@ -98,5 +103,5 @@ public class SystemExceptionResolver extends SimpleMappingExceptionResolver{
 	public void setErrorResource(ResourcePropertySource errorResource) {
 		this.errorResource = errorResource;
 	}
-	
+
 }

+ 1 - 0
src/main/resources/props/error.properties

@@ -6,6 +6,7 @@ org.apache.shiro.authc.ExcessiveAttemptsException=\u5C1D\u8BD5\u6B21\u6570\u8FC7
 org.apache.shiro.session.ExpiredSessionException=\u767B\u5F55\u4FE1\u606F\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u3002
 org.springframework.dao.DataIntegrityViolationException=\u6570\u636E\u5F02\u5E38\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6216\u7A0D\u540E\u518D\u8BD5\u3002
 org.springframework.jdbc.BadSqlGrammarException=\u6570\u636E\u5F02\u5E38\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6216\u7A0D\u540E\u518D\u8BD5\u3002
+org.springframework.web.multipart.MaxUploadSizeExceededException=\u4E0A\u4F20\u9644\u4EF6\u8D85\u51FA\u9650\u5236\u3002
 java.text.ParseException=\u53C2\u6570\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u6838\u5BF9\u8F93\u5165\u6570\u636E\u540E\u518D\u8BD5\u3002
 java.lang.IllegalArgumentException=\u53C2\u6570\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u6838\u5BF9\u8F93\u5165\u6570\u636E\u540E\u518D\u8BD5\u3002
 com.alibaba.fastjson.JSONException=\u53C2\u6570\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u6838\u5BF9\u8F93\u5165\u6570\u636E\u540E\u518D\u8BD5\u3002