From ed9b38c1231e3d264534879f9c2e15b49fed38cd Mon Sep 17 00:00:00 2001
From: lijiaqi <lijq@ydool.com>
Date: Sat, 12 Oct 2024 15:18:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=94=A8=E6=88=B7ID=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 LoginDto 中添加构造函数，包含用户ID参数
- 在 AuthController 中返回用户ID
- 在 LoginBo 中添加用户ID字段
---
 .../xingyun/template/inner/bo/auth/LoginBo.java  |  5 +++++
 .../inner/controller/AuthController.java         |  2 +-
 .../xingyun/template/inner/dto/LoginDto.java     | 16 ++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java
index bd4e763..714f982 100644
--- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java
+++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java
@@ -52,6 +52,11 @@ public class LoginBo extends BaseBo<LoginDto> {
     @ApiModelProperty("姓名")
     private String name;
 
+    /**
+     * 用户ID
+     */
+    private String userId;
+
     public UserInfoBo() {
     }
 
diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java
index 2f8bfdc..27146ef 100644
--- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java
+++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java
@@ -470,7 +470,7 @@ public class AuthController extends DefaultBaseController {
     String token = userTokenResolver.getToken();
     ApplicationUtil.publishEvent(new LoginEvent(this, SecurityUtil.getCurrentUser(), token));
 
-    LoginDto dto = new LoginDto(token, user.getName(), user.getPermissions());
+    LoginDto dto = new LoginDto(token, user.getName(), user.getPermissions(), user.getId());
 
     return dto;
   }
diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java
index 09a1a28..b69f867 100644
--- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java
+++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java
@@ -40,6 +40,17 @@ public class LoginDto implements BaseDto, Serializable {
     this.setUser(userInfo);
   }
 
+  public LoginDto(String token, String name, Set<String> roles, String userId) {
+
+    this.token = token;
+    this.setRoles(roles);
+
+    UserInfoDto userInfo = new UserInfoDto();
+    userInfo.setName(name);
+    userInfo.setUserId(userId);
+    this.setUser(userInfo);
+  }
+
   @Data
   public static class UserInfoDto implements BaseDto, Serializable {
 
@@ -49,5 +60,10 @@ public class LoginDto implements BaseDto, Serializable {
      * 姓名
      */
     private String name;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
   }
 }