From 3f10aa699267f13d8575b92a9634f2c037c1f183 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 26 八月 2024 19:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/application-prod.yml | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/ycl-server/src/main/resources/application-prod.yml b/ycl-server/src/main/resources/application-prod.yml
index 94730ac..690ddd5 100644
--- a/ycl-server/src/main/resources/application-prod.yml
+++ b/ycl-server/src/main/resources/application-prod.yml
@@ -36,9 +36,9 @@
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://51.92.65.72:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
username: root
- password: ycl@202466
+ password: zgyw@202488
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -76,10 +76,10 @@
spring.data:
redis:
# 鍦板潃
- host: 42.193.1.25
+ host: 127.0.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
- password: ycl2018
+ password:
# 鏁版嵁搴撶储寮�
database: 1
# 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
@@ -115,7 +115,7 @@
# Swagger閰嶇疆
swagger:
# 鏄惁寮�鍚痵wagger
- enabled: true
+ enabled: false
# 璇锋眰鍓嶇紑
pathMapping: /prod-api
@@ -123,21 +123,22 @@
spring:
data:
mongodb:
- host: 42.193.1.25
- database: zgyw
- port: 27017
- username: admin
- password: ycl@202466
+ uri: mongodb://root:yunwei%402024@127.0.0.1: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: e10adc3949ba59abbe56e057f2gg88dd
- email: 11
- passwd: 11
- apikey: 11
+ 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