Skip to content

C
chnmuseum-party
Commit a1920070 authored by liqin's avatar liqin 💬
Browse files
Options

bug fixed

parent d2d01176
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 251 deletions
src/main/java/cn/wisenergy/chnmuseum/party/common/mvc/GlobalExceptionAdvisor.java
View file @ a1920070
...@@ -33,7 +33,7 @@ import java.util.stream.Collectors; ...@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
/** /**
* 全局异常处理 * 全局异常处理
* *
* @author mxy * @author Danny Lee
* @date 2019/8/1 * @date 2019/8/1
*/ */
@Slf4j @Slf4j
...@@ -49,7 +49,7 @@ public class GlobalExceptionAdvisor { ...@@ -49,7 +49,7 @@ public class GlobalExceptionAdvisor {
public Object handleException(Exception exception) { public Object handleException(Exception exception) {
log.error("\r\n ************** 操作出现异常：{}", ExceptionUtils.getStackTrace(exception)); log.error("\r\n ************** 操作出现异常：{}", ExceptionUtils.getStackTrace(exception));
Class<?> eClass = exception.getClass(); Class<?> eClass = exception.getClass();
HttpResult httpResult = new HttpResult(); cn.wisenergy.chnmuseum.party.common.validator.HttpResult httpResult = new cn.wisenergy.chnmuseum.party.common.validator.HttpResult();
if (eClass.equals(HttpRequestMethodNotSupportedException.class)) { if (eClass.equals(HttpRequestMethodNotSupportedException.class)) {
addResCodeToMap(RESPONSE_CODE_ENUM.METHOD_NOT_SUPPORTED, httpResult); addResCodeToMap(RESPONSE_CODE_ENUM.METHOD_NOT_SUPPORTED, httpResult);
} else if (eClass.equals(HttpMediaTypeNotAcceptableException.class)) { } else if (eClass.equals(HttpMediaTypeNotAcceptableException.class)) {
...@@ -68,19 +68,19 @@ public class GlobalExceptionAdvisor { ...@@ -68,19 +68,19 @@ public class GlobalExceptionAdvisor {
@ExceptionHandler(BindException.class) @ExceptionHandler(BindException.class)
@ResponseBody @ResponseBody
public HttpResult handle(BindException ex) { public cn.wisenergy.chnmuseum.party.common.validator.HttpResult handle(BindException ex) {
String message = ex.getBindingResult().getAllErrors().stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.joining(" \n ")); String message = ex.getBindingResult().getAllErrors().stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.joining(" \n "));
// BindingResult bindingResult = ex.getBindingResult(); // BindingResult bindingResult = ex.getBindingResult();
// StringBuilder errMsg = new StringBuilder(bindingResult.getFieldErrors().size() * 16); // StringBuilder errMsg = new StringBuilder(bindingResult.getFieldErrors().size() * 16);
// errMsg.append("Invalid request:"); // errMsg.append("Invalid request:");
// for (int i = 0; i < bindingResult.getFieldErrors().size(); i++) { // for (int i = 0; i < bindingResult.getFieldErrors().size(); i++) {
// if (i > 0) { // if (i > 0) {
// errMsg.append(","); // errMsg.append(",");
// } // }
// FieldError error = bindingResult.getFieldErrors().get(i); // FieldError error = bindingResult.getFieldErrors().get(i);
// errMsg.append(error.getField()).append(":").append(error.getDefaultMessage()); // errMsg.append(error.getField()).append(":").append(error.getDefaultMessage());
// } // }
return new HttpResult(400, message); return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, message);
//throw new InterfaceException(RESPONSE_CODE_ENUM.PARAM_NOT_VALID.getCode(), errMsg.toString()); //throw new InterfaceException(RESPONSE_CODE_ENUM.PARAM_NOT_VALID.getCode(), errMsg.toString());
} }
...@@ -98,7 +98,7 @@ public class GlobalExceptionAdvisor { ...@@ -98,7 +98,7 @@ public class GlobalExceptionAdvisor {
* @return 错误信息 * @return 错误信息
*/ */
@ExceptionHandler(MethodArgumentNotValidException.class) @ExceptionHandler(MethodArgumentNotValidException.class)
public HttpResult validationBodyException(MethodArgumentNotValidException exception) { public cn.wisenergy.chnmuseum.party.common.validator.HttpResult validationBodyException(MethodArgumentNotValidException exception) {
BindingResult result = exception.getBindingResult(); BindingResult result = exception.getBindingResult();
String msg = null; String msg = null;
if (result.hasErrors()) { if (result.hasErrors()) {
...@@ -112,40 +112,40 @@ public class GlobalExceptionAdvisor { ...@@ -112,40 +112,40 @@ public class GlobalExceptionAdvisor {
} }
} }
} }
return new HttpResult(400, msg); return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, msg);
} }
@ExceptionHandler(DataAccessException.class) @ExceptionHandler(DataAccessException.class)
public HttpResult dataAccessException(DataAccessException exception) { public cn.wisenergy.chnmuseum.party.common.validator.HttpResult dataAccessException(DataAccessException exception) {
return new HttpResult(400, exception.getLocalizedMessage()); return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, exception.getLocalizedMessage());
} }
@ExceptionHandler(DuplicateKeyException.class) @ExceptionHandler(DuplicateKeyException.class)
@ResponseBody @ResponseBody
public HttpResult duplicateKeyException(DuplicateKeyException e) { public cn.wisenergy.chnmuseum.party.common.validator.HttpResult duplicateKeyException(DuplicateKeyException e) {
String localizedMessage = e.getLocalizedMessage(); String localizedMessage = e.getLocalizedMessage();
String message = Splitter.on(System.lineSeparator()).trimResults().splitToList(localizedMessage).get(1); String message = Splitter.on(System.lineSeparator()).trimResults().splitToList(localizedMessage).get(1);
String substring = message.substring(message.indexOf("Exception:")); String substring = message.substring(message.indexOf("Exception:"));
if (substring.toUpperCase().contains("NAME")) { if (substring.toUpperCase().contains("NAME")) {
return new HttpResult(400, "名称已存在"); return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, "名称已存在");
} else if (substring.toUpperCase().contains("CODE")) { } else if (substring.toUpperCase().contains("CODE")) {
return new HttpResult(400, "编码已存在"); return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, "编码已存在");
} }
return new HttpResult(400, message); return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, message);
} }
@ExceptionHandler(SQLIntegrityConstraintViolationException.class) @ExceptionHandler(SQLIntegrityConstraintViolationException.class)
@ResponseBody @ResponseBody
public HttpResult sqlIntegrityConstraintViolationException(SQLIntegrityConstraintViolationException e) { public cn.wisenergy.chnmuseum.party.common.validator.HttpResult sqlIntegrityConstraintViolationException(SQLIntegrityConstraintViolationException e) {
String localizedMessage = e.getLocalizedMessage(); String localizedMessage = e.getLocalizedMessage();
String message = Splitter.on(System.lineSeparator()).trimResults().splitToList(localizedMessage).get(1); String message = Splitter.on(System.lineSeparator()).trimResults().splitToList(localizedMessage).get(1);
String substring = message.substring(message.indexOf("Exception:")); String substring = message.substring(message.indexOf("Exception:"));
if (substring.toUpperCase().contains("NAME")) { if (substring.toUpperCase().contains("NAME")) {
return new HttpResult(400, "名称已存在"); return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, "名称已存在");
} else if (substring.toUpperCase().contains("CODE")) { } else if (substring.toUpperCase().contains("CODE")) {
return new HttpResult(400, "编码已存在"); return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, "编码已存在");
} }
return new HttpResult(400, message); return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, message);
} }
/** /**
...@@ -155,9 +155,9 @@ public class GlobalExceptionAdvisor { ...@@ -155,9 +155,9 @@ public class GlobalExceptionAdvisor {
* @return 错误信息 * @return 错误信息
*/ */
@ExceptionHandler(HttpMessageConversionException.class) @ExceptionHandler(HttpMessageConversionException.class)
public HttpResult httpMessageConversionException(HttpMessageConversionException exception) { public cn.wisenergy.chnmuseum.party.common.validator.HttpResult httpMessageConversionException(HttpMessageConversionException exception) {
log.error(exception.getCause().getLocalizedMessage()); log.error(exception.getCause().getLocalizedMessage());
return new HttpResult(400, exception.getCause().getLocalizedMessage()); return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, exception.getCause().getLocalizedMessage());
} }
/** /**
...@@ -167,8 +167,8 @@ public class GlobalExceptionAdvisor { ...@@ -167,8 +167,8 @@ public class GlobalExceptionAdvisor {
* @return 返回的异常信息map * @return 返回的异常信息map
*/ */
@ExceptionHandler(InterfaceException.class) @ExceptionHandler(InterfaceException.class)
public HttpResult handleInterfaceException(InterfaceException exception) { public cn.wisenergy.chnmuseum.party.common.validator.HttpResult handleInterfaceException(InterfaceException exception) {
HttpResult httpResult = new HttpResult(); cn.wisenergy.chnmuseum.party.common.validator.HttpResult httpResult = new cn.wisenergy.chnmuseum.party.common.validator.HttpResult();
httpResult.setCode(Integer.parseInt(exception.getErrorCode())); httpResult.setCode(Integer.parseInt(exception.getErrorCode()));
httpResult.setMsg(exception.getErrorMsg()); httpResult.setMsg(exception.getErrorMsg());
return httpResult; return httpResult;
...@@ -182,7 +182,7 @@ public class GlobalExceptionAdvisor { ...@@ -182,7 +182,7 @@ public class GlobalExceptionAdvisor {
*/ */
@ExceptionHandler(UnauthorizedException.class) @ExceptionHandler(UnauthorizedException.class)
public Object handleUnauthorizedException(UnauthorizedException exception) { public Object handleUnauthorizedException(UnauthorizedException exception) {
HttpResult httpResult = new HttpResult(); cn.wisenergy.chnmuseum.party.common.validator.HttpResult httpResult = new cn.wisenergy.chnmuseum.party.common.validator.HttpResult();
// 无权限 // 无权限
addResCodeToMap(RESPONSE_CODE_ENUM.UNAUTHORIZED, httpResult); addResCodeToMap(RESPONSE_CODE_ENUM.UNAUTHORIZED, httpResult);
return httpResult; return httpResult;
...@@ -196,7 +196,7 @@ public class GlobalExceptionAdvisor { ...@@ -196,7 +196,7 @@ public class GlobalExceptionAdvisor {
*/ */
@ExceptionHandler(UnauthenticatedException.class) @ExceptionHandler(UnauthenticatedException.class)
public Object handleUnauthenticatedException(UnauthenticatedException exception) { public Object handleUnauthenticatedException(UnauthenticatedException exception) {
HttpResult httpResult = new HttpResult(); cn.wisenergy.chnmuseum.party.common.validator.HttpResult httpResult = new cn.wisenergy.chnmuseum.party.common.validator.HttpResult();
// 无权限 // 无权限
addResCodeToMap(RESPONSE_CODE_ENUM.UNAUTHORIZED, httpResult); addResCodeToMap(RESPONSE_CODE_ENUM.UNAUTHORIZED, httpResult);
return httpResult; return httpResult;
...@@ -208,9 +208,8 @@ public class GlobalExceptionAdvisor { ...@@ -208,9 +208,8 @@ public class GlobalExceptionAdvisor {
* @param responseCodeEnum 错误响应编码枚举类对象 * @param responseCodeEnum 错误响应编码枚举类对象
* @param httpResult 响应对象 * @param httpResult 响应对象
*/ */
private void addResCodeToMap(RESPONSE_CODE_ENUM responseCodeEnum, HttpResult httpResult) { private void addResCodeToMap(RESPONSE_CODE_ENUM responseCodeEnum, cn.wisenergy.chnmuseum.party.common.validator.HttpResult httpResult) {
httpResult.setCode(Integer.parseInt(responseCodeEnum.getCode())); httpResult.setCode(Integer.parseInt(responseCodeEnum.getCode()));
httpResult.setMsg(responseCodeEnum.getMsg()); httpResult.setMsg(responseCodeEnum.getMsg());
} }
} }
\ No newline at end of file
src/main/java/cn/wisenergy/chnmuseum/party/common/validator/GlobalExceptionAdvisor.java deleted 100644 → 0
View file @ d2d01176
package cn.wisenergy.chnmuseum.party.common.validator;
import cn.wisenergy.chnmuseum.party.common.enums.RESPONSE_CODE_ENUM;
import cn.wisenergy.chnmuseum.party.common.mvc.InterfaceException;
import com.google.common.base.Splitter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.shiro.authz.UnauthenticatedException;
import org.apache.shiro.authz.UnauthorizedException;
import org.springframework.beans.ConversionNotSupportedException;
import org.springframework.context.support.DefaultMessageSourceResolvable;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.http.converter.HttpMessageConversionException;
import org.springframework.http.converter.HttpMessageNotWritableException;
import org.springframework.validation.BindException;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;
import org.springframework.web.HttpMediaTypeNotAcceptableException;
import org.springframework.web.HttpMediaTypeNotSupportedException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import java.sql.SQLIntegrityConstraintViolationException;
import java.util.List;
import java.util.stream.Collectors;
/**
* 全局异常处理
*
* @author Danny Lee
* @date 2019/8/1
*/
@Slf4j
@RestControllerAdvice
public class GlobalExceptionAdvisor {
/**
* 捕获全局异常，处理所有不可知的异常
*
* @param exception 异常对象
*/
@ExceptionHandler(Exception.class)
public Object handleException(Exception exception) {
log.error("\r\n ************** 操作出现异常：{}", ExceptionUtils.getStackTrace(exception));
Class<?> eClass = exception.getClass();
HttpResult httpResult = new HttpResult();
if (eClass.equals(HttpRequestMethodNotSupportedException.class)) {
addResCodeToMap(RESPONSE_CODE_ENUM.METHOD_NOT_SUPPORTED, httpResult);
} else if (eClass.equals(HttpMediaTypeNotAcceptableException.class)) {
addResCodeToMap(RESPONSE_CODE_ENUM.MEDIA_TYPE_NOT_ACCEPT, httpResult);
} else if (eClass.equals(HttpMediaTypeNotSupportedException.class)) {
addResCodeToMap(RESPONSE_CODE_ENUM.MEDIA_TYPE_NOT_SUPPORTED, httpResult);
} else if (eClass.equals(ConversionNotSupportedException.class)) {
addResCodeToMap(RESPONSE_CODE_ENUM.SERVER_ERROR, httpResult);
} else if (eClass.equals(HttpMessageNotWritableException.class)) {
addResCodeToMap(RESPONSE_CODE_ENUM.SERVER_ERROR, httpResult);
} else {
addResCodeToMap(RESPONSE_CODE_ENUM.SERVER_ERROR, httpResult);
}
return httpResult;
}
@ExceptionHandler(BindException.class)
@ResponseBody
public HttpResult handle(BindException ex) {
String message = ex.getBindingResult().getAllErrors().stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.joining(" \n "));
// BindingResult bindingResult = ex.getBindingResult();
// StringBuilder errMsg = new StringBuilder(bindingResult.getFieldErrors().size() * 16);
// errMsg.append("Invalid request:");
// for (int i = 0; i < bindingResult.getFieldErrors().size(); i++) {
// if (i > 0) {
// errMsg.append(",");
// }
// FieldError error = bindingResult.getFieldErrors().get(i);
// errMsg.append(error.getField()).append(":").append(error.getDefaultMessage());
// }
return new HttpResult(400, message);
//throw new InterfaceException(RESPONSE_CODE_ENUM.PARAM_NOT_VALID.getCode(), errMsg.toString());
}
//处理请求参数格式错误 @RequestParam上validate失败后抛出的异常是javax.validation.ConstraintViolationException
@ExceptionHandler(ConstraintViolationException.class)
@ResponseBody
public String constraintViolationExceptionHandler(ConstraintViolationException e) {
return e.getConstraintViolations().stream().map(ConstraintViolation::getMessage).collect(Collectors.joining());
}
/**
* 处理请求参数格式错误 @RequestBody上validate失败后抛出的异常是MethodArgumentNotValidException异常。
*
* @param exception 错误信息集合
* @return 错误信息
*/
@ExceptionHandler(MethodArgumentNotValidException.class)
public HttpResult validationBodyException(MethodArgumentNotValidException exception) {
BindingResult result = exception.getBindingResult();
String msg = null;
if (result.hasErrors()) {
List<ObjectError> errors = result.getAllErrors();
for (ObjectError objectError : errors) {
FieldError fieldError = (FieldError) objectError;
if (fieldError.getDefaultMessage() != null) {
log.info("Data check failure : object{" + fieldError.getObjectName() + "},field{" + fieldError.getField() +
"},errorMessage{" + fieldError.getDefaultMessage() + "}");
msg = fieldError.getDefaultMessage();
}
}
}
return new HttpResult(400, msg);
}
@ExceptionHandler(DataAccessException.class)
public HttpResult dataAccessException(DataAccessException exception) {
return new HttpResult(400, exception.getLocalizedMessage());
}
@ExceptionHandler(DuplicateKeyException.class)
@ResponseBody
public HttpResult duplicateKeyException(DuplicateKeyException e) {
String localizedMessage = e.getLocalizedMessage();
String message = Splitter.on(System.lineSeparator()).trimResults().splitToList(localizedMessage).get(1);
String substring = message.substring(message.indexOf("Exception:"));
if (substring.toUpperCase().contains("NAME")) {
return new HttpResult(400, "名称已存在");
} else if (substring.toUpperCase().contains("CODE")) {
return new HttpResult(400, "编码已存在");
}
return new HttpResult(400, message);
}
@ExceptionHandler(SQLIntegrityConstraintViolationException.class)
@ResponseBody
public HttpResult sqlIntegrityConstraintViolationException(SQLIntegrityConstraintViolationException e) {
String localizedMessage = e.getLocalizedMessage();
String message = Splitter.on(System.lineSeparator()).trimResults().splitToList(localizedMessage).get(1);
String substring = message.substring(message.indexOf("Exception:"));
if (substring.toUpperCase().contains("NAME")) {
return new HttpResult(400, "名称已存在");
} else if (substring.toUpperCase().contains("CODE")) {
return new HttpResult(400, "编码已存在");
}
return new HttpResult(400, message);
}
/**
* 参数类型转换错误
*
* @param exception 错误
* @return 错误信息
*/
@ExceptionHandler(HttpMessageConversionException.class)
public HttpResult httpMessageConversionException(HttpMessageConversionException exception) {
log.error(exception.getCause().getLocalizedMessage());
return new HttpResult(400, exception.getCause().getLocalizedMessage());
}
/**
* 捕获业务异常
*
* @param exception 自定义接口异常类
* @return 返回的异常信息map
*/
@ExceptionHandler(InterfaceException.class)
public HttpResult handleInterfaceException(InterfaceException exception) {
HttpResult httpResult = new HttpResult();
httpResult.setCode(Integer.parseInt(exception.getErrorCode()));
httpResult.setMsg(exception.getErrorMsg());
return httpResult;
}
/**
* 捕获Shiro无权限异常 未授权异常
*
* @param exception 无权限异常
* @return 返回的异常信息map
*/
@ExceptionHandler(UnauthorizedException.class)
public Object handleUnauthorizedException(UnauthorizedException exception) {
HttpResult httpResult = new HttpResult();
// 无权限
addResCodeToMap(RESPONSE_CODE_ENUM.UNAUTHORIZED, httpResult);
return httpResult;
}
/**
* 捕获Shiro无权限异常 未认证异常
*
* @param exception 无权限异常
* @return 返回的异常信息map
*/
@ExceptionHandler(UnauthenticatedException.class)
public Object handleUnauthenticatedException(UnauthenticatedException exception) {
HttpResult httpResult = new HttpResult();
// 无权限
addResCodeToMap(RESPONSE_CODE_ENUM.UNAUTHORIZED, httpResult);
return httpResult;
}
/**
* 添加异常信息到map中
*
* @param responseCodeEnum 错误响应编码枚举类对象
* @param httpResult 响应对象
*/
private void addResCodeToMap(RESPONSE_CODE_ENUM responseCodeEnum, HttpResult httpResult) {
httpResult.setCode(Integer.parseInt(responseCodeEnum.getCode()));
httpResult.setMsg(responseCodeEnum.getMsg());
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment