From 477c18f08b2918f24f56d4e082146cdd35b0264c Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 06 Jun 2024 12:01:50 +0800
Subject: [PATCH] 错误引入信息清除

---
 blade-auth/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/blade-auth/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java b/blade-auth/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java
index 4bd76c2..de74a42 100644
--- a/blade-auth/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java
+++ b/blade-auth/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java
@@ -20,11 +20,10 @@
 import lombok.SneakyThrows;
 import org.springblade.auth.constant.AuthConstant;
 import org.springblade.auth.granter.BladeTokenGranter;
-import org.springblade.auth.service.BladeClientDetailsServiceImpl;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.social.props.SocialProperties;
-import org.springblade.system.user.feign.IUserClient;
 import org.springblade.system.user.service.IUserService;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -35,6 +34,7 @@
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
 import org.springframework.security.oauth2.provider.TokenGranter;
+import org.springframework.security.oauth2.provider.client.JdbcClientDetailsService;
 import org.springframework.security.oauth2.provider.token.TokenEnhancer;
 import org.springframework.security.oauth2.provider.token.TokenEnhancerChain;
 import org.springframework.security.oauth2.provider.token.TokenStore;
@@ -50,7 +50,7 @@
  * @author Chill
  */
 @Order
-@Configuration(proxyBeanMethods = false)
+@Configuration
 @AllArgsConstructor
 @EnableAuthorizationServer
 public class BladeAuthorizationServerConfiguration extends AuthorizationServerConfigurerAdapter {
@@ -101,11 +101,19 @@
 	 */
 	@Override
 	@SneakyThrows
-	public void configure(ClientDetailsServiceConfigurer clients) {
-		BladeClientDetailsServiceImpl clientDetailsService = new BladeClientDetailsServiceImpl(dataSource);
+	public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
+//		BladeClientDetailsServiceImpl clientDetailsService = new BladeClientDetailsServiceImpl(dataSource);
+//		clientDetailsService.setSelectClientDetailsSql(AuthConstant.DEFAULT_SELECT_STATEMENT);
+//		clientDetailsService.setFindClientDetailsSql(AuthConstant.DEFAULT_FIND_STATEMENT);
+		clients.withClientDetails(jdbcClientDetailsService());
+	}
+
+	@Bean
+	public JdbcClientDetailsService jdbcClientDetailsService() {
+		JdbcClientDetailsService clientDetailsService = new JdbcClientDetailsService(dataSource);
 		clientDetailsService.setSelectClientDetailsSql(AuthConstant.DEFAULT_SELECT_STATEMENT);
 		clientDetailsService.setFindClientDetailsSql(AuthConstant.DEFAULT_FIND_STATEMENT);
-		clients.withClientDetails(clientDetailsService);
+		return clientDetailsService;
 	}
 
 	@Override

--
Gitblit v1.9.3