From fc9ed976cfb5faa3c92ac878dcd62c322ff22502 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 07 八月 2023 18:09:45 +0800
Subject: [PATCH] 合并主线
---
src/main/resources/all-application.yml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 0b079f1..1368961 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -5,6 +5,10 @@
spring:
+ # 璁剧疆鎺ュ彛瓒呮椂鏃堕棿
+ mvc:
+ async:
+ request-timeout: 20000
# [鍙�塢涓婁紶鏂囦欢澶у皬闄愬埗
servlet:
multipart:
@@ -141,6 +145,8 @@
enable: true
# [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛
port-range: 30000,30500 # 绔彛鑼冨洿
+ # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦锛岃涓嶈涓庢敹娴佺鍙ｈ寖鍥撮噸鍚�
+ send-port-range: 50502,50506 # 绔彛鑼冨洿
# 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
record-assist-port: 0
@@ -181,17 +187,18 @@
stream-on-demand: true
# 鎺ㄦ祦閴存潈锛� 榛樿寮�鍚�
push-authority: true
- # 鍥芥爣绾ц仈鍙戞祦涓ユ牸妯″紡锛屼弗鏍兼ā寮忎細浣跨敤涓巗dp淇℃伅涓竴鑷寸殑绔彛鍙戞祦锛岀鍙ｅ叡浜玬edia.rtp.port-range锛岃繖浼氭崯澶变竴浜涙�ц兘锛�
- # 闈炰弗鏍兼ā寮忎娇鐢ㄩ殢鏈虹鍙ｅ彂娴侊紝鎬ц兘鏇村ソ锛� 榛樿鍏抽棴
- gb-send-stream-strict: false
# 璁惧涓婄嚎鏃舵槸鍚﹁嚜鍔ㄥ悓姝ラ�氶亾
sync-channel-on-device-online: false
+ # 鍥芥爣绾ц仈璇煶鍠婅瘽鍙戞祦妯″紡 * UDP:udp浼犺緭 TCP-ACTIVE锛歵cp涓诲姩妯″紡 TCP-PASSIVE锛歵cp琚姩妯″紡
+ broadcast-for-platform: UDP
# 鏄惁浣跨敤璁惧鏉ユ簮Ip浣滀负鍥炲IP锛� 涓嶈缃垯涓� false
sip-use-source-ip-as-remote-address: false
# 鏄惁寮�鍚痵ip鏃ュ織
sip-log: true
# 鏄惁寮�鍚痵ql鏃ュ織
sql-log: true
+ # 鏀跺埌ack娑堟伅鍚庡紑濮嬪彂娴侊紝榛樿false锛� 鍥炲200ok鍚庣洿鎺ュ紑濮嬪彂娴�
+ push-stream-after-ack: false
# 娑堟伅閫氶亾鍔熻兘-缂哄皯鍥芥爣ID鏄惁缁欐墍鏈変笂绾у彂閫佹秷鎭�
send-to-platforms-when-id-lost: true
# 淇濇寔閫氶亾鐘舵�侊紝涓嶆帴鍙梟otify閫氶亾鐘舵�佸彉鍖栵紝 鍏煎娴峰悍骞冲彴鍙戦�侀敊璇秷鎭�
--
Gitblit v1.8.0