fix: 🐛 异常捕获错误码判断修复

fxbin · Sep 19, 2023 · 2b4a2d8 · 2b4a2d8
1 parent f846094
commit 2b4a2d8
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...-starter-web/src/main/java/cn/fxbin/bubble/web/handler/DefaultGlobalExceptionHandler.java b/...-starter-web/src/main/java/cn/fxbin/bubble/web/handler/DefaultGlobalExceptionHandler.java
@@ -1,11 +1,13 @@
 package cn.fxbin.bubble.web.handler;
 
+import cn.fxbin.bubble.core.dataobject.ErrorCode;
 import cn.fxbin.bubble.core.dataobject.GlobalErrorCode;
-import cn.fxbin.bubble.core.exception.ServiceException;
 import cn.fxbin.bubble.core.dataobject.Result;
-import cn.fxbin.bubble.core.dataobject.ErrorCode;
+import cn.fxbin.bubble.core.exception.ServiceException;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.ObjectUtils;
@@ -18,10 +20,8 @@
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.ConstraintViolationException;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Objects;
 
 /**
  * DefaultGlobalExceptionHandler
@@ -43,7 +43,7 @@ public Result<String> exceptionHandler(Exception exception) {
  @ExceptionHandler(value = ServiceException.class)
  public Result<String> exceptionHandler(ServiceException ex) {
  log.warn("[ServiceException]", ex);
- return Result.failure((ErrorCode.valueOf(ex.getErrcode()).isError() ? GlobalErrorCode.INTERNAL_SERVER_ERROR.value() : ex.getErrcode()), ex.getMessage());
+ return Result.failure(Objects.requireNonNull(ErrorCode.valueOf(ex.getErrcode())).isError() ? ex.getErrcode() : GlobalErrorCode.INTERNAL_SERVER_ERROR.value(), ex.getMessage());
  }
 
  /**