优化代码

RuoYi

2025-12-04 90cbabb7a7a4b0dc5cf76f926b6cd63b989099f4

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

@@ -4,6 +4,7 @@
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;

@@ -93,7 +94,7 @@
    }



    /**

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

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

     * 

     * @param loginUser 当前用户信息

     */

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

    public void checkPermi(RequiresPermissions requiresPermissions)

    {

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

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

        {

            checkPermiAnd(requiresPermissions.value());

@@ -353,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));

    }



    /**

@@ -366,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));

    }

}