From 54cae0855b747431eacd9b73effb74e4d36ea491 Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Tue, 6 Jan 2026 21:15:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor(auth):=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AE=A4=E8=AF=81=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/odboy/system/controller/SystemUserController.java  | 5 +++--
 .../java/cn/odboy/system/service/SystemAuthService.java   | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
index 34d8e05f..942b1bb5 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
@@ -22,6 +22,7 @@ import cn.odboy.system.dal.dataobject.SystemUserTb;
 import cn.odboy.system.dal.model.SystemQueryUserArgs;
 import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs;
 import cn.odboy.system.dal.model.SystemUserInfoVo;
+import cn.odboy.system.dal.model.SystemUserJwtVo;
 import cn.odboy.system.dal.model.SystemUserVo;
 import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
@@ -151,8 +152,8 @@ public class SystemUserController {
 
   @ApiOperation("获取用户信息")
   @PostMapping(value = "/getCurrentUserInfo")
-  public ResponseEntity<SystemUserInfoVo> getUserInfo() {
-    SystemUserInfoVo userInfoVo = systemAuthService.getCurrentUserInfoVo();
+  public ResponseEntity<SystemUserJwtVo> getUserInfo() {
+    SystemUserJwtVo userInfoVo = systemAuthService.getCurrentUserInfo();
     return ResponseEntity.ok(userInfoVo);
   }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java
index 8b048de8..a062aa9c 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java
@@ -83,10 +83,12 @@ public class SystemAuthService {
     return authInfo;
   }
 
-  public SystemUserInfoVo getCurrentUserInfoVo() {
+  public SystemUserJwtVo getCurrentUserInfo() {
     SystemUserJwtVo jwtUser = (SystemUserJwtVo) KitSecurityHelper.getCurrentUser();
-    // 转换是为了去掉密码
-    return KitBeanUtil.copyToClass(jwtUser, SystemUserInfoVo.class);
+    if (jwtUser.getUser() != null) {
+      jwtUser.getUser().setPassword(null);
+    }
+    return jwtUser;
   }
 
   public Map<String, Object> getCaptchaInfo() {