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

记录调拨用途到录入表

su-lmstack преди 3 години
родител
ревизия
427ea254f8
променени са 2 файла, в които са добавени 20 реда и са изтрити 19 реда
  1. 11 10
      src/main/java/cn/fastfun/config/DataSourceConfig.java
  2. 9 9
      src/main/resources/application-dev.yml

+ 11 - 10
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() {
@@ -46,8 +46,9 @@ public class DataSourceConfig {
         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:
-    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
+
+    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