恢复配置文件一致

src/main/resources/application-dev.yml

@@ -26,22 +26,11 @@ spring:
     timeout: 10000
     # mysql数据源
   datasource:
-    dynamic:
-      primary: master
-      datasource:
-        master:
-          type: com.zaxxer.hikari.HikariDataSource
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://127.0.0.1:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
-          username: root
-          password: root123
-          hikari:
-            connection-timeout: 20000             # 是客户端等待连接池连接的最大毫秒数
-            initialSize: 50                       # 连接池初始化连接数
-            maximum-pool-size: 200                # 连接池最大连接数
-            minimum-idle: 10                       # 连接池最小空闲连接数
-            idle-timeout: 300000                  # 允许连接在连接池中空闲的最长时间（以毫秒为单位）
-            max-lifetime: 1200000                 # 是池中连接关闭后的最长生命周期（以毫秒为单位)
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/wvp273数据库统合?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+    username: root
+    password: 12345678
 #[可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
 server:
   port: 18080

src/main/resources/application-docker.yml

@@ -20,23 +20,11 @@ spring:
         timeout: 10000
     # [必选] jdbc数据库配置
     datasource:
-        dynamic:
-            primary: master
-            datasource:
-                master:
-                    type: com.zaxxer.hikari.HikariDataSource
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://127.0.0.1:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
-                    username: root
-                    password: root123
-                    hikari:
-                        connection-timeout: 20000             # 是客户端等待连接池连接的最大毫秒数
-                        initialSize: 50                       # 连接池初始化连接数
-                        maximum-pool-size: 200                # 连接池最大连接数
-                        minimum-idle: 10                       # 连接池最小空闲连接数
-                        idle-timeout: 300000                  # 允许连接在连接池中空闲的最长时间（以毫秒为单位）
-                        max-lifetime: 1200000                 # 是池中连接关闭后的最长生命周期（以毫秒为单位)
-
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        url: jdbc:mysql://127.0.0.1:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
+        username: root
+        password: root123
 # [可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
 server:
     port: 18080

src/main/resources/application.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: wvp
   profiles:
-    active: 273数据库统合
+    active: dev