From ec95a429859e2819772231e70dcd80cb976c81d2 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 10 二月 2023 15:54:42 +0800 Subject: [PATCH] Merge branch 'main' into main2 --- src/main/resources/all-application.yml | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index 1b4d0af..aef1006 100644 --- a/src/main/resources/all-application.yml +++ b/src/main/resources/all-application.yml @@ -186,7 +186,7 @@ use-pushing-as-status: true # 浣跨敤鏉ユ簮璇锋眰ip浣滀负streamIp,褰撲笖浠呭綋浣犲彧鏈墇lm鑺傜偣瀹冧笌wvp鍦ㄤ竴璧风殑鎯呭喌涓嬪紑鍚� use-source-ip-as-stream-ip: true - # 鎸夐渶鎷夋祦, true锛氭湁浜鸿鐪嬫媺娴侊紝鏃犱汉瑙傜湅閲婃斁锛� false锛氭媺璧峰悗涓嶈嚜鍔ㄩ噴鏀� + # 鍥芥爣鐐规挱 鎸夐渶鎷夋祦, true锛氭湁浜鸿鐪嬫媺娴侊紝鏃犱汉瑙傜湅閲婃斁锛� false锛氭媺璧峰悗涓嶈嚜鍔ㄩ噴鏀� stream-on-demand: true # 鎺ㄦ祦閴存潈锛� 榛樿寮�鍚� push-authority: true @@ -197,6 +197,10 @@ 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 # 鏀跺埌ack娑堟伅鍚庡紑濮嬪彂娴侊紝榛樿false锛� 鍥炲200ok鍚庣洿鎺ュ紑濮嬪彂娴� push-stream-after-ack: false -- Gitblit v1.8.0