整理数据源配置

guns-admin/src/main/resources/application.yml

@@ -40,29 +40,28 @@ spring:
     url: jdbc:mysql://127.0.0.1:3306/guns?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=UTC
     username: root
     password: root
-    db-name: guns
     filters: wall,mergeStat
 
-#多数据源配置
-guns:
-  muti-datasource:
-    open: false
-    url: jdbc:mysql://127.0.0.1:3306/guns2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=UTC
-    username: root
-    password: root
-    dataSourceNames:
-      - dataSourceGuns
-      - dataSourceBiz
-
 ---
 
 spring:
   profiles: dev
+
+#多数据源情况的配置，注意第一个数据源是guns.datasource
+guns:
   datasource:
     url: jdbc:mysql://127.0.0.1:3306/guns?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=UTC
     username: root
     password: root
     filters: wall,mergeStat
+  muti-datasource:
+    open: false
+    url: jdbc:mysql://127.0.0.1:3306/guns2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=UTC
+    username: root
+    password: root
+    dataSourceNames:
+      - dataSourceGuns
+      - dataSourceBiz
 
 ---
 

guns-core/src/main/java/com/stylefeng/guns/core/config/MultiDataSourceConfig.java

@@ -33,7 +33,7 @@ import java.util.HashMap;
 public class MultiDataSourceConfig {
 
     @Bean
-    @ConfigurationProperties(prefix = "spring.datasource")
+    @ConfigurationProperties(prefix = "guns.datasource")
     public DruidProperties druidProperties() {
         return new DruidProperties();
     }

guns-core/src/main/java/com/stylefeng/guns/core/config/SingleDataSourceConfig.java

@@ -7,6 +7,7 @@ import com.stylefeng.guns.core.config.properties.DruidProperties;
 import com.stylefeng.guns.core.datascope.DataScopeInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -24,7 +25,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 public class SingleDataSourceConfig {
 
     @Bean
-    //@ConfigurationProperties(prefix = "spring.datasource")
+    @ConfigurationProperties(prefix = "spring.datasource")
     public DruidProperties druidProperties() {
         return new DruidProperties();
     }