From 44b250eed29fab7959d18015c27b96da3e4beb47 Mon Sep 17 00:00:00 2001
From: lin <lin@pop-os.localdomain>
Date: 星期三, 01 二月 2023 09:32:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/resources/all-application.yml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 491544b..58b2a02 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -168,7 +168,7 @@
     # 淇濆瓨绉诲姩浣嶇疆鍘嗗彶杞ㄨ抗锛歵rue:淇濈暀鍘嗗彶鏁版嵁锛宖alse:浠呬繚鐣欐渶鍚庣殑浣嶇疆(榛樿)
     save-position-history: false
     # 鐐规挱绛夊緟瓒呮椂鏃堕棿,鍗曚綅锛氭绉�
-    play-timeout: 3000
+    play-timeout: 18000
     # 涓婄骇鐐规挱绛夊緟瓒呮椂鏃堕棿,鍗曚綅锛氭绉�
     platform-play-timeout: 60000
     # 鏄惁寮�鍚帴鍙ｉ壌鏉�
@@ -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
@@ -195,8 +195,10 @@
     gb-send-stream-strict: false
     # 璁惧涓婄嚎鏃舵槸鍚﹁嚜鍔ㄥ悓姝ラ�氶亾
     sync-channel-on-device-online: false
-    # 璁惧涓婄嚎鏃舵槸鍚﹁嚜鍔ㄥ悓姝ラ�氶亾
-    sip-use-source-ip-as-remote-address: true
+    # 鏄惁浣跨敤璁惧鏉ユ簮Ip浣滀负鍥炲IP锛� 涓嶈缃垯涓� false
+    sip-use-source-ip-as-remote-address: false
+    # 鏄惁寮�鍚痵ip鏃ュ織
+    sip-log: true
 
 # 鍏抽棴鍦ㄧ嚎鏂囨。锛堢敓浜х幆澧冨缓璁叧闂級
 springdoc:

--
Gitblit v1.8.0