DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重新构建用户登录生成token

Browse Source
This commit is contained in:
Joshi
2025-07-11 17:55:33 +08:00
parent 3652896470
commit 20edf904bc
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fad-app/src/main/java/com/ruoyi/fadapp/service/impl/FadAppAuthServiceImpl.java
View File

@@ -1,6 +1,9 @@
package com.ruoyi.fadapp.service.impl; package com.ruoyi.fadapp.service.impl;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.core.domain.dto.RoleDTO;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.DeviceType; import com.ruoyi.common.enums.DeviceType;
@@ -16,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.Duration; import java.time.Duration;
import java.util.List;
/** /**
* FAD APP认证服务实现类 * FAD APP认证服务实现类
@@ -152,6 +156,18 @@ public class FadAppAuthServiceImpl implements IFadAppAuthService {
/** /**
* 构建登录用户 * 构建登录用户
*/ */
// private LoginUser buildLoginUser(SysUser user) {
// LoginUser loginUser = new LoginUser();
// loginUser.setUserId(user.getUserId());
// loginUser.setDeptId(user.getDeptId());
// loginUser.setUsername(user.getUserName());
// loginUser.setNickName(user.getNickName());
// loginUser.setUserType(user.getUserType());
// loginUser.setMenuPermission(permissionService.getMenuPermission(user));
// loginUser.setRolePermission(permissionService.getRolePermission(user));
// loginUser.setDeptName(user.getDept() != null ? user.getDept().getDeptName() : "");
// return loginUser;
// }
private LoginUser buildLoginUser(SysUser user) { private LoginUser buildLoginUser(SysUser user) {
LoginUser loginUser = new LoginUser(); LoginUser loginUser = new LoginUser();
loginUser.setUserId(user.getUserId()); loginUser.setUserId(user.getUserId());
@@ -161,7 +177,9 @@ public class FadAppAuthServiceImpl implements IFadAppAuthService {
loginUser.setUserType(user.getUserType()); loginUser.setUserType(user.getUserType());
loginUser.setMenuPermission(permissionService.getMenuPermission(user)); loginUser.setMenuPermission(permissionService.getMenuPermission(user));
loginUser.setRolePermission(permissionService.getRolePermission(user)); loginUser.setRolePermission(permissionService.getRolePermission(user));
loginUser.setDeptName(user.getDept() != null ? user.getDept().getDeptName() : ""); loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());
List<RoleDTO> roles = BeanUtil.copyToList(user.getRoles(), RoleDTO.class);
loginUser.setRoles(roles);
return loginUser; return loginUser;
} }
} }