From 424d9748add1a2ade5ca33e8981e5bc4e7a03ab6 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 09:27:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
admin/src/main/resources/application.yml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml
index 7e498c4..62c443b 100644
--- a/admin/src/main/resources/application.yml
+++ b/admin/src/main/resources/application.yml
@@ -84,6 +84,12 @@
url: jdbc:mysql://${custom.datasource.slave.ip}:${custom.datasource.slave.port}/${custom.datasource.slave.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: ${custom.datasource.slave.username}
password: ${custom.datasource.slave.password}
+ cwsj:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+ enabled: ${custom.datasource.cwsj.enabled}
+ url: jdbc:mysql://${custom.datasource.cwsj.ip}:${custom.datasource.cwsj.port}/${custom.datasource.cwsj.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: ${custom.datasource.cwsj.username}
+ password: ${custom.datasource.cwsj.password}
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
--
Gitblit v1.8.0