Merge pull request #77 from hocgin/v1.0.17

V1.0.17

Author: hocgin

spring-boot-dynamic-datasource/dynamic-datasource-spring-boot-autoconfigure/src/main/java/in/hocg/boot/dynamic/datasource/autoconfiguration/DynamicDatasourceAutoConfiguration.java

@@ -10,6 +10,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -71,11 +72,13 @@ private DatasourceHelper getDatasourceHelper() {
     }
 
     @Bean
+    @ConditionalOnMissingBean
     public DynamicDatasourceAspect aspect() {
         return new DynamicDatasourceAspect();
     }
 
     @Bean
+    @ConditionalOnMissingBean
     public PlatformTransactionManager transactionManager() {
         return new DataSourceTransactionManager(dataSource());
     }

spring-boot-starters-parent/pom.xml

@@ -26,7 +26,7 @@
     <swagger2.version>1.5.20</swagger2.version>
     <knife4j.version>2.0.4</knife4j.version>
     <redisson.version>3.13.3</redisson.version>
-    <druid.version>1.1.21</druid.version>
+    <druid.version>1.2.5</druid.version>
     <p6spy.version>3.8.7</p6spy.version>
     <rocketmq-spring-boot-starter.version>2.1.0</rocketmq-spring-boot-starter.version>
     <jjwt.version>0.9.1</jjwt.version>