From 8cad64f69eae9553579933d88502761e3221c080 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Sat, 30 Jul 2022 16:34:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=A4=E8=AF=81=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/config/OAuth2ClientConfig.java       | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/config/OAuth2ClientConfig.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/config/OAuth2ClientConfig.java
index e3e3d9d2..7d7f7ae0 100755
--- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/config/OAuth2ClientConfig.java
+++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/config/OAuth2ClientConfig.java
@@ -4,8 +4,6 @@ package ink.wgink.login.oauth2.client.config;
 import ink.wgink.login.oauth2.client.converter.OAuth2ClientUserAccessTokenConverter;
 import ink.wgink.properties.BaseProperties;
 import ink.wgink.properties.oauth2.client.OAuth2ClientProperties;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
 import org.springframework.context.annotation.Bean;
@@ -46,25 +44,16 @@ public class OAuth2ClientConfig extends WebSecurityConfigurerAdapter {
                 "/wechat-miniapp/**",
                 "/route/file/**",
         };
-        String assetsMatchers = baseProperties.getAssetsMatchers();
-        String[] fullAntMatchers;
-        if (!StringUtils.isBlank(assetsMatchers)) {
-            String[] assetsMatchersArray = baseProperties.getAssetsMatchers().split(",");
-            fullAntMatchers = ArrayUtils.addAll(defaultAntMatchers, assetsMatchersArray);
-        } else {
-            fullAntMatchers = defaultAntMatchers;
-        }
-        http
-                .formLogin()
+        http.formLogin()
                 .defaultSuccessUrl("/authorize", true)
                 .and()
                 .logout().logoutSuccessUrl(oAuth2ClientProperties.getOauthLogout())
                 .and()
-                .authorizeRequests().antMatchers(fullAntMatchers).permitAll()
+                .authorizeRequests().antMatchers(defaultAntMatchers).permitAll()
                 .and()
                 .authorizeRequests()
                 .anyRequest()
-                .access("@rbacService.hasPermission(request, authentication)")
+                .access("@accessWhiteList.hasPermission(request, authentication)")
                 .and()
                 .headers().frameOptions().sameOrigin()
                 .and()