Преглед на файлове

回退mysql多数据源

lmstack преди 3 години
родител
ревизия
073ade9d8c

+ 11 - 11
src/main/java/cn/fastfun/config/DataSourceConfig.java

@@ -20,16 +20,16 @@ import javax.sql.DataSource;
 public class DataSourceConfig {
 
     @Bean
-    @ConfigurationProperties(prefix = "spring.datasource.oss")
+    @ConfigurationProperties(prefix = "spring.datasource")
     public DataSource druidDataSource() {
         return new DruidDataSource();
     }
 
-    @Bean
-    @ConfigurationProperties(prefix = "spring.datasource.runtime")
-    DataSource runtime() {
-        return DruidDataSourceBuilder.create().build();
-    }
+//    @Bean
+//    @ConfigurationProperties(prefix = "spring.datasource.runtime")
+//    DataSource runtime() {
+//        return DruidDataSourceBuilder.create().build();
+//    }
 
     @Bean
     public ServletRegistrationBean druidServlet() {
@@ -45,9 +45,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);
+//    }
 }

+ 2 - 2
src/main/java/cn/fastfun/controller/api/IndexController.java

@@ -38,8 +38,8 @@ public class IndexController {
     @Resource(name = "appDeviceService")
     AppDeviceService appDeviceService;
 
-    @Resource(name = "jdbcTemplateRuntime")
-    JdbcTemplate jdbcTemplate;
+//    @Resource(name = "jdbcTemplateRuntime")
+//    JdbcTemplate jdbcTemplate;
 
     @Resource
     AppDeviceLogService appDeviceLogService;

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

@@ -2,15 +2,15 @@ server:
   port: 8082
 spring:
   datasource:
-    oss:
-      url: jdbc:mysql://47.111.243.220:9306/pdms_oss?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
-      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
+
+    url: jdbc:mysql://47.111.243.220:9306/pdms_oss?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+    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
     port: 9379