From 3ec3b88456cf9ac455d93baba40f339bb284dd77 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 14 十月 2020 14:39:10 +0800
Subject: [PATCH] 修复点播判断错误导致的15s超长延时 增加默认不关闭推流, 无人观看超时或点击停止按钮关闭流 修复点播其他bug
---
src/main/resources/application.yml | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 235caa6..ad37548 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -25,7 +25,6 @@
server:
port: 18080
sip:
-# ip: 10.200.64.63
ip: 192.168.1.20
port: 5060
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
@@ -35,18 +34,14 @@
id: 34020000002000000001
# 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�
password: 12345678
-media:
-# ip: 10.200.64.88
- ip: 192.168.1.20
- port: 10000
-
-# 鑷畾涔変唬鐞嗙浉鍏抽厤缃�
-# 浠ｇ悊鐨勬湰鍦拌矾鐢�
-proxy:
- servlet_url: /media/*
- # 瑕佷唬鐞嗙殑鍦板潃
- target_url: http://127.0.0.1:10080
auth: #32浣嶅皬鍐檓d5鍔犲瘑锛堥粯璁ゅ瘑鐮佷负admin锛�
username: admin
- password: 21232f297a57a5a743894a0e4a801fc3
\ No newline at end of file
+ password: 21232f297a57a5a743894a0e4a801fc3
+
+media: #zlm鏈嶅姟鍣ㄧ殑ip涓巋ttp绔彛, 閲嶇偣: 杩欐槸http绔彛
+ ip: 192.168.1.20
+ port: 9080
+ secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
+ streamNoneReaderDelayMS: 1800000 # 鏃犱汉瑙傜湅澶氫箙鍏抽棴娴�
+
--
Gitblit v1.8.0