修改DataSource注入后实例化Security以及Oauth的Jdbc相关配置

Author: hengboy

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerJdbcAutoConfiguration.java

@@ -18,6 +18,7 @@
 
 import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -47,6 +48,7 @@
 @Configuration
 @EnableConfigurationProperties(ApiBootOauthProperties.class)
 @EnableAuthorizationServer
+@ConditionalOnBean(DataSource.class)
 @ConditionalOnClass(ApiBootAuthorizationServerConfiguration.class)
 @ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "jdbc")
 @AutoConfigureAfter(DataSourceAutoConfiguration.class)

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityJdbcAutoConfiguration.java

@@ -21,8 +21,11 @@
 import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootStoreDelegate;
 import org.minbox.framework.api.boot.plugin.security.userdetails.ApiBootUserDetailsService;
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -32,6 +35,8 @@
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.access.AccessDeniedHandler;
 
+import javax.sql.DataSource;
+
 import static org.minbox.framework.api.boot.autoconfigure.security.ApiBootSecurityProperties.API_BOOT_SECURITY_PREFIX;
 
 /**
@@ -50,8 +55,11 @@
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 @EnableConfigurationProperties(ApiBootSecurityProperties.class)
 @ConditionalOnClass(ApiBootWebSecurityConfiguration.class)
+@ConditionalOnBean(DataSource.class)
 @ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "jdbc")
+@AutoConfigureAfter(DataSourceAutoConfiguration.class)
 public class ApiBootWebSecurityJdbcAutoConfiguration extends ApiBootWebSecurityAutoConfiguration {
+
     public ApiBootWebSecurityJdbcAutoConfiguration(ApiBootSecurityProperties apiBootSecurityProperties, ObjectProvider<AccessDeniedHandler> accessDeniedHandler, ObjectProvider<AuthenticationEntryPoint> authenticationEntryPoint) {
         super(apiBootSecurityProperties, accessDeniedHandler.getIfAvailable(), authenticationEntryPoint.getIfAvailable());
     }
@@ -69,7 +77,7 @@ protected UserDetailsService userDetailsService() {
      */
     @Bean
     @ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "enable-default-store-delegate", havingValue = "true", matchIfMissing = true)
-    public ApiBootStoreDelegate apiBootStoreDelegate() {
-        return new ApiBootDefaultStoreDelegate();
+    public ApiBootStoreDelegate apiBootStoreDelegate(DataSource dataSource) {
+        return new ApiBootDefaultStoreDelegate(dataSource);
     }
 }