diff --git a/config/src/main/java/com/alibaba/nacos/config/server/exception/GlobalExceptionHandler.java b/config/src/main/java/com/alibaba/nacos/config/server/exception/GlobalExceptionHandler.java index 87686edc228..fb01464eccb 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/exception/GlobalExceptionHandler.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/exception/GlobalExceptionHandler.java @@ -21,6 +21,8 @@ import com.alibaba.nacos.common.utils.ExceptionUtil; import com.alibaba.nacos.config.server.monitor.MetricsMonitor; import com.alibaba.nacos.persistence.monitor.DatasourceMetrics; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; import org.springframework.dao.DataAccessException; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ControllerAdvice; @@ -33,7 +35,8 @@ * * @author Nacos */ -@ControllerAdvice +@ControllerAdvice(basePackages = "com.alibaba.nacos.config.server") +@Order(Ordered.LOWEST_PRECEDENCE - 1) public class GlobalExceptionHandler { /** diff --git a/naming/src/main/java/com/alibaba/nacos/naming/exception/ResponseExceptionHandler.java b/naming/src/main/java/com/alibaba/nacos/naming/exception/ResponseExceptionHandler.java index 53373a76d26..29bb97161bf 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/exception/ResponseExceptionHandler.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/exception/ResponseExceptionHandler.java @@ -20,6 +20,8 @@ import com.alibaba.nacos.api.exception.runtime.NacosRuntimeException; import com.alibaba.nacos.common.utils.ExceptionUtil; import com.alibaba.nacos.naming.misc.Loggers; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.MissingServletRequestParameterException; @@ -31,7 +33,8 @@ * * @author nkorange */ -@ControllerAdvice +@ControllerAdvice(basePackages = "com.alibaba.nacos.naming") +@Order(Ordered.LOWEST_PRECEDENCE - 1) public class ResponseExceptionHandler { /** diff --git a/pom.xml b/pom.xml index b29f57032ac..822d426e71e 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ - 2.4.1 + 2.4.2-SNAPSHOT UTF-8 UTF-8