|
|
@@ -32,30 +32,30 @@ public class ExceptionAdvice {
|
|
|
|
|
|
/** 自定义验证异常 */
|
|
|
@ExceptionHandler(BindException.class)
|
|
|
- public ResultData BindExceptionHandler(BindException e, HttpServletRequest request) {
|
|
|
+ public ResultData<String> BindExceptionHandler(BindException e, HttpServletRequest request) {
|
|
|
log.error("异常: BindException, 请求地址: {}, 程序异常: {}", request.getRequestURI(), e.getMessage());
|
|
|
List<ObjectError> allErrors = e.getBindingResult().getAllErrors();
|
|
|
String result = allErrors.stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.joining(","));
|
|
|
- return ResultData.fail(result);
|
|
|
+ return ResultData.fail(result, "");
|
|
|
}
|
|
|
|
|
|
/** 通用Exception异常捕获 */
|
|
|
@ExceptionHandler(Exception.class)
|
|
|
- public ResultData ExceptionHandler(Exception e, HttpServletRequest request) {
|
|
|
+ public ResultData<String> ExceptionHandler(Exception e, HttpServletRequest request) {
|
|
|
log.error("异常: Exception, 请求地址: {}, 程序异常: {}", request.getRequestURI(), e.getMessage());
|
|
|
- return ResultData.fail("异常: " + e.getMessage());
|
|
|
+ return ResultData.fail("异常: " + e.getMessage(), "");
|
|
|
}
|
|
|
|
|
|
/** 请求方式不支持 */
|
|
|
@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
|
|
|
- public ResultData handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException ex, HttpServletRequest request) {
|
|
|
+ public ResultData<String> handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException ex, HttpServletRequest request) {
|
|
|
log.error("异常: 请求方式不支持, 请求地址: {}, 程序异常: {}", request.getRequestURI(), ex.getMessage());
|
|
|
- return ResultData.fail("请求方式不支持: "+ex.getMessage());
|
|
|
+ return ResultData.fail("请求方式不支持: " + ex.getMessage(), "");
|
|
|
}
|
|
|
|
|
|
/** 校验错误拦截处理 */
|
|
|
@ExceptionHandler(MethodArgumentNotValidException.class)
|
|
|
- public ResultData validationBodyException(MethodArgumentNotValidException ex, HttpServletRequest request) {
|
|
|
+ public ResultData<String> validationBodyException(MethodArgumentNotValidException ex, HttpServletRequest request) {
|
|
|
log.error("异常: 校验错误拦截处理, 请求地址: {}, 程序异常: {}", request.getRequestURI(), ex.getMessage());
|
|
|
BindingResult result = ex.getBindingResult();
|
|
|
if (result.hasErrors()) {
|
|
|
@@ -67,8 +67,8 @@ public class ExceptionAdvice {
|
|
|
map.put(fieldError.getField(), fieldError.getDefaultMessage());
|
|
|
});
|
|
|
log.error("异常: 校验错误拦截处理, 程序异常: {}", JSONUtil.toJsonPrettyStr(map));
|
|
|
- return ResultData.fail("参数异常: " + JSONUtil.toJsonPrettyStr(map));
|
|
|
+ return ResultData.fail("参数异常: " + JSONUtil.toJsonPrettyStr(map), "");
|
|
|
}
|
|
|
- return ResultData.fail("参数异常");
|
|
|
+ return ResultData.fail("参数异常", "");
|
|
|
}
|
|
|
}
|