From 4082ee4d1cd2357771d7f844a57fe4932a1dd4c4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 21 八月 2024 15:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/application-dev.yml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 149d7ea..a2a11c7 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -36,7 +36,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://101.35.247.188/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
@@ -130,6 +130,7 @@
retry: 4 # 鏈�澶ч噸璇曟鏁�
youYunDomain: http://51.92.65.56 # 浼樹簯鍦板潃
haiKangDomain: 51.92.65.48 # 娴峰悍鍦板潃
+ pythonDomain: 11 # python鑴氭湰鍦板潃
youYun:
tenantId: e10adc3949ba59abbe56e057f20f88dd
@@ -137,3 +138,7 @@
passwd: Yesc@123
apikey: 72fcfd6825304f7fa0453134de620f3a
accesskey: fc9503a521544e76a8e69b912a2f177bc6362b19
+
+# gb281瑙嗛缃戝叧鍦板潃锛岀敤浜庤幏鍙杛tsp鏍煎紡鐨勬祦鍦板潃
+rtsp:
+ server: http://192.168.3.88:7788
--
Gitblit v1.8.0