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..801e4aff0 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; }