异常处理机制修改

src/main/java/com/uas/eis/core/support/LoginInterceptor.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.uas.eis.entity.ErrorMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
@@ -41,12 +42,12 @@ public class LoginInterceptor implements HandlerInterceptor{
 	
 	private Claims parseToken(String token) {
 		if(token == null || token.isEmpty()) {
-			BaseUtil.showError("缺失token", "NULL_TOKEN");
+			BaseUtil.showError(ErrorMsg.NULL_TOKEN);
 			return null;
 		}
 		Claims claims = TokenHandler.parseToken(token);
 		if(claims == null) {
-			BaseUtil.showError("无效的token", "INVALID_TOKEN");
+			BaseUtil.showError(ErrorMsg.INVALID_TOKEN);
 			return null;
 		}
 		Date now = new Date();
@@ -56,7 +57,7 @@ public class LoginInterceptor implements HandlerInterceptor{
 		if (now.after(start) && now.before(end)) {
 			return claims;
 		}else {
-			BaseUtil.showError("已过期的token", "OVERDUE_TOKEN");
+			BaseUtil.showError(ErrorMsg.EXPIRED_TOKEN);
 			return null;
 		}
 	}
@@ -67,7 +68,7 @@ public class LoginInterceptor implements HandlerInterceptor{
 			enable = userService.checkUser(username, password);
 		}
 		if(!enable) {
-			BaseUtil.showError("无效用户", "INVALID_USER");
+			BaseUtil.showError(ErrorMsg.INVALID_USER);
 		}
 		return enable;
 	}
@@ -75,7 +76,7 @@ public class LoginInterceptor implements HandlerInterceptor{
 	private boolean checkActionAccess(String username, String action) {
 		boolean enable = userService.checkAction(username, action);
 		if(!enable) {
-			BaseUtil.showError("受限的接口请求", "PERMISSION_DENIED_ACTION");
+			BaseUtil.showError(ErrorMsg.PERMISSION_DENIED_REQUEST);
 		}
 		return enable;
 	}

src/main/java/com/uas/eis/entity/ErrorMsg.java

@@ -0,0 +1,47 @@
+package com.uas.eis.entity;
+
+/**
+ * Created by luhg on 2018/4/20.
+ * 异常处理返回信息
+ */
+public enum ErrorMsg {
+    NULL_TOKEN(10001,"token not found","缺失token"),
+    INVALID_TOKEN(10002,"invalid token","无效的token"),
+    EXPIRED_TOKEN(10003,"expired token","token已过期"),
+    INVALID_USER(10003,"invalid user","无效用户"),
+    PERMISSION_DENIED_REQUEST(10004,"request permission denied","受限的接口请求");
+
+    private int errCode;
+    private String errMsg;
+    private String errDesc;
+
+    ErrorMsg(int  errCode,String errMsg,String errDesc){
+        this.errCode = errCode;
+        this.errMsg = errMsg;
+        this.errDesc = errDesc;
+    }
+
+    public int getErrCode() {
+        return errCode;
+    }
+
+    public void setErrCode(int errCode) {
+        this.errCode = errCode;
+    }
+
+    public String getErrMsg() {
+        return errMsg;
+    }
+
+    public void setErrMsg(String errMsg) {
+        this.errMsg = errMsg;
+    }
+
+    public String getErrDesc() {
+        return errDesc;
+    }
+
+    public void setErrDesc(String errDesc) {
+        this.errDesc = errDesc;
+    }
+}

src/main/java/com/uas/eis/exception/ExceptionHandlerAdvice.java

@@ -2,6 +2,7 @@ package com.uas.eis.exception;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.uas.eis.entity.ErrorMsg;
 import org.apache.log4j.Logger;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
@@ -47,10 +48,13 @@ public class ExceptionHandlerAdvice {
 	@ResponseBody
 	public ModelMap handleSystemError(SystemException ex, HttpServletRequest request) {
 		ModelMap map = new ModelMap();
-		map.put("exceptionCode", ex.getErrorCode());
-		map.put("exceptionInfo", ex.getMessage());
+		ErrorMsg errorMsg = ex.getErrorMsg();
+		map.put("errCode", errorMsg.getErrCode());
+		map.put("errMsg", errorMsg.getErrMsg());
+		map.put("errDesc",errorMsg.getErrDesc());
 		return map;
 	}
 
+
 	
 }

src/main/java/com/uas/eis/exception/SystemException.java

@@ -1,5 +1,7 @@
 package com.uas.eis.exception;
 
+import com.uas.eis.entity.ErrorMsg;
+
 /**
  * 系统程序执行异常
  * 
@@ -13,7 +15,7 @@ public class SystemException extends RuntimeException {
 	 */
 	private static final long serialVersionUID = 4218425517031998401L;
 	
-	private String errorCode;
+	private ErrorMsg errorMsg;
 
 	public SystemException() {
 	}
@@ -22,25 +24,25 @@ public class SystemException extends RuntimeException {
 		super(paramString);
 	}
 	
-	public SystemException(String paramString, String errorCode) {
-		super(paramString);
-		this.errorCode = errorCode;
+	public SystemException(ErrorMsg errorMsg) {
+		super(errorMsg.getErrDesc());
+		this.errorMsg = errorMsg;
 	}
 
-	public SystemException(String paramString, String errorCode, Throwable paramThrowable) {
-		super(paramString, paramThrowable);
-		this.errorCode = errorCode;
+	public SystemException(ErrorMsg errorMsg, Throwable paramThrowable) {
+		super(errorMsg.getErrDesc(), paramThrowable);
+		this.errorMsg = errorMsg;
 	}
 
 	public SystemException(Throwable paramThrowable) {
 		super(paramThrowable);
 	}
-	
-	public String getErrorCode() {
-		return this.errorCode;
+
+	public ErrorMsg getErrorMsg() {
+		return errorMsg;
 	}
-	
-	public void setErrorCode(String errorCode) {
-		this.errorCode = errorCode;
+
+	public void setErrorMsg(ErrorMsg errorMsg) {
+		this.errorMsg = errorMsg;
 	}
 }

src/main/java/com/uas/eis/utils/BaseUtil.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.uas.eis.entity.ErrorMsg;
 import net.sf.json.JSONArray;
 import net.sf.json.util.JSONUtils;
 
@@ -30,12 +31,13 @@ public class BaseUtil {
 		if (error != null && error.length() > 0)
 			throw new SystemException(error);
 	}
-	
-	public static void showError(String error, String errorCode) {
-		if (error != null && error.length() > 0)
-			throw new SystemException(error, errorCode);
+
+	public static void showError(ErrorMsg errorMsg) {
+		if(errorMsg!=null){
+			throw new SystemException(errorMsg);
+		}
 	}
-	
+
 	/**
 	 * List集合转化成字符串, null和空字符自动去掉
 	 *