From ca5001b53120f7bd1d55b72b87e3460f63b80654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 10 Oct 2020 17:10:15 +0800 Subject: [PATCH] =?UTF-8?q?fix(core):=E5=9C=A8=E7=94=A8=E6=88=B7=E6=9C=AA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E5=9B=BD=E9=99=85=E5=8C=96=E6=97=A0?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/base/WhiteController.java | 8 ++++++-- .../core/apiservice/serviceimpl/base/SystemInitService.java | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index ca3bdfa..387c05e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/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; } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java index c89d11d..1d9ce15 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java +++ b/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> entry : langSoftMap.entrySet()) { + LOGGER.info("【加载资源】缓存 {} 资源", entry.getKey()); redisRes.putHashMap(entry.getKey(), entry.getValue(),-1); } LOGGER.info("【加载资源】模块资源 已分类缓存完毕");