wujj il y a 5 ans
Parent
commit
00dd38dd12

+ 1 - 1
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;

+ 1 - 3
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";
 }

+ 6 - 0
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();
+	}
 }