From 3d3fa72ebf55f841c8ede01c59347af5e44b773b Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
admin/src/main/resources/application-custom.yml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/admin/src/main/resources/application-custom.yml b/admin/src/main/resources/application-custom.yml
index 2ed80a4..51db08d 100644
--- a/admin/src/main/resources/application-custom.yml
+++ b/admin/src/main/resources/application-custom.yml
@@ -15,7 +15,7 @@
userLockExpireTime: 60
#涓婁紶涓嬭浇 鐩稿叧閰嶇疆
upload:
- profile: /Users/xiongbenda/Desktop/temp/uploadPath #涓婁紶鐩綍
+ profile: D:\temp\uploadPath #涓婁紶鐩綍
temp: temp #涓存椂鏂囦欢澶�
multipart:
max-file-size: 2GB # 鍗曚釜鏂囦欢澶у皬
@@ -30,7 +30,7 @@
master: #涓绘暟鎹簱
ip: 61.143.42.70 # IP
port: 7006 #绔彛
- database: ruoyi-base #鏁版嵁搴撳悕
+ database: ygawly_cwgl_test #鏁版嵁搴撳悕
username: root #鐢ㄦ埛鍚�
password: ms@123 #瀵嗙爜
slave: #浠庢暟鎹簱
@@ -40,6 +40,13 @@
database: #鏁版嵁搴撳悕
username: #鐢ㄦ埛鍚�
password: #瀵嗙爜
+ cwsj: #浠庢暟鎹簱
+ enabled: true #鏄惁寮�鍚粠鏁版嵁搴� 鍏抽棴鏃朵互涓嬩俊鎭彲浠ヤ笉鐢ㄩ厤缃�
+ ip: 61.143.42.70 # IP
+ port: 12027 #绔彛
+ database: zhjk_ot7 #鏁版嵁搴撳悕
+ username: root #鐢ㄦ埛鍚�
+ password: Zh29_!DFFixS #瀵嗙爜
druid: # 鏁版嵁姹�
statViewServlet: #绠＄悊鎺у埗鍙拌处鍙�
login-username: admin
--
Gitblit v1.8.0