From f6ce55be47f1b683bf0532433e9cc31d39dfb0a8 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 13 Mar 2024 11:38:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=BB=9F=E4=B8=80Locale?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9B=BD=E9=99=85=E5=8C=96(I8Z7DA)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/constant/Constants.java | 7 +++++++
 .../src/main/java/com/ruoyi/common/utils/MessageUtils.java | 4 ++--
 .../main/java/com/ruoyi/framework/config/I18nConfig.java   | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index e832be895..9da01ab4f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -1,5 +1,7 @@
 package com.ruoyi.common.constant;
 
+import java.util.Locale;
+
 /**
  * 通用常量信息
  * 
@@ -17,6 +19,11 @@ public class Constants
      */
     public static final String GBK = "GBK";
 
+    /**
+     * 系统语言
+     */
+    public static final Locale DEFAULT_LOCALE = Locale.SIMPLIFIED_CHINESE;
+
     /**
      * http请求
      */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java
index 5f2d9ea24..be54c2321 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java
@@ -1,7 +1,7 @@
 package com.ruoyi.common.utils;
 
 import org.springframework.context.MessageSource;
-import org.springframework.context.i18n.LocaleContextHolder;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.spring.SpringUtils;
 
 /**
@@ -21,6 +21,6 @@ public class MessageUtils
     public static String message(String code, Object... args)
     {
         MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
-        return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
+        return messageSource.getMessage(code, args, Constants.DEFAULT_LOCALE);
     }
 }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java
index c572e1c5c..1e977ba0e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java
@@ -1,6 +1,5 @@
 package com.ruoyi.framework.config;
 
-import java.util.Locale;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.LocaleResolver;
@@ -8,6 +7,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+import com.ruoyi.common.constant.Constants;
 
 /**
  * 资源文件配置加载
@@ -22,7 +22,7 @@ public class I18nConfig implements WebMvcConfigurer
     {
         SessionLocaleResolver slr = new SessionLocaleResolver();
         // 默认语言
-        slr.setDefaultLocale(Locale.SIMPLIFIED_CHINESE);
+        slr.setDefaultLocale(Constants.DEFAULT_LOCALE);
         return slr;
     }