From da4a7d738bf774128d21242797e9493a5c1a16a8 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Wed, 1 Jul 2026 11:15:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor(exception):=20=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=A5=E5=BF=97=E8=B0=83=E6=95=B4=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E9=A1=BA=E5=BA=8F,=20=E6=B6=88=E6=81=AF=E5=9C=A8?= =?UTF-8?q?=E5=89=8D=20key=20=E5=9C=A8=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../capability/auth/handler/SaExceptionHandler.java | 4 ++-- .../iam/handler/exception/IamAuthExceptionHandler.java | 2 +- .../system/handler/exception/RestExceptionHandler.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/daxpay-platform/daxpay-platform-capability/capability-auth/src/main/java/cn/daxpay/open/platform/capability/auth/handler/SaExceptionHandler.java b/daxpay-platform/daxpay-platform-capability/capability-auth/src/main/java/cn/daxpay/open/platform/capability/auth/handler/SaExceptionHandler.java index 4a8db5120..f269d036c 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-auth/src/main/java/cn/daxpay/open/platform/capability/auth/handler/SaExceptionHandler.java +++ b/daxpay-platform/daxpay-platform-capability/capability-auth/src/main/java/cn/daxpay/open/platform/capability/auth/handler/SaExceptionHandler.java @@ -32,7 +32,7 @@ public class SaExceptionHandler { public ResponseEntity> handleNotLoginException(NotLoginException ex){ // 日志固定输出 messageKey 与中文翻译, 不受请求语言影响 String key = ex.resolveMessageKey(); - log.info("鉴权异常 key={}, 消息={}", key, I18nUtil.get(key, Locale.CHINA, ex.getArgs()), ex); + log.info("鉴权异常 消息={}, key={}", I18nUtil.get(key, Locale.CHINA, ex.getArgs()), key, ex); Result result = Res.response(ex.getCode(), ex.getMessage(), MDC.get(CommonCode.TRACE_ID)); return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(result); } @@ -42,7 +42,7 @@ public class SaExceptionHandler { public ResponseEntity> handleBusinessException(RouterCheckException ex) { // 日志固定输出 messageKey 与中文翻译, 不受请求语言影响 String key = ex.resolveMessageKey(); - log.info("鉴权异常 key={}, 消息={}", key, I18nUtil.get(key, Locale.CHINA, ex.getArgs()), ex); + log.info("鉴权异常 消息={}, key={}", I18nUtil.get(key, Locale.CHINA, ex.getArgs()), key, ex); Result result = Res.response(ex.getCode(), ex.getMessage(), MDC.get(CommonCode.TRACE_ID)); return ResponseEntity.status(HttpStatus.FORBIDDEN).body(result); } diff --git a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/handler/exception/IamAuthExceptionHandler.java b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/handler/exception/IamAuthExceptionHandler.java index e222c3022..1d6cc5063 100644 --- a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/handler/exception/IamAuthExceptionHandler.java +++ b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/handler/exception/IamAuthExceptionHandler.java @@ -27,7 +27,7 @@ public class IamAuthExceptionHandler { @ExceptionHandler(TwoFactorRequiredException.class) public Result handleTwoFactorRequired(TwoFactorRequiredException ex) { String key = ex.resolveMessageKey(); - log.info("双因素认证 key={}, 消息={}", key, I18nUtil.get(key, Locale.CHINA, ex.getArgs())); + log.info("双因素认证 消息={}, key={}", I18nUtil.get(key, Locale.CHINA, ex.getArgs()), key); String message = I18nUtil.get(key, ex.getArgs()); return Res.response(TwoFactorRequiredException.CODE, message, new TwoFactorChallengeResult(ex.getPreAuthToken())); } diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/handler/exception/RestExceptionHandler.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/handler/exception/RestExceptionHandler.java index 7389971ae..00da54cdf 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/handler/exception/RestExceptionHandler.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/handler/exception/RestExceptionHandler.java @@ -100,7 +100,7 @@ public class RestExceptionHandler { @ExceptionHandler(BizInfoException.class) public Object handleBizInfoException(BizInfoException ex, HttpServletResponse response) { return handleBiz(ex, response, e -> { - log.info("业务异常 key={}, 消息={}", e.resolveMessageKey(), zhMessage(e)); + log.info("业务异常 消息={}, key={}", zhMessage(e), e.resolveMessageKey()); log.debug(e.resolveMessageKey(), e); }); } @@ -108,19 +108,19 @@ public class RestExceptionHandler { /// 警告业务异常, 量多需关注 @ExceptionHandler(BizWarnException.class) public Object handleBizWarnException(BizWarnException ex, HttpServletResponse response) { - return handleBiz(ex, response, e -> log.warn("业务警告 key={}, 消息={}", e.resolveMessageKey(), zhMessage(e), e)); + return handleBiz(ex, response, e -> log.warn("业务警告 消息={}, key={}", zhMessage(e), e.resolveMessageKey(), e)); } /// 致命业务异常, 需立即排查 @ExceptionHandler(BizErrorException.class) public Object handleBizErrorException(BizErrorException ex, HttpServletResponse response) { - return handleBiz(ex, response, e -> log.error("业务错误 key={}, 消息={}", e.resolveMessageKey(), zhMessage(e), e)); + return handleBiz(ex, response, e -> log.error("业务错误 消息={}, key={}", zhMessage(e), e.resolveMessageKey(), e)); } /// 业务异常兜底 @ExceptionHandler(BizException.class) public Object handleBusinessException(BizException ex, HttpServletResponse response) { - return handleBiz(ex, response, e -> log.info("业务异常 key={}, 消息={}", e.resolveMessageKey(), zhMessage(e), e)); + return handleBiz(ex, response, e -> log.info("业务异常 消息={}, key={}", zhMessage(e), e.resolveMessageKey(), e)); } /// 请求参数校验未通过