From 31d3591b34d4f26ad2ab207ca3044048d9adb9df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 17:51:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/application-dev.yml | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 2ce8bcc..a2a11c7 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: E:/ycl/zgyw/uploadPath
+ profile: /home/zgyw/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
@@ -17,7 +17,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8085
+ port: 8080
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -36,7 +36,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://101.35.247.188/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
username: root
password: ycl@202466
type: com.alibaba.druid.pool.DruidDataSource
@@ -82,6 +82,8 @@
password: ycl2018
# 鏁版嵁搴撶储寮�
database: 0
+ # 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
+ # password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
# 鏄惁寮�鍚痵sl
@@ -109,26 +111,34 @@
# 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
subscriptionConnectionPoolSize: 50
+
# Swagger閰嶇疆
swagger:
# 鏄惁寮�鍚痵wagger
- enabled: true
+ enabled: false
# 璇锋眰鍓嶇紑
- pathMapping: /dev-api
+ pathMapping: /prod-api
# MongoDB閰嶇疆
spring:
data:
mongodb:
- host: 42.193.1.25
- database: zgyw
- port: 27017
- username: admin
- password: ycl@202466
-
+ uri: mongodb://root1:yunwei%402024@192.168.3.88:27017/zgyw?authSource=admin
# 鎷夊彇鏁版嵁璇锋眰閰嶇疆
request:
retry: 4 # 鏈�澶ч噸璇曟鏁�
- youYunDomain: 123.123.123.5 # 浼樹簯鍦板潃
- haiKangDomain: 123.123.123.1 # 娴峰悍鍦板潃
+ youYunDomain: http://51.92.65.56 # 浼樹簯鍦板潃
+ haiKangDomain: 51.92.65.48 # 娴峰悍鍦板潃
+ pythonDomain: 11 # python鑴氭湰鍦板潃
+
+youYun:
+ tenantId: e10adc3949ba59abbe56e057f20f88dd
+ email: yunwei
+ passwd: Yesc@123
+ apikey: 72fcfd6825304f7fa0453134de620f3a
+ accesskey: fc9503a521544e76a8e69b912a2f177bc6362b19
+
+# gb281瑙嗛缃戝叧鍦板潃锛岀敤浜庤幏鍙杛tsp鏍煎紡鐨勬祦鍦板潃
+rtsp:
+ server: http://192.168.3.88:7788
--
Gitblit v1.8.0