From aaae9fbc94632eecd4cf817bcf7d9046e0bb6f92 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sat, 17 Jun 2023 22:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90auth=E3=80=91=E6=9B=B4=E6=96=B0=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=88=9B=E5=BB=BAloginUser=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/auth/auth/AuthServiceImpl.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java index bbd304e56..57c54f0b3 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java @@ -65,7 +65,6 @@ import cn.stylefeng.roses.kernel.jwt.api.exception.JwtException; import cn.stylefeng.roses.kernel.jwt.api.exception.enums.JwtExceptionEnum; import cn.stylefeng.roses.kernel.jwt.api.pojo.config.JwtConfig; import cn.stylefeng.roses.kernel.log.api.LoginLogServiceApi; -import cn.stylefeng.roses.kernel.message.api.expander.WebSocketConfigExpander; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.tenant.RequestTenantCodeHolder; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; @@ -85,8 +84,6 @@ import io.jsonwebtoken.Claims; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.Map; import static cn.stylefeng.roses.kernel.auth.api.exception.enums.AuthExceptionEnum.AUTH_EXPIRED_ERROR; import static cn.stylefeng.roses.kernel.auth.api.exception.enums.AuthExceptionEnum.TOKEN_PARSE_ERROR; @@ -285,7 +282,7 @@ public class AuthServiceImpl implements AuthServiceApi { // 获取用户租户信息 String tenantCode = defaultJwtPayload.getTenantCode(); - UserLoginInfoDTO userLoginInfo; + LoginUser loginUser; try { // 如果有特定租户则进行切换操作 if (StrUtil.isNotEmpty(tenantCode) && !DatasourceContainerConstants.MASTER_DATASOURCE_NAME.equals(tenantCode)) { @@ -293,16 +290,10 @@ public class AuthServiceImpl implements AuthServiceApi { } // 获取用户信息 - userLoginInfo = userServiceApi.getUserLoginInfo(account); - LoginUser loginUser = userLoginInfo.getLoginUser(); - loginUser.setTenantCode(tenantCode); + UserValidateDTO userValidateDTO = sysUserServiceApi.getUserLoginValidateDTO(account); - // 设置websocket url - String webSocketWsUrl = WebSocketConfigExpander.getWebSocketWsUrl(); - Map params = new HashMap<>(1); - params.put("token", token); - webSocketWsUrl = StrUtil.format(webSocketWsUrl, params); - loginUser.setWsUrl(webSocketWsUrl); + // 创建登录用户 + loginUser = new LoginUser(userValidateDTO.getUserId(), token); // 创建用户会话信息 sessionManagerApi.updateSession(token, loginUser); @@ -311,7 +302,7 @@ public class AuthServiceImpl implements AuthServiceApi { CurrentDataSourceContext.clearDataSourceName(); } - return userLoginInfo.getLoginUser(); + return loginUser; } /**