From 8f17a42b9754c4ab7660587a44eef27bd80455ef Mon Sep 17 00:00:00 2001 From: coderwu Date: Fri, 26 Jan 2024 21:21:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=BB=9F=E4=B8=80Locale?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98(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 950916796..80dbf50a9 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; + /** * 通用常量信息 * @@ -57,6 +59,11 @@ public class Constants */ public static final String LOGIN_FAIL = "Error"; + /** + * 系统统一Locale + */ + public static final Locale SYS_LOCALE = Locale.SIMPLIFIED_CHINESE; + /** * 系统用户授权缓存 */ 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..9e3f669cf 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 com.ruoyi.common.constant.Constants; import org.springframework.context.MessageSource; -import org.springframework.context.i18n.LocaleContextHolder; 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.SYS_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..b09b4eb35 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,6 @@ package com.ruoyi.framework.config; -import java.util.Locale; +import com.ruoyi.common.constant.Constants; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.LocaleResolver; @@ -22,7 +22,7 @@ public class I18nConfig implements WebMvcConfigurer { SessionLocaleResolver slr = new SessionLocaleResolver(); // 默认语言 - slr.setDefaultLocale(Locale.SIMPLIFIED_CHINESE); + slr.setDefaultLocale(Constants.SYS_LOCALE); return slr; }