From a5fac95408a43ad43de9d88c30d06c0918c7bc8f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 29 May 2024 11:14:44 +0800
Subject: [PATCH] 配置调整
---
src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java b/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java
index fe6070c..1166de5 100644
--- a/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java
+++ b/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java
@@ -4,10 +4,11 @@
import lombok.SneakyThrows;
import org.springblade.auth.constant.AuthConstant;
import org.springblade.auth.granter.BladeTokenGranter;
-import org.springblade.auth.service.BladeClientDetailsServiceImpl;
+//import org.springblade.auth.service.BladeClientDetailsServiceImpl;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.social.props.SocialProperties;
import org.springblade.modules.system.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;
@@ -18,6 +19,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;
@@ -33,7 +35,7 @@
* @author Chill
*/
@Order
-@Configuration(proxyBeanMethods = false)
+@Configuration
@AllArgsConstructor
@EnableAuthorizationServer
public class BladeAuthorizationServerConfiguration extends AuthorizationServerConfigurerAdapter {
@@ -79,16 +81,24 @@
}
}
+ @Bean
+ public JdbcClientDetailsService jdbcClientDetailsService() {
+ JdbcClientDetailsService clientDetailsService = new JdbcClientDetailsService(dataSource);
+ clientDetailsService.setSelectClientDetailsSql(AuthConstant.DEFAULT_SELECT_STATEMENT);
+ clientDetailsService.setFindClientDetailsSql(AuthConstant.DEFAULT_FIND_STATEMENT);
+ return clientDetailsService;
+ }
+
+
/**
* 配置客户端信息
*/
@Override
- @SneakyThrows
- public void configure(ClientDetailsServiceConfigurer clients) {
- BladeClientDetailsServiceImpl clientDetailsService = new BladeClientDetailsServiceImpl(dataSource);
- clientDetailsService.setSelectClientDetailsSql(AuthConstant.DEFAULT_SELECT_STATEMENT);
- clientDetailsService.setFindClientDetailsSql(AuthConstant.DEFAULT_FIND_STATEMENT);
- clients.withClientDetails(clientDetailsService);
+ 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());
}
@Override
--
Gitblit v1.9.3