From fd3d33be235aa9868c626775da70334c04ff44ce Mon Sep 17 00:00:00 2001 From: trang Date: Mon, 27 Nov 2017 17:14:42 +0800 Subject: [PATCH] set druidName to beanName --- .../autoconfigure/DruidDataSourceConfiguration.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 3b8fca6..1d8272c 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 @@ -128,6 +128,8 @@ public class DruidDataSourceConfiguration { @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof DruidDataSource) { + // 设置 Druid 名称 + ((DruidDataSource) bean).setName(beanName); // 将 'spring.datasource.druid.data-sources.${name}' 的配置绑定到 Bean if (!resolver.getSubProperties(EMPTY).isEmpty()) { PropertySourcesBinder binder = new PropertySourcesBinder(environment); @@ -139,7 +141,12 @@ public class DruidDataSourceConfiguration { customizer.customize((DruidDataSource) bean); } } - log.debug("druid {}-data-source init...", beanName); + boolean isSingle = BEAN_NAME.equals(beanName); + if (isSingle) { + log.debug("druid data-source init..."); + } else { + log.debug("druid {}-data-source init...", beanName); + } } return bean; }