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

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java

@@ -2,11 +2,10 @@ package cn.estsh.i3plus.core.apiservice.configuration;
 
 import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
 import cn.estsh.i3plus.platform.common.util.CommonConstWords;
-import cn.estsh.impp.framework.boot.util.ImppSwitchUtil;
+import cn.estsh.impp.framework.boot.init.IAppStartSystemInit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
 /**
@@ -17,26 +16,23 @@ import org.springframework.stereotype.Component;
  * @Modify:
  **/
 @Component
-public class AppStartSystemInit implements CommandLineRunner {
+public class AppStartSystemInit implements IAppStartSystemInit {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG);
 
-    @Autowired(required = false)
+    @Autowired
     private ISystemInitService systemInitService;
 
+    /**
+     * 系统初始化回调方法
+     */
     @Override
-    public void run(String... args) throws Exception {
+    public void systemInit() {
         try {
-            if(ImppSwitchUtil.isUnitTestEnv()) {
-                LOGGER.info("【单元测试环境 跳过初始化...】");
-                return;
-            }
             LOGGER.info("【IMPP-Core开始加载基础信息...】");
-
             systemInitService.putAndLoadAll();
         }catch (Exception e){
             e.printStackTrace();
         }
     }
-
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -11,6 +11,7 @@ import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog;
 import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
+import cn.estsh.i3plus.pojo.base.bean.BaseThreadLocal;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
@@ -159,9 +160,12 @@ public class WhiteController extends CoreBaseController {
         CommonEnumUtil.USER_LOGIN_STATUS userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.LOGIN_SUCCESS;
 
         try {
+            ValidatorBean.checkNotNull(languageCode,"语言不能为空");
+            // 设置语言代码
+            BaseThreadLocal.setData(BaseThreadLocal.LANGUAGE_CODE, languageCode);
+
             ValidatorBean.checkNotNull(loginName,"用户名不能为空");
             ValidatorBean.checkNotNull(loginPwd,"密码不能为空");
-            ValidatorBean.checkNotNull(languageCode,"语言不能为空");
 
             int sessionMode = RedisCacheTool.getSysConfigIntVal(CommonConstWords.CONFIG_SESSION_MODE, CommonConstWords.CONFIG_SESSION_MODE_DEFAULT);
             if (sessionMode != CommonEnumUtil.SESSION_MODE.SEIZE.getValue()) {
@@ -227,7 +231,7 @@ public class WhiteController extends CoreBaseController {
             recordSysUserLog(null, loginName,userLoginStatus.getValue(), ipAddr);
         }
 
-        LOGGER.info("会员{}登陆登录完成 , 登录耗时:{}",loginName,(System.currentTimeMillis() - startTime));
+        LOGGER.info("会员{}登陆登录完成 ,语言：{} , 登录耗时:{}",loginName,BaseThreadLocal.getThreadLanguageCode(),(System.currentTimeMillis() - startTime));
         return result;
     }
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java

@@ -283,6 +283,7 @@ public class SystemInitService implements ISystemInitService {
             } while (pager.hasNext());
 
             for (Map.Entry<String, Map<String, String>> entry : langSoftMap.entrySet()) {
+                LOGGER.info("【加载资源】缓存 {} 资源", entry.getKey());
                 redisRes.putHashMap(entry.getKey(), entry.getValue(),-1);
             }
             LOGGER.info("【加载资源】模块资源 已分类缓存完毕");

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/SysUserPasswordUtil.java

@@ -440,9 +440,9 @@ public class SysUserPasswordUtil {
             if(Objects.nonNull(resultBean)){
                 int num = loginErrorNumberMax - loginErrorNumber;
                 if(num == 0){
-                    resultBean.setErrorMsg(resultBean.getErrorMsg() + "密码输入错误。用户已被锁定请联系管理员！");
+                    resultBean.setErrorMsg(LocaleUtils.getLocaleRes("密码输入错误。用户已被锁定请联系管理员！"));
                 }else{
-                    resultBean.setErrorMsg(resultBean.getErrorMsg() + "密码输入错误。再输入错误"+ num +"次，用户将被锁定");
+                    resultBean.setErrorMsg(String.format(LocaleUtils.getLocaleRes("密码输入错误。再输入错误 %s 次，用户将被锁定"), num));
                 }
             }