From 087ebbf45d356d915bfec5f5d1245a91c2766e41 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 12 Feb 2022 19:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E3=80=90auth=E3=80=91?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=8E=BB=E6=8E=89effective?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/auth/auth/LoginUserImpl.java  | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginUserImpl.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginUserImpl.java
index 69060c941..66d5e18c2 100644
--- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginUserImpl.java
+++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginUserImpl.java
@@ -24,7 +24,6 @@
  */
 package cn.stylefeng.roses.kernel.auth.auth;
 
-import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.auth.api.LoginUserApi;
 import cn.stylefeng.roses.kernel.auth.api.SessionManagerApi;
 import cn.stylefeng.roses.kernel.auth.api.context.LoginUserHolder;
@@ -32,9 +31,6 @@ import cn.stylefeng.roses.kernel.auth.api.exception.AuthException;
 import cn.stylefeng.roses.kernel.auth.api.exception.enums.AuthExceptionEnum;
 import cn.stylefeng.roses.kernel.auth.api.loginuser.CommonLoginUserUtil;
 import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser;
-import cn.stylefeng.roses.kernel.dsctn.api.constants.DatasourceContainerConstants;
-import cn.stylefeng.roses.kernel.dsctn.api.context.CurrentDataSourceContext;
-import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 import cn.stylefeng.roses.kernel.system.api.UserServiceApi;
 import org.springframework.stereotype.Service;
 
@@ -80,19 +76,7 @@ public class LoginUserImpl implements LoginUserApi {
             throw new AuthException(AuthExceptionEnum.AUTH_EXPIRED_ERROR);
         }
 
-        // 获取当前上下文的数据源名称
-        String dataSourceName = CurrentDataSourceContext.getDataSourceName();
-
-        // 如果当前用户有租户编码，则需要切下数据源
-        if (ObjectUtil.isNotEmpty(session.getTenantCode()) && !session.getTenantCode().equals(DatasourceContainerConstants.MASTER_DATASOURCE_NAME)) {
-            CurrentDataSourceContext.setDataSourceName(RuleConstants.TENANT_DB_PREFIX + session.getTenantCode());
-        }
-        try {
-            // 从新组装一次loginUser，保证loginUser中数据的时效性
-            return userServiceApi.getEffectiveLoginUser(session);
-        } finally {
-            CurrentDataSourceContext.setDataSourceName(dataSourceName);
-        }
+        return session;
     }
 
     @Override