From 8d4f36ebef49901bef919164b40720b2b6fd51d8 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 22 Jan 2021 10:31:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9D=BE=E4=B8=8BE9=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=BD=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java | 4 ++++ .../apiservice/serviceimpl/base/login/strategy/E9LoginStrategy.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index cf48b78..af43f3a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -72,6 +72,10 @@ public class SystemLoginService implements ISystemLoginService { return AuthUtil.login(ut); } + public static void main(String[] args) { + System.out.println(1+2+"a"); + } + @Override @ApiOperation(value = "用户登录", notes = "管理用户登录") public SessionUser queryAdminLogin(String loginName, String loginPwd, String languageCode) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/login/strategy/E9LoginStrategy.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/login/strategy/E9LoginStrategy.java index fd143b5..b7c9091 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/login/strategy/E9LoginStrategy.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/login/strategy/E9LoginStrategy.java @@ -16,8 +16,8 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.RedisCacheTool; import cn.estsh.impp.framework.boot.util.ResultBean; -import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,9 +59,9 @@ public class E9LoginStrategy implements ISystemLoginStrategyService { return ResultBean.fail("单点登录请求未从指定授权服务器发送，校验失败。"); } licenseClickService.checkLicenseNumberLogin(); - ValidatorBean.checkNotNull(loginModel.getLanguageCode(), "语言不能为空"); + // TODO 后期移除，暂时用于避免自动登录后前台没有正确的传输组织代码信息 - if ("null".equals(loginModel.getLanguageCode())) { + if ("null".equals(loginModel.getLanguageCode())|| StringUtils.isEmpty(loginModel.getLanguageCode())) { loginModel.setLanguageCode(DEFAULT_LANGUAGE); }