From 1f4fd31eaed8f70a4a03f2493abe17eea774c15b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 17:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/application-dev.yml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index bdaf83b..a84f9d2 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2024
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/zgyw/uploadPath锛孡inux閰嶇疆 /home/zgyw/uploadPath锛�
- profile: D:/zgyw/uploadPath
+ profile: E:/ycl/zgyw/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
@@ -36,9 +36,9 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+ url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
username: root
- password: 123456
+ password: ycl@202466
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -123,4 +123,17 @@
host: 42.193.1.25
database: zgyw
port: 27017
+ username: admin
+ password: ycl@202466
+
+# 鎷夊彇鏁版嵁璇锋眰閰嶇疆
+request:
+ retry: 4 # 鏈�澶ч噸璇曟鏁�
+ youYunDomain: 123.123.123.5 # 浼樹簯鍦板潃
+ haiKangDomain: 123.123.123.1 # 娴峰悍鍦板潃
+
+youYun:
+ tenantId: 11
+ email: 11
+ passwd: 11
--
Gitblit v1.8.0