Merge remote-tracking branch 'origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java

@@ -106,6 +106,7 @@ public class BaseThreadLocal {
     public static final String INIT_INFO = "INIT_INFO";  //初始化数据
     public static final String EMP_NAME = "USER_NAME";    //用户名
     public static final String ORGANIZE_CODE = "ORGANIZE_CODE";    //组织代码
+    public static final String LANGUAGE_CODE = "LANGUAGE_CODE";    //语言代码
 
     public static boolean isInit(){
         Object data = getData(INIT_INFO);
@@ -117,9 +118,10 @@ public class BaseThreadLocal {
     }
 
     //初始化用户数据
-    public static void initSessionUserThreadLocal(String empName, String organizeCode){
+    public static void initSessionUserThreadLocal(String empName, String organizeCode,String languageCode){
         setData(BaseThreadLocal.EMP_NAME, empName);
         setData(BaseThreadLocal.ORGANIZE_CODE, organizeCode);
+        setData(BaseThreadLocal.LANGUAGE_CODE, languageCode);
         setData(BaseThreadLocal.INIT_INFO, true);
     }
 
@@ -139,4 +141,12 @@ public class BaseThreadLocal {
         }
         return organizeCode;
     }
+    //获取线程中的语言代码
+    public static String getThreadLanguageCode(){
+        String organizeCode = getDataStr(LANGUAGE_CODE);
+        if(organizeCode == null){
+            organizeCode = "CN/zh";
+        }
+        return organizeCode;
+    }
 }