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

update 优化 PermissionService 无实现类也可以启动服务

Browse Source
This commit is contained in:
疯狂的狮子Li
2025-05-29 16:28:09 +08:00
parent 957a4d1fcd
commit d22b2a10df
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java
View File

@@ -4,10 +4,11 @@ import cn.dev33.satoken.stp.StpInterface;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.enums.UserType; import org.dromara.common.core.enums.UserType;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.PermissionService; import org.dromara.common.core.service.PermissionService;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -19,9 +20,6 @@ import java.util.List;
*/ */
public class SaPermissionImpl implements StpInterface { public class SaPermissionImpl implements StpInterface {
@Autowired
private PermissionService permissionService;
/** /**
* 获取菜单权限列表 * 获取菜单权限列表
*/ */
@@ -29,8 +27,13 @@ public class SaPermissionImpl implements StpInterface {
public List<String> getPermissionList(Object loginId, String loginType) { public List<String> getPermissionList(Object loginId, String loginType) {
LoginUser loginUser = LoginHelper.getLoginUser(); LoginUser loginUser = LoginHelper.getLoginUser();
if (ObjectUtil.isNull(loginUser) || !loginUser.getLoginId().equals(loginId)) { if (ObjectUtil.isNull(loginUser) || !loginUser.getLoginId().equals(loginId)) {
List<String> list = StringUtils.splitList(loginId.toString(), ":"); PermissionService permissionService = getPermissionService();
return new ArrayList<>(permissionService.getMenuPermission(Long.parseLong(list.get(1)))); if (ObjectUtil.isNotNull(permissionService)) {
List<String> list = StringUtils.splitList(loginId.toString(), ":");
return new ArrayList<>(permissionService.getMenuPermission(Long.parseLong(list.get(1))));
} else {
throw new ServiceException("PermissionService 实现类不存在");
}
} }
UserType userType = UserType.getUserType(loginUser.getUserType()); UserType userType = UserType.getUserType(loginUser.getUserType());
if (userType == UserType.APP_USER) { if (userType == UserType.APP_USER) {
@@ -47,8 +50,13 @@ public class SaPermissionImpl implements StpInterface {
public List<String> getRoleList(Object loginId, String loginType) { public List<String> getRoleList(Object loginId, String loginType) {
LoginUser loginUser = LoginHelper.getLoginUser(); LoginUser loginUser = LoginHelper.getLoginUser();
if (ObjectUtil.isNull(loginUser) || !loginUser.getLoginId().equals(loginId)) { if (ObjectUtil.isNull(loginUser) || !loginUser.getLoginId().equals(loginId)) {
List<String> list = StringUtils.splitList(loginId.toString(), ":"); PermissionService permissionService = getPermissionService();
return new ArrayList<>(permissionService.getRolePermission(Long.parseLong(list.get(1)))); if (ObjectUtil.isNotNull(permissionService)) {
List<String> list = StringUtils.splitList(loginId.toString(), ":");
return new ArrayList<>(permissionService.getRolePermission(Long.parseLong(list.get(1))));
} else {
throw new ServiceException("PermissionService 实现类不存在");
}
} }
UserType userType = UserType.getUserType(loginUser.getUserType()); UserType userType = UserType.getUserType(loginUser.getUserType());
if (userType == UserType.APP_USER) { if (userType == UserType.APP_USER) {
@@ -57,4 +65,13 @@ public class SaPermissionImpl implements StpInterface {
// SYS_USER 默认返回权限 // SYS_USER 默认返回权限
return new ArrayList<>(loginUser.getRolePermission()); return new ArrayList<>(loginUser.getRolePermission());
} }
private PermissionService getPermissionService() {
try {
return SpringUtils.getBean(PermissionService.class);
} catch (Exception e) {
return null;
}
}
} }