mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2025-09-24 07:19:46 +08:00
update 适配单体系与多体系用户权限
This commit is contained in:
@ -4,7 +4,9 @@ import cn.dev33.satoken.stp.StpUtil;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.core.service.LogininforService;
|
||||
import com.ruoyi.common.enums.DeviceType;
|
||||
import com.ruoyi.common.enums.UserStatus;
|
||||
import com.ruoyi.common.enums.UserType;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.exception.user.CaptchaException;
|
||||
import com.ruoyi.common.exception.user.CaptchaExpireException;
|
||||
@ -72,7 +74,7 @@ public class SysLoginService {
|
||||
asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
|
||||
recordLoginInfo(user.getUserId());
|
||||
// 生成token
|
||||
StpUtil.login(user.getUserId(), "PC");
|
||||
LoginUtils.loginByDevice(user.getUserId(), UserType.SYS_USER, DeviceType.PC);
|
||||
return StpUtil.getTokenValue();
|
||||
}
|
||||
|
||||
|
@ -2,6 +2,8 @@ package com.ruoyi.system.service.impl;
|
||||
|
||||
import cn.dev33.satoken.stp.StpInterface;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.enums.UserType;
|
||||
import com.ruoyi.common.utils.LoginUtils;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
import com.ruoyi.system.service.SysPermissionService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@ -21,16 +23,30 @@ public class SaInterfaceImpl implements StpInterface {
|
||||
|
||||
@Override
|
||||
public List<String> getPermissionList(Object loginId, String loginType) {
|
||||
SysUser user = iSysUserService.getById(loginId.toString());
|
||||
Set<String> menuPermission = sysPermissionService.getMenuPermission(user);
|
||||
//采用的是用户里自带的权限,实现一次性访问reids,进行判断是否可以访问
|
||||
return new ArrayList<>(menuPermission);
|
||||
UserType userType = LoginUtils.getUserType(loginId);
|
||||
if (userType == UserType.SYS_USER) {
|
||||
Long userId = LoginUtils.getUserId();
|
||||
SysUser user = iSysUserService.getById(userId);
|
||||
Set<String> menuPermission = sysPermissionService.getMenuPermission(user);
|
||||
//采用的是用户里自带的权限,实现一次性访问reids,进行判断是否可以访问
|
||||
return new ArrayList<>(menuPermission);
|
||||
} else if (userType == UserType.APP_USER) {
|
||||
// app端权限返回 自行根据业务编写
|
||||
}
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getRoleList(Object loginId, String loginType) {
|
||||
SysUser user = iSysUserService.getById(loginId.toString());
|
||||
Set<String> rolePermission = sysPermissionService.getRolePermission(user);
|
||||
return new ArrayList<>(rolePermission);
|
||||
UserType userType = LoginUtils.getUserType(loginId);
|
||||
if (userType == UserType.SYS_USER) {
|
||||
Long userId = LoginUtils.getUserId();
|
||||
SysUser user = iSysUserService.getById(userId);
|
||||
Set<String> rolePermission = sysPermissionService.getRolePermission(user);
|
||||
return new ArrayList<>(rolePermission);
|
||||
} else if (userType == UserType.APP_USER) {
|
||||
// app端权限返回 自行根据业务编写
|
||||
}
|
||||
return new ArrayList<>();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user