From 73de15331cb383949ae5adc230b208a04d987b37 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 26 十二月 2025 14:23:43 +0800
Subject: [PATCH] Merge branch 'devlop-phyz' of http://47.97.1.152:5880/r/wms-master into devlop-phyz
---
rsf-server/src/main/resources/application-dev.yml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 97089e8..b4140cf 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -14,10 +14,10 @@
# 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
- password: 34821015
+ url: jdbc:mysql://192.168.4.15:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ password: 1234
type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: 5
@@ -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