su-lmstack преди 3 години
родител
ревизия
5a9292a149
променени са 2 файла, в които са добавени 24 реда и са изтрити 21 реда
  1. 15 12
      src/main/java/cn/fastfun/config/DataSourceConfig.java
  2. 9 9
      src/main/resources/application-dev.yml

+ 15 - 12
src/main/java/cn/fastfun/config/DataSourceConfig.java

@@ -10,6 +10,7 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -19,17 +20,20 @@ import javax.sql.DataSource;
 @EnableTransactionManagement
 public class DataSourceConfig {
 
+    @Primary
     @Bean
-    @ConfigurationProperties(prefix = "spring.datasource")
+    @Qualifier("oss")
+    @ConfigurationProperties(prefix = "spring.datasource.oss")
     public DataSource druidDataSource() {
         return new DruidDataSource();
     }
 
-//    @Bean
-//    @ConfigurationProperties(prefix = "spring.datasource.runtime")
-//    DataSource runtime() {
-//        return DruidDataSourceBuilder.create().build();
-//    }
+    @Bean
+    @Qualifier("runtime")
+    @ConfigurationProperties(prefix = "spring.datasource.runtime")
+    DataSource runtime() {
+        return DruidDataSourceBuilder.create().build();
+    }
 
     @Bean
     public ServletRegistrationBean druidServlet() {
@@ -45,10 +49,9 @@ public class DataSourceConfig {
         filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
         return filterRegistrationBean;
     }
-//
-//    @Bean
-//    JdbcTemplate jdbcTemplateRuntime(@Qualifier("runtime") DataSource base) {
-//        return new JdbcTemplate(base);
-//    }
-//}
+    //
+    @Bean
+    JdbcTemplate jdbcTemplateRuntime(@Qualifier("runtime") DataSource base) {
+        return new JdbcTemplate(base);
+    }
 }

+ 9 - 9
src/main/resources/application-dev.yml

@@ -2,15 +2,15 @@ server:
   port: 8082
 spring:
   datasource:
-
-    url: jdbc:mysql://47.111.243.220:9306/pdms_oss?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&tinyInt1isBit=false
-    username: root
-    password: Qx123456
-#    runtime:
-#      url: jdbc:mysql://172.16.121.236:3306/fastfun?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-#      username: readonly
-#      password: Fast1234
-#      driverClassName: com.mysql.cj.jdbc.Driver
+    oss:
+      url: jdbc:mysql://47.111.243.220:9306/pdms_oss?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&tinyInt1isBit=false
+      username: root
+      password: Qx123456
+    runtime:
+      url: jdbc:mysql://172.16.121.236:3306/fastfun?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+      username: readonly
+      password: Fast1234
+      driverClassName: com.mysql.cj.jdbc.Driver
   redis:
     host: 47.111.243.220