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 getUserInfo() { - SystemUserInfoVo userInfoVo = systemAuthService.getCurrentUserInfoVo(); + public ResponseEntity 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 getCaptchaInfo() {