修改权限字符匹配方式

RuoYi

2023-11-10 2eaabefeac5122c180c2c3a88ecec80469417372

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java

@@ -4,10 +4,10 @@
import java.util.HashSet;

import java.util.Set;

import org.springframework.util.PatternMatchUtils;

import com.ruoyi.common.core.context.SecurityContextHolder;

import com.ruoyi.common.core.exception.auth.NotLoginException;

import com.ruoyi.common.core.exception.auth.NotPermissionException;

import com.ruoyi.common.core.exception.auth.NotRoleException;

import com.ruoyi.common.core.utils.SecurityUtils;

import com.ruoyi.common.core.utils.SpringUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.security.annotation.Logical;

@@ -15,6 +15,7 @@
import com.ruoyi.common.security.annotation.RequiresPermissions;

import com.ruoyi.common.security.annotation.RequiresRoles;

import com.ruoyi.common.security.service.TokenService;

import com.ruoyi.common.security.utils.SecurityUtils;

import com.ruoyi.system.api.model.LoginUser;



/**

@@ -31,6 +32,27 @@
    private static final String SUPER_ADMIN = "admin";



    public TokenService tokenService = SpringUtils.getBean(TokenService.class);



    /**

     * 会话注销

     */

    public void logout()

    {

        String token = SecurityUtils.getToken();

        if (token == null)

        {

            return;

        }

        logoutByToken(token);

    }



    /**

     * 会话注销，根据指定Token

     */

    public void logoutByToken(String token)

    {

        tokenService.delLoginUser(token);

    }



    /**

     * 检验用户是否已经登录，如未登录，则抛出异常

@@ -52,12 +74,33 @@
        {

            throw new NotLoginException("未提供token");

        }

        LoginUser loginUser = tokenService.getLoginUser(token);

        LoginUser loginUser = SecurityUtils.getLoginUser();

        if (loginUser == null)

        {

            throw new NotLoginException("无效的token");

        }

        return loginUser;

    }



    /**

     * 获取当前用户缓存信息, 如果未登录，则抛出异常

     * 
     * @param token 前端传递的认证信息

     * @return 用户缓存信息

     */

    public LoginUser getLoginUser(String token)

    {

        return tokenService.getLoginUser(token);

    }



    /**

     * 验证当前用户有效期, 如果相差不足120分钟，自动刷新缓存

     * 
     * @param loginUser 当前用户信息

     */

    public void verifyLoginUserExpire(LoginUser loginUser)

    {

        tokenService.verifyToken(loginUser);

    }



    /**

@@ -92,6 +135,7 @@
     */

    public void checkPermi(RequiresPermissions requiresPermissions)

    {

        SecurityContextHolder.setPermission(StringUtils.join(requiresPermissions.value(), ","));

        if (requiresPermissions.logical() == Logical.AND)

        {

            checkPermiAnd(requiresPermissions.value());

@@ -311,7 +355,7 @@
    public boolean hasPermi(Collection<String> authorities, String permission)

    {

        return authorities.stream().filter(StringUtils::hasText)

                .anyMatch(x -> ALL_PERMISSION.contains(x) || PatternMatchUtils.simpleMatch(x, permission));

                .anyMatch(x -> ALL_PERMISSION.equals(x) || PatternMatchUtils.simpleMatch(x, permission));

    }



    /**

@@ -324,6 +368,6 @@
    public boolean hasRole(Collection<String> roles, String role)

    {

        return roles.stream().filter(StringUtils::hasText)

                .anyMatch(x -> SUPER_ADMIN.contains(x) || PatternMatchUtils.simpleMatch(x, role));

                .anyMatch(x -> SUPER_ADMIN.equals(x) || PatternMatchUtils.simpleMatch(x, role));

    }

}