From c7bb6ebb7f8edadfd0e423ce407d2672055e2d5b Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Wed, 19 Mar 2025 18:48:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=AA=E7=9F=A5=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=8A=A5=E5=86=85=E9=83=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/i18n/messages_en_US.properties        | 1 +
 .../src/main/resources/i18n/messages_zh_CN.properties        | 1 +
 .../wfc/common/security/handler/GlobalExceptionHandler.java  | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wfc-common/wfc-common-core/src/main/resources/i18n/messages_en_US.properties b/wfc-common/wfc-common-core/src/main/resources/i18n/messages_en_US.properties
index 96b7f5b..eafd71c 100644
--- a/wfc-common/wfc-common-core/src/main/resources/i18n/messages_en_US.properties
+++ b/wfc-common/wfc-common-core/src/main/resources/i18n/messages_en_US.properties
@@ -177,6 +177,7 @@ common.no.permission=No permission, please contact the administrator to add perm
 common.request.path.variable.not.blank=Request path variable''{0}'' cannot be blank
 common.request.parameter.type.not.match=Request parameter''{0}'' requires type: ''{1}'', but the input value is: ''{2}''
 common.demo.mode=Demo mode, no operation is allowed
+common.system.error=Internal error, please contact the administrator
 
 ## system portal menu
 menu.system.management=System Management
diff --git a/wfc-common/wfc-common-core/src/main/resources/i18n/messages_zh_CN.properties b/wfc-common/wfc-common-core/src/main/resources/i18n/messages_zh_CN.properties
index 91a83a3..181159f 100644
--- a/wfc-common/wfc-common-core/src/main/resources/i18n/messages_zh_CN.properties
+++ b/wfc-common/wfc-common-core/src/main/resources/i18n/messages_zh_CN.properties
@@ -179,6 +179,7 @@ common.no.permission=没有访问权限，请联系管理员授权
 common.request.path.variable.not.blank=请求路径中缺少必需的路径变量''{0}''
 common.request.parameter.type.not.match=请求参数类型不匹配，参数''{0}''要求类型为：''{1}''，但输入值为：''{2}''
 common.demo.mode=演示模式，不允许操作
+common.system.error=内部错误，请联系管理员
 
 ## system portal menu
 menu.system.management=系统管理
diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/handler/GlobalExceptionHandler.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/handler/GlobalExceptionHandler.java
index 0db1fe0..9eb85e1 100644
--- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/handler/GlobalExceptionHandler.java
+++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/handler/GlobalExceptionHandler.java
@@ -1,6 +1,5 @@
 package org.wfc.common.security.handler;
 
-import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindException;
@@ -22,6 +21,8 @@ import org.wfc.common.core.utils.StringUtils;
 import org.wfc.common.core.utils.html.EscapeUtil;
 import org.wfc.common.core.web.domain.AjaxResult;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 全局异常处理器
  *
@@ -111,7 +112,7 @@ public class GlobalExceptionHandler
     {
         String requestURI = request.getRequestURI();
         log.error("Requesting address '{}', an unknown exception occurred.", requestURI, e);
-        return AjaxResult.error(e.getMessage());
+        return AjaxResult.error(MessageUtils.message("common.system.error"));
     }
 
     /**