From c380b776178ad0e51f6ed183302fe71af76c1059 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 19 八月 2021 17:33:46 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
index 0cda991..cb10de0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
@@ -1,12 +1,13 @@
package com.ruoyi.framework.web.service;
-import cn.hutool.core.lang.Validator;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import java.util.Set;
@@ -28,9 +29,6 @@
private static final String PERMISSION_DELIMETER = ",";
- @Autowired
- private TokenService tokenService;
-
/**
* 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
*
@@ -39,12 +37,12 @@
*/
public boolean hasPermi(String permission)
{
- if (Validator.isEmpty(permission))
+ if (StringUtils.isEmpty(permission))
{
return false;
}
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- if (Validator.isNull(loginUser) || Validator.isEmpty(loginUser.getPermissions()))
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
{
return false;
}
@@ -70,12 +68,12 @@
*/
public boolean hasAnyPermi(String permissions)
{
- if (Validator.isEmpty(permissions))
+ if (StringUtils.isEmpty(permissions))
{
return false;
}
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- if (Validator.isNull(loginUser) || Validator.isEmpty(loginUser.getPermissions()))
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
{
return false;
}
@@ -98,12 +96,12 @@
*/
public boolean hasRole(String role)
{
- if (Validator.isEmpty(role))
+ if (StringUtils.isEmpty(role))
{
return false;
}
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- if (Validator.isNull(loginUser) || Validator.isEmpty(loginUser.getUser().getRoles()))
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
{
return false;
}
@@ -137,12 +135,12 @@
*/
public boolean hasAnyRoles(String roles)
{
- if (Validator.isEmpty(roles))
+ if (StringUtils.isEmpty(roles))
{
return false;
}
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- if (Validator.isNull(loginUser) || Validator.isEmpty(loginUser.getUser().getRoles()))
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
{
return false;
}
--
Gitblit v1.9.3