From 00dd38dd12d7cc95a479348bbfeee09eaad5635a Mon Sep 17 00:00:00 2001
From: wujj <1027418825@qq.com>
Date: Wed, 2 Dec 2020 17:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/mingsoft/cms/action/BaseAction.java | 2 +-
 src/main/java/net/mingsoft/cms/constant/Const.java    | 4 +---
 src/main/java/net/mingsoft/config/WebConfig.java      | 6 ++++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/action/BaseAction.java b/src/main/java/net/mingsoft/cms/action/BaseAction.java
index 78856924..3fc76b19 100644
--- a/src/main/java/net/mingsoft/cms/action/BaseAction.java
+++ b/src/main/java/net/mingsoft/cms/action/BaseAction.java
@@ -14,7 +14,7 @@ public class BaseAction extends net.mingsoft.mdiy.action.BaseAction{
         try {
             str = super.getResString(key);
         } catch (MissingResourceException e) {
-            str = net.mingsoft.cms.constant.Const.RESOURCES.getString(key);
+            str = getLocaleString(key,net.mingsoft.cms.constant.Const.RESOURCES);
         }
 
         return str;
diff --git a/src/main/java/net/mingsoft/cms/constant/Const.java b/src/main/java/net/mingsoft/cms/constant/Const.java
index d6fa7e1c..e318d734 100644
--- a/src/main/java/net/mingsoft/cms/constant/Const.java
+++ b/src/main/java/net/mingsoft/cms/constant/Const.java
@@ -1,7 +1,5 @@
 package net.mingsoft.cms.constant;
 
-import java.util.ResourceBundle;
-
 /**
  * @Author: 铭飞开源团队--huise
  * @Date: 2019/8/9 20:51
@@ -10,5 +8,5 @@ public class Const {
     /**
      * 资源文件
      */
-    public final static ResourceBundle RESOURCES = ResourceBundle.getBundle("net.mingsoft.cms.resources.resources");
+    public final static String RESOURCES = "net.mingsoft.cms.resources.resources";
 }
diff --git a/src/main/java/net/mingsoft/config/WebConfig.java b/src/main/java/net/mingsoft/config/WebConfig.java
index 11d9ade4..f33b1643 100644
--- a/src/main/java/net/mingsoft/config/WebConfig.java
+++ b/src/main/java/net/mingsoft/config/WebConfig.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import net.mingsoft.basic.filter.XSSEscapeFilter;
 import net.mingsoft.basic.interceptor.ActionInterceptor;
+import net.mingsoft.basic.resolver.MSLocaleResolver;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
@@ -152,4 +153,9 @@ public class WebConfig implements WebMvcConfigurer {
 						new LinkedBlockingQueue<Runnable>());
 		return pool;
 	}
+
+	@Bean
+	public MSLocaleResolver localeResolver(){
+		return new MSLocaleResolver();
+	}
 }