From af0aa425c266cc2dba28480f1cc18d05151c14f5 Mon Sep 17 00:00:00 2001
From: Jie Zheng <201507802@qq.com>
Date: Tue, 18 Feb 2025 15:55:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4JwtUserDto=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=AF=86=E7=A0=81=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=AA=8C=E8=AF=81=E5=AF=86=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhengjie/modules/security/rest/AuthController.java |  4 ----
 .../security/service/UserDetailsServiceImpl.java       |  2 +-
 .../modules/security/service/dto/JwtUserDto.java       | 10 ++++++----
 .../java/me/zhengjie/modules/system/domain/User.java   |  2 --
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthController.java
index 5e6ddc0..5e75c1b 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthController.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthController.java
@@ -101,8 +101,6 @@ public class AuthController {
         SecurityContextHolder.getContext().setAuthentication(authentication);
         // 生成令牌
         String token = tokenProvider.createToken(jwtUser);
-        // 将密码设置为空
-        jwtUser.setPassword(null);
         // 返回 token 与 用户信息
         Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
             put("token", properties.getTokenStartWith() + token);
@@ -122,8 +120,6 @@ public class AuthController {
     @GetMapping(value = "/info")
     public ResponseEntity<UserDetails> getUserInfo() {
         JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser();
-        // 将密码设置为空
-        jwtUser.setPassword(null);
         return ResponseEntity.ok(jwtUser);
     }
 
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java
index 7d6eb09..5780974 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java
@@ -55,7 +55,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
                 // 获取用户的权限
                 List<AuthorityDto> authorities = roleService.buildPermissions(user);
                 // 初始化JwtUserDto
-                jwtUserDto = new JwtUserDto(user, dataService.getDeptIds(user), authorities, user.getPassword());
+                jwtUserDto = new JwtUserDto(user, dataService.getDeptIds(user), authorities);
                 // 添加缓存数据
                 userCacheManager.addUserCache(username, jwtUserDto);
             }
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java
index 588770e..610449b 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java
@@ -43,14 +43,16 @@ public class JwtUserDto implements UserDetails {
     @ApiModelProperty(value = "角色")
     private final List<AuthorityDto> authorities;
 
-    @Setter
-    @ApiModelProperty(value = "密码")
-    private String password;
-
     public Set<String> getRoles() {
         return authorities.stream().map(AuthorityDto::getAuthority).collect(Collectors.toSet());
     }
 
+    @Override
+    @JSONField(serialize = false)
+    public String getPassword() {
+        return user.getPassword();
+    }
+
     @Override
     @JSONField(serialize = false)
     public String getUsername() {
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java
index 2ddce17..1753e15 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java
@@ -15,7 +15,6 @@
  */
 package me.zhengjie.modules.system.domain;
 
-import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -88,7 +87,6 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "头像存储的路径", hidden = true)
     private String avatarPath;
 
-    @JSONField(serialize = false)
     @ApiModelProperty(value = "密码")
     private String password;