From d503d1a172001c653a416ac7551a23a355fe1370 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 30 Aug 2023 10:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90auth=E3=80=91logi?=
 =?UTF-8?q?nUser=E6=94=B9=E4=B8=BA=E7=A7=9F=E6=88=B7id=EF=BC=8Cpayload?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=A7=9F=E6=88=B7=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/auth/api/pojo/login/LoginUser.java       | 6 +++---
 .../kernel/auth/api/pojo/payload/DefaultJwtPayload.java   | 8 +-------
 .../cn/stylefeng/roses/kernel/auth/auth/LoginService.java | 2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java
index 9a908c738..4714a2174 100644
--- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java
+++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java
@@ -80,10 +80,10 @@ public class LoginUser implements Serializable {
     private Long currentPositionId;
 
     /**
-     * 当前登录租户编码
+     * 当前登录租户id
      */
-    @ChineseDescription("当前登录租户编码")
-    private String tenantCode;
+    @ChineseDescription("当前登录租户id")
+    private Long tenantId;
 
     /**
      * 当前用户语种的标识，例如：chinese，english
diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/payload/DefaultJwtPayload.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/payload/DefaultJwtPayload.java
index 2d78c41da..ef3020926 100644
--- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/payload/DefaultJwtPayload.java
+++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/payload/DefaultJwtPayload.java
@@ -70,11 +70,6 @@ public class DefaultJwtPayload {
      */
     private String caToken;
 
-    /**
-     * 多租户编码
-     */
-    private String tenantCode;
-
     /**
      * 其他载体信息
      */
@@ -83,13 +78,12 @@ public class DefaultJwtPayload {
     public DefaultJwtPayload() {
     }
 
-    public DefaultJwtPayload(Long userId, String account, boolean rememberMe, String caToken, String tenantCode) {
+    public DefaultJwtPayload(Long userId, String account, boolean rememberMe, String caToken) {
         this.userId = userId;
         this.account = account;
         this.uuid = IdUtil.fastUUID();
         this.rememberMe = rememberMe;
         this.caToken = caToken;
-        this.tenantCode = tenantCode;
     }
 
 }
diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginService.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginService.java
index 6c7cff290..798a24f16 100644
--- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginService.java
+++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginService.java
@@ -138,7 +138,7 @@ public class LoginService {
 
         // 8. 生成用户的token
         DefaultJwtPayload defaultJwtPayload = new DefaultJwtPayload(userValidateInfo.getUserId(), loginRequest.getAccount(),
-                loginRequest.getRememberMe(), caToken, loginRequest.getTenantCode());
+                loginRequest.getRememberMe(), caToken);
         String userLoginToken = AuthJwtContext.me().generateTokenDefaultPayload(defaultJwtPayload);
 
         // 9. 创建loginUser对象