dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-09-04 11:37:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 修复 三方登录查询用户信息参数错误问题

Browse Source
This commit is contained in:
疯狂的狮子Li
2023-07-31 17:16:43 +08:00
parent 7888b0e857
commit d2f61fc241
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java
View File

@@ -21,6 +21,15 @@ public interface RemoteUserService {
*/
LoginUser getUserInfo(String username, String tenantId) throws UserException;
/**
* 通过用户id查询用户信息
*
* @param userId 用户id
* @param tenantId 租户id
* @return 结果
*/
LoginUser getUserInfo(Long userId, String tenantId) throws UserException;
/**
* 通过手机号查询用户信息
*

2
ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java
View File

@@ -90,7 +90,7 @@ public class SocialAuthStrategy implements IAuthStrategy {
throw new ServiceException("对不起，你没有权限登录当前租户！");
}
LoginUser loginUser = remoteUserService.getUserInfo(socialVo.getUserName(), tenantId);
LoginUser loginUser = remoteUserService.getUserInfo(socialVo.getUserId(), tenantId);
SaLoginModel model = new SaLoginModel();
model.setDevice(client.getDeviceType());
// 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置

20
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
View File

@@ -62,6 +62,26 @@ public class RemoteUserServiceImpl implements RemoteUserService {
return buildLoginUser(userMapper.selectUserByUserName(username));
}
@Override
public LoginUser getUserInfo(Long userId, String tenantId) throws UserException {
SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
.select(SysUser::getUserName, SysUser::getStatus)
.eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
.eq(SysUser::getUserId, userId));
if (ObjectUtil.isNull(sysUser)) {
throw new UserException("user.not.exists", "");
}
if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
throw new UserException("user.blocked", sysUser.getUserName());
}
// 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
// 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
if (TenantHelper.isEnable()) {
return buildLoginUser(userMapper.selectTenantUserByUserName(sysUser.getUserName(), tenantId));
}
return buildLoginUser(userMapper.selectUserByUserName(sysUser.getUserName()));
}
@Override
public LoginUser getUserInfoByPhonenumber(String phonenumber, String tenantId) throws UserException {
SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()