cachecloud 3.3

sohutv · Jun 26, 2024 · 0f7e0a0 · 0f7e0a0
1 parent fde57c2
commit 0f7e0a0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/cachecloud-web/sql/3.3.sql b/cachecloud-web/sql/3.3.sql
@@ -1762,7 +1762,7 @@ CREATE TABLE `app_import` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
----------------------------新增加的表---------------------------
+--  -------------------------新增加的表---------------------------
 --
 -- Table structure for table `app_biz`
 --

diff --git a/cachecloud-web/src/main/resources/application-local.yml b/cachecloud-web/src/main/resources/application-local.yml
@@ -17,11 +17,11 @@ server:
 
 cachecloud:
   primary:
-    url: jdbc:mysql://127.0.0.1:3306/cachecloud_open?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&connectTimeout=3000&socketTimeout=10000&serverTimezone=Asia/Shanghai
-    user: cachecloud-open
+    jdbcUrl: jdbc:mysql://127.0.0.1:3306/cachecloud_open?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&connectTimeout=3000&socketTimeout=10000&serverTimezone=Asia/Shanghai
+    username: cachecloud-open
     password: cachecloud-open
-    initialPoolSize: 1
-    maxPoolSize: 3
+    minimumIdle: 1
+    maximumPoolSize: 3
   redis: #配置cachecloud-web需要的redis，用户存储任务流log
     enable: true #if config redis, suggest config true
     main:

diff --git a/cachecloud-web/src/main/resources/application-online.yml b/cachecloud-web/src/main/resources/application-online.yml
@@ -12,11 +12,11 @@ server:
 
 cachecloud:
   primary:
-    url: jdbc:mysql://127.0.0.1:3306/cachecloud-open?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&connectTimeout=3000&socketTimeout=10000&serverTimezone=Asia/Shanghai
-    user: cachecloud-open
+    jdbcUrl: jdbc:mysql://127.0.0.1:3306/cachecloud-open?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&connectTimeout=3000&socketTimeout=10000&serverTimezone=Asia/Shanghai
+    username: cachecloud-open
     password: cachecloud-open
-    initialPoolSize: 10
-    maxPoolSize: 50
+    minimumIdle: 10
+    maximumPoolSize: 50
   redis: #配置cachecloud-web需要的redis，用户存储任务流log
     enable: true #if config redis, suggest config true
     main:

diff --git a/cachecloud-web/src/main/resources/application-open.yml b/cachecloud-web/src/main/resources/application-open.yml
@@ -12,11 +12,11 @@ server:
 
 cachecloud:
   primary:
-    url: jdbc:mysql://127.0.0.1:3306/cachecloud-open?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&connectTimeout=3000&socketTimeout=10000&serverTimezone=Asia/Shanghai
-    user: cachecloud-open
+    jdbcUrl: jdbc:mysql://127.0.0.1:3306/cachecloud-open?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&connectTimeout=3000&socketTimeout=10000&serverTimezone=Asia/Shanghai
+    username: cachecloud-open
     password: cachecloud-open
-    initialPoolSize: 10
-    maxPoolSize: 50
+    minimumIdle: 10
+    maximumPoolSize: 50
   redis: #配置cachecloud-web需要的redis，用户存储任务流log
     enable: true #if config redis, suggest config true
     main:

diff --git a/cachecloud-web/src/main/resources/application-test.yml b/cachecloud-web/src/main/resources/application-test.yml
@@ -12,11 +12,11 @@ server:
 
 cachecloud:
   primary:
-    url: jdbc:mysql://127.0.0.1:3306/cachecloud-open?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&connectTimeout=3000&socketTimeout=10000&serverTimezone=Asia/Shanghai
-    user: cachecloud-open
+    jdbcUrl: jdbc:mysql://127.0.0.1:3306/cachecloud-open?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&connectTimeout=3000&socketTimeout=10000&serverTimezone=Asia/Shanghai
+    username: cachecloud-open
     password: cachecloud-open
-    initialPoolSize: 3
-    maxPoolSize: 20
+    minimumIdle: 3
+    maximumPoolSize: 20
   redis: #配置cachecloud-web需要的redis，用户存储任务流log
     enable: true #if config redis, suggest config true
     main:

diff --git a/cachecloud-web/src/main/resources/application.yml b/cachecloud-web/src/main/resources/application.yml
@@ -40,7 +40,7 @@ spring:
       force: true
 cachecloud:
   primary:
-    driver: com.mysql.cj.jdbc.Driver
+    driverClassName: com.mysql.cj.jdbc.Driver
     validationQuery: select 1 from dual
     connectionTimeout: 60000
     idleTimeout: 600000