diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml
index 8661193..aeb211b 100644
--- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml
+++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml
@@ -6,7 +6,7 @@
com.github.drtrang
druid-spring-boot2-actuator
- 1.1.10.1
+ 1.1.10.2
druid-spring-boot2-actuator-autoconfigure
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml b/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml
index 9977d1c..e1adf69 100644
--- a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml
+++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml
@@ -6,7 +6,7 @@
com.github.drtrang
druid-spring-boot2-actuator
- 1.1.10.1
+ 1.1.10.2
druid-spring-boot2-actuator-starter
diff --git a/druid-spring-boot-actuator/pom.xml b/druid-spring-boot-actuator/pom.xml
index 8cf58b1..dcad9b4 100644
--- a/druid-spring-boot-actuator/pom.xml
+++ b/druid-spring-boot-actuator/pom.xml
@@ -6,7 +6,7 @@
com.github.drtrang
druid-spring-boot2-parent
- 1.1.10.1
+ 1.1.10.2
druid-spring-boot2-actuator
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml b/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml
index aa73c04..1d4ffb1 100644
--- a/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml
+++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml
@@ -6,7 +6,7 @@
com.github.drtrang
druid-spring-boot2-example
- 1.1.10.1
+ 1.1.10.2
druid-spring-boot2-jpa-example
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java
index bdafc5f..543bfd2 100644
--- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java
+++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java
@@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j;
public class SpringDataSourceConfig {
/**
- * 自定义 DruidDataSource,所有的数据源都会生效
+ * 定制化 DruidDataSource,所有的数据源都会生效
*
* @return druidDataSourceCustomizer
*/
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml b/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml
index 521d73f..79353ba 100644
--- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml
+++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml
@@ -6,7 +6,7 @@
com.github.drtrang
druid-spring-boot2-example
- 1.1.10.1
+ 1.1.10.2
druid-spring-boot2-mybatis-example
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java
index 38fa6e6..d523ead 100644
--- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java
+++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java
@@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j;
public class SpringDataSourceConfig {
/**
- * 自定义 DruidDataSource,所有的数据源都会生效
+ * 定制化 DruidDataSource,所有的数据源都会生效
*
* @return druidDataSourceCustomizer
*/
diff --git a/druid-spring-boot-example/pom.xml b/druid-spring-boot-example/pom.xml
index 54b2c6b..593ab29 100644
--- a/druid-spring-boot-example/pom.xml
+++ b/druid-spring-boot-example/pom.xml
@@ -6,7 +6,7 @@
com.github.drtrang
druid-spring-boot2-parent
- 1.1.10.1
+ 1.1.10.2
druid-spring-boot2-example
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml b/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml
index bae2144..b56a8b0 100644
--- a/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml
+++ b/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml
@@ -6,7 +6,7 @@
com.github.drtrang
druid-spring-boot2
- 1.1.10.1
+ 1.1.10.2
druid-spring-boot2-autoconfigure
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java
index fd37742..a49cc17 100644
--- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java
+++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java
@@ -129,21 +129,20 @@ public class DruidDataSourceConfiguration {
@Override
public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
if (bean instanceof DruidDataSource) {
+ if (dataSources.isEmpty()) {
+ log.info("druid single data-source({}) init...", beanName);
+ } else {
+ log.info("druid dynamic data-source({}) init...", beanName);
+ }
// 设置 Druid 名称
- ((DruidDataSource) bean).setName(beanName);
+ DruidDataSource druidDataSource = (DruidDataSource) bean;
+ druidDataSource.setName(beanName);
// 将 'spring.datasource.druid.data-sources.${name}' 的配置绑定到 Bean
if (!dataSources.isEmpty()) {
- Binder.get(environment).bind(PREFIX + "." + beanName, Bindable.ofInstance(bean));
- }
- // 用户自定义配置,拥有最高优先级
- for (DruidDataSourceCustomizer customizer : customizers) {
- customizer.customize((DruidDataSource) bean);
- }
- if (dataSources.isEmpty()) {
- log.debug("druid single data-source({}) init...", beanName);
- } else {
- log.debug("druid dynamic data-source({}) init...", beanName);
+ Binder.get(environment).bind(PREFIX + "." + beanName, Bindable.ofInstance(druidDataSource));
}
+ // 定制化配置,拥有最高优先级,会覆盖之前已有的配置
+ customizers.forEach(customizer -> customizer.customize(druidDataSource));
}
return bean;
}
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceCustomizer.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceCustomizer.java
index f62e3a5..b7b4266 100644
--- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceCustomizer.java
+++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceCustomizer.java
@@ -3,14 +3,14 @@ package com.github.trang.druid.autoconfigure;
import com.alibaba.druid.pool.DruidDataSource;
/**
- * DruidDataSource 的回调接口,可以在 DruidDataSource 初始化之前对其进行自定义
+ * DruidDataSource 的回调接口,可以在 DruidDataSource 初始化之前对其进行定制
*
* @author trang
*/
public interface DruidDataSourceCustomizer {
/**
- * 自定义 DruidDataSource
+ * 定制化 DruidDataSource
*
* @param druidDataSource druid 数据源
*/
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java
index 8bf1a79..75687de 100644
--- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java
+++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java
@@ -38,7 +38,7 @@ public class DruidServletConfiguration {
*/
@Bean
public ServletRegistrationBean druidStatViewServlet(DruidDataSourceProperties druidProperties) {
- log.debug("druid stat-view-servlet init...");
+ log.info("druid stat-view-servlet init...");
DruidStatViewServletProperties properties = druidProperties.getStatViewServlet();
ServletRegistrationBean registration = new ServletRegistrationBean<>(new StatViewServlet());
registration.addUrlMappings(properties.getUrlMappings());
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java
index 8786b5f..e25007e 100644
--- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java
+++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java
@@ -59,7 +59,7 @@ public class DruidStatConfiguration {
@Bean
public DefaultAdvisorAutoProxyCreator druidStatProxy() {
- log.debug("druid aop-stat init...");
+ log.info("druid aop-stat init...");
DefaultAdvisorAutoProxyCreator druidStatProxyCreator = new DefaultAdvisorAutoProxyCreator();
druidStatProxyCreator.setProxyTargetClass(proxyTargetClass);
return druidStatProxyCreator;
@@ -80,7 +80,7 @@ public class DruidStatConfiguration {
@Bean
public FilterRegistrationBean druidWebStatFilter(DruidDataSourceProperties druidProperties) {
- log.debug("druid web-stat-filter init...");
+ log.info("druid web-stat-filter init...");
DruidWebStatProperties properties = druidProperties.getWebStat();
FilterRegistrationBean registration = new FilterRegistrationBean<>(new WebStatFilter());
registration.addUrlPatterns(properties.getUrlPatterns());
diff --git a/druid-spring-boot/druid-spring-boot-starter/pom.xml b/druid-spring-boot/druid-spring-boot-starter/pom.xml
index e522912..6032932 100644
--- a/druid-spring-boot/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot/druid-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
com.github.drtrang
druid-spring-boot2
- 1.1.10.1
+ 1.1.10.2
druid-spring-boot2-starter
diff --git a/druid-spring-boot/pom.xml b/druid-spring-boot/pom.xml
index 64c1d4b..8eda377 100644
--- a/druid-spring-boot/pom.xml
+++ b/druid-spring-boot/pom.xml
@@ -6,7 +6,7 @@
com.github.drtrang
druid-spring-boot2-parent
- 1.1.10.1
+ 1.1.10.2
druid-spring-boot2
diff --git a/pom.xml b/pom.xml
index b0aaed2..d949700 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,12 +6,12 @@
com.github.drtrang
parent2
- 1.3.1
+ 1.3.2
com.github.drtrang
druid-spring-boot2-parent
- 1.1.10.1
+ 1.1.10.2
pom
druid-spring-boot2-parent