From 5cbe9d5e0fab1a1d86a1181f190c34d5c7c687f5 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Mon, 14 Apr 2025 14:17:02 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3591:=20=E5=A4=84=E7=90=86=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/ControllerExceptionHandler.java   | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/msg-notices/msg-notices-client/src/main/java/cn/axzo/msg/center/notices/client/handler/ControllerExceptionHandler.java b/msg-notices/msg-notices-client/src/main/java/cn/axzo/msg/center/notices/client/handler/ControllerExceptionHandler.java
index 3f653d3c..3dde1863 100644
--- a/msg-notices/msg-notices-client/src/main/java/cn/axzo/msg/center/notices/client/handler/ControllerExceptionHandler.java
+++ b/msg-notices/msg-notices-client/src/main/java/cn/axzo/msg/center/notices/client/handler/ControllerExceptionHandler.java
@@ -1,5 +1,16 @@
 package cn.axzo.msg.center.notices.client.handler;
 
+import javax.annotation.Resource;
+
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
 import cn.axzo.basics.common.exception.ServiceException;
 import cn.axzo.msg.center.notices.common.enums.ReturnCodeEnum;
 import cn.axzo.msg.center.notices.common.exception.BizException;
@@ -7,14 +18,6 @@ import cn.axzo.msg.center.notices.integration.client.DingDingClient;
 import cn.azxo.framework.common.model.CommonResponse;
 import cn.azxo.framework.common.utils.LogUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.FieldError;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-import javax.annotation.Resource;
 
 /**
  * Spring MVC 统一异常处理
@@ -24,6 +27,7 @@ import javax.annotation.Resource;
  * @since 2021-05-17 15:44
  */
 @Slf4j
+@Order(Ordered.HIGHEST_PRECEDENCE)
 @RestControllerAdvice
 public class ControllerExceptionHandler {
 
@@ -42,6 +46,12 @@ public class ControllerExceptionHandler {
         return CommonResponse.error(e.getErrorCode(), e.getMessage());
     }
 
+    @ExceptionHandler(value = cn.axzo.framework.domain.ServiceException.class)
+    public CommonResponse bizException(cn.axzo.framework.domain.ServiceException e){
+        log.warn("[mns] ControllerExceptionHandler.bizException Exception", e);
+        return CommonResponse.error(9998, e.getMessage());
+    }
+
     @ExceptionHandler(value = IllegalArgumentException.class)
     public CommonResponse handleIllegalArgumentException(IllegalArgumentException e) {
         LogUtil.error("[mns] ControllerExceptionHandler.handleIllegalArgumentException Exception message ", e);