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 | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 14e23f5..a2a11c7 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -17,10 +17,10 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8085
+ port: 8080
servlet:
# 搴旂敤鐨勮闂矾寰�
- context-path: /zgyw
+ context-path: /
tomcat:
# tomcat鐨刄RI缂栫爜
uri-encoding: UTF-8
@@ -36,9 +36,9 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://51.92.65.72: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: zgyw@202488
+ password: ycl@202466
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -76,12 +76,12 @@
spring.data:
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 42.193.1.25
# 绔彛锛岄粯璁や负6379
port: 6379
- password:
+ password: ycl2018
# 鏁版嵁搴撶储寮�
- database: 1
+ database: 0
# 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
# password:
# 杩炴帴瓒呮椂鏃堕棿
@@ -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