From 2c3f6417a35d0a2d79f3b751b7a5a8edbb0bcc84 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 三月 2023 17:55:44 +0800
Subject: [PATCH] 修复添加zlm节点使用默认值的问题 #781
---
src/main/resources/application-docker.yml | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml
index 98c1335..a722435 100644
--- a/src/main/resources/application-docker.yml
+++ b/src/main/resources/application-docker.yml
@@ -16,11 +16,11 @@
password: ${REDIS_PWD:root}
# [鍙�塢 瓒呮椂鏃堕棿
timeout: 10000
- # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
+ # [蹇呴�塢 jdbc鏁版嵁搴撻厤缃�
datasource:
# 浣跨敤mysql 鎵撳紑23-28琛屾敞閲婏紝 鍒犻櫎29-36琛�
name: wvp
- url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false&allowMultiQueries=true
username: root
password: root
type: com.alibaba.druid.pool.DruidDataSource
@@ -48,6 +48,8 @@
#zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
media:
+ # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄥ敮涓�id锛岀敤浜庤Е鍙慼ook鏃跺尯鍒槸鍝彴鏈嶅姟鍣�,general.mediaServerId
+ id:
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
ip: ${ZLM_HOST:127.0.0.1}
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port
@@ -67,29 +69,12 @@
sdp-ip: ${sip.ip}
stream-ip: ${sip.ip}
# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
+# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
logging:
- file:
- name: logs/wvp.log
- max-history: 30
- max-size: 10MB
- total-size-cap: 300MB
- level:
- com.genersoft.iot: debug
- com.genersoft.iot.vmp.storager.dao: info
- com.genersoft.iot.vmp.gb28181: info
+ config: classpath:logback-spring-local.xml
# [鏍规嵁涓氬姟闇�姹傞厤缃甝
user-settings:
# 鎺ㄦ祦鐩存挱鏄惁褰曞埗
record-push-live: true
auto-apply-play: true
-
-# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
-swagger-ui:
- enabled: true
-
-# 鐗堟湰淇℃伅锛� 涓嶉渶淇敼
-version:
- version: "@project.version@"
- description: "@project.description@"
- artifact-id: "@project.artifactId@"
--
Gitblit v1.8.0