修改权限字符匹配方式

RuoYi

2023-11-10 2eaabefeac5122c180c2c3a88ecec80469417372

修改权限字符匹配方式

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

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

    }



    /**

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

    }

}


 ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java

@@ -45,7 +45,7 @@
            ServerHttpRequest request = exchange.getRequest();



            // 非登录/注册请求或验证码关闭，不处理

            if (!StringUtils.containsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL) || !captchaProperties.getEnabled())

            if (!StringUtils.equalsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL) || !captchaProperties.getEnabled())

            {

                return chain.filter(exchange);

            }