|
@@ -8,6 +8,7 @@ import cn.hutool.http.HttpStatus;
|
|
|
import com.ruoyi.common.core.domain.R;
|
|
|
import com.ruoyi.common.exception.DemoModeException;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
+import com.ruoyi.common.exception.base.BaseException;
|
|
|
import com.ruoyi.common.utils.StreamUtils;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.mybatis.spring.MyBatisSystemException;
|
|
@@ -105,18 +106,27 @@ public class GlobalExceptionHandler {
|
|
|
*/
|
|
|
@ExceptionHandler(ServiceException.class)
|
|
|
public R<Void> handleServiceException(ServiceException e, HttpServletRequest request) {
|
|
|
- log.error(e.getMessage(), e);
|
|
|
+ log.error(e.getMessage());
|
|
|
Integer code = e.getCode();
|
|
|
return ObjectUtil.isNotNull(code) ? R.fail(code, e.getMessage()) : R.fail(e.getMessage());
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 业务异常
|
|
|
+ */
|
|
|
+ @ExceptionHandler(BaseException.class)
|
|
|
+ public R<Void> handleBaseException(BaseException e, HttpServletRequest request) {
|
|
|
+ log.error(e.getMessage());
|
|
|
+ return R.fail(e.getMessage());
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 请求路径中缺少必需的路径变量
|
|
|
*/
|
|
|
@ExceptionHandler(MissingPathVariableException.class)
|
|
|
public R<Void> handleMissingPathVariableException(MissingPathVariableException e, HttpServletRequest request) {
|
|
|
String requestURI = request.getRequestURI();
|
|
|
- log.error("请求路径中缺少必需的路径变量'{}',发生系统异常.", requestURI, e);
|
|
|
+ log.error("请求路径中缺少必需的路径变量'{}',发生系统异常.", requestURI);
|
|
|
return R.fail(String.format("请求路径中缺少必需的路径变量[%s]", e.getVariableName()));
|
|
|
}
|
|
|
|
|
@@ -126,7 +136,7 @@ public class GlobalExceptionHandler {
|
|
|
@ExceptionHandler(MethodArgumentTypeMismatchException.class)
|
|
|
public R<Void> handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e, HttpServletRequest request) {
|
|
|
String requestURI = request.getRequestURI();
|
|
|
- log.error("请求参数类型不匹配'{}',发生系统异常.", requestURI, e);
|
|
|
+ log.error("请求参数类型不匹配'{}',发生系统异常.", requestURI);
|
|
|
return R.fail(String.format("请求参数类型不匹配,参数[%s]要求类型为:'%s',但输入值为:'%s'", e.getName(), e.getRequiredType().getName(), e.getValue()));
|
|
|
}
|
|
|
|
|
@@ -155,7 +165,7 @@ public class GlobalExceptionHandler {
|
|
|
*/
|
|
|
@ExceptionHandler(BindException.class)
|
|
|
public R<Void> handleBindException(BindException e) {
|
|
|
- log.error(e.getMessage(), e);
|
|
|
+ log.error(e.getMessage());
|
|
|
String message = StreamUtils.join(e.getAllErrors(), DefaultMessageSourceResolvable::getDefaultMessage, ", ");
|
|
|
return R.fail(message);
|
|
|
}
|
|
@@ -165,7 +175,7 @@ public class GlobalExceptionHandler {
|
|
|
*/
|
|
|
@ExceptionHandler(ConstraintViolationException.class)
|
|
|
public R<Void> constraintViolationException(ConstraintViolationException e) {
|
|
|
- log.error(e.getMessage(), e);
|
|
|
+ log.error(e.getMessage());
|
|
|
String message = StreamUtils.join(e.getConstraintViolations(), ConstraintViolation::getMessage, ", ");
|
|
|
return R.fail(message);
|
|
|
}
|
|
@@ -175,7 +185,7 @@ public class GlobalExceptionHandler {
|
|
|
*/
|
|
|
@ExceptionHandler(MethodArgumentNotValidException.class)
|
|
|
public R<Void> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
|
|
|
- log.error(e.getMessage(), e);
|
|
|
+ log.error(e.getMessage());
|
|
|
String message = e.getBindingResult().getFieldError().getDefaultMessage();
|
|
|
return R.fail(message);
|
|
|
}
|