xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-10 03:03:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 优化 登录用户增加昵称返回

Browse Source
This commit is contained in:
疯狂的狮子Li
2023-08-07 18:24:46 +08:00
parent 49f20f7d9f
commit 58e7849fc4
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
View File

@@ -140,6 +140,7 @@ public class SysLoginService {
loginUser.setUserId(user.getUserId()); loginUser.setUserId(user.getUserId());
loginUser.setDeptId(user.getDeptId()); loginUser.setDeptId(user.getDeptId());
loginUser.setUsername(user.getUserName()); loginUser.setUsername(user.getUserName());
loginUser.setNickname(user.getNickName());
loginUser.setUserType(user.getUserType()); loginUser.setUserType(user.getUserType());
loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId())); loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId())); loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));

1
ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java
View File

@@ -52,6 +52,7 @@ public class XcxAuthStrategy implements IAuthStrategy {
loginUser.setTenantId(user.getTenantId()); loginUser.setTenantId(user.getTenantId());
loginUser.setUserId(user.getUserId()); loginUser.setUserId(user.getUserId());
loginUser.setUsername(user.getUserName()); loginUser.setUsername(user.getUserName());
loginUser.setUsername(user.getNickName());
loginUser.setUserType(user.getUserType()); loginUser.setUserType(user.getUserType());
loginUser.setOpenid(openid); loginUser.setOpenid(openid);

5
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java
View File

@@ -97,6 +97,11 @@ public class LoginUser implements Serializable {
*/ */
private String username; private String username;
/**
* 用户昵称
*/
private String nickname;
/** /**
* 角色对象 * 角色对象
*/ */