From 2db2c1328008ae399d8d7af56c9c6dc67a47bce8 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 01 十一月 2025 11:22:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

---
 rsf-server/src/main/resources/application-dev.yml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 97089e8..ae81f9b 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -14,9 +14,9 @@
 #    url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
 #    username: rsf
     username: root
-#    url: jdbc:mysql://10.10.10.200:3306/rsf-xiri?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
 #    password: xltys1995
-    url: jdbc:mysql://127.0.0.1:3306/rsf-xiri?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
     password: 34821015
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
@@ -30,7 +30,7 @@
       test-on-borrow: true
       test-on-return: false
       remove-abandoned: true
-      remove-abandoned-timeout: 18
+      remove-abandoned-timeout: 1800
       #pool-prepared-statements: false
       #max-pool-prepared-statement-per-connection-size: 20
       filters: stat, wall

--
Gitblit v1.9.1