* 代码整理

bes2008 · Jan 14, 2021 · 3129b57 · 3129b57
1 parent 2077605
commit 3129b57
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...ain/java/com/jn/sqlhelper/datasource/spring/boot/DynamicDataSourcesAutoConfiguration.java b/...ain/java/com/jn/sqlhelper/datasource/spring/boot/DynamicDataSourcesAutoConfiguration.java
@@ -104,7 +104,7 @@ public DynamicDataSourcesProperties namedDataSourcesProperties(Environment envir
     @Bean(name = "dataSourcesFactoryBean")
     public ListFactoryBean dataSourcesFactoryBean(
             final CentralizedDataSourceFactory centralizedDataSourceFactory,
-            DynamicDataSourcesProperties namedDataSourcesProperties,
+            DynamicDataSourcesProperties dynamicDataSourcesProperties,
             // 该参数只是为了兼容Spring Boot 默认的 DataSource配置而已
             ObjectProvider<DataSource> springBootOriginDataSourceProvider,
             ObjectProvider<org.springframework.boot.autoconfigure.jdbc.DataSourceProperties> builtInDataSourceProperties,
@@ -123,7 +123,7 @@ public ListFactoryBean dataSourcesFactoryBean(
             }
         }
 
-        List<DataSourceProperties> dataSourcePropertiesList = namedDataSourcesProperties.getDatasources();
+        List<DataSourceProperties> dataSourcePropertiesList = dynamicDataSourcesProperties.getDatasources();
 
         // spring bean factory
         final AbstractAutowireCapableBeanFactory beanFactory = ((AbstractAutowireCapableBeanFactory) applicationContext.getAutowireCapableBeanFactory());

diff --git a/.../main/java/com/jn/sqlhelper/datasource/spring/boot/SpringDataSourcePropertiesAdapter.java b/.../main/java/com/jn/sqlhelper/datasource/spring/boot/SpringDataSourcePropertiesAdapter.java
@@ -28,6 +28,7 @@
  * @since 3.4.1
  */
 public class SpringDataSourcePropertiesAdapter {
+
     public static com.jn.sqlhelper.datasource.config.DataSourceProperties adapt(DataSourceProperties properties) {
         com.jn.sqlhelper.datasource.config.DataSourceProperties dataSourceProperties = new com.jn.sqlhelper.datasource.config.DataSourceProperties();
         dataSourceProperties.setUsername(properties.getUsername());