diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java index b232097..c453575 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java @@ -1,7 +1,7 @@ package com.github.trang.druid.actuate.autoconfigure; -import com.github.trang.druid.actuate.DruidDataSourceMvcEndpoint; import com.github.trang.druid.actuate.DruidDataSourceEndpoint; +import com.github.trang.druid.actuate.DruidDataSourceMvcEndpoint; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java index 9ad3d08..8753c7e 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java @@ -9,12 +9,9 @@ import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallFilter; -import com.github.trang.druid.autoconfigure.datasource.DruidDataSource2; import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -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; @@ -23,14 +20,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.Import; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.*; /** @@ -110,24 +101,4 @@ public class DruidAutoConfiguration { return new CommonsLogFilter(); } - @Bean - @ConditionalOnBean(DruidDataSource.class) - public Map dataSourceMap(ConfigurableListableBeanFactory beanFactory) { - return new HashMap<>(beanFactory.getBeansOfType(DruidDataSource2.class)); - } - - /** - * 为了便于使用,增加数据源集合,可直接注入使用 - * 如需使用 Set、Array 请注入 Set 或 DruidDataSource2[] - * - * @param dataSourceMap 多数据源 - * @return List dataSourceList - */ - @Bean - @ConditionalOnBean(name = "dataSourceMap") - @DependsOn("dataSourceMap") - public List dataSourceList(Map dataSourceMap) { - return new ArrayList<>(dataSourceMap.values()); - } - } \ No newline at end of file