From 521959e291147717c8b0258dbf6a076e4b04d8cd Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 14 七月 2026 15:56:06 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
ruoyi-admin/src/main/resources/application-hzszlyy.yml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-hzszlyy.yml b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
index c60e4d8..b81265f 100644
--- a/ruoyi-admin/src/main/resources/application-hzszlyy.yml
+++ b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
@@ -6,14 +6,14 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://192.169.129.197:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.169.129.197:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=600000&socketTimeout=1200000
username: smartor
password: smartor
driverClassName: com.mysql.cj.jdbc.Driver
# 浠庡簱鏁版嵁婧�
slave:
enabled: true
- url: jdbc:oracle:thin:@//192.200.85.40:1521/hzsyhis?useUnicode=true&characterEncoding=GBK
+ url: jdbc:oracle:thin:@//192.200.85.40:1521/hzsyhis?useUnicode=true&characterEncoding=GBK&connectTimeout=600000&socketTimeout=1200000
username: wssf
password: Hzsywssf
driver-class-name: oracle.jdbc.OracleDriver
--
Gitblit v1.9.3