From 941b9a8374c2e148795d0a41c164026aca3345d2 Mon Sep 17 00:00:00 2001
From: xiaoQQya <46475319+xiaoQQya@users.noreply.github.com>
Date: 星期三, 01 十一月 2023 13:44:14 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into develop
---
src/main/resources/all-application.yml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index def2a3c..595f629 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:
@@ -43,10 +47,6 @@
idle-timeout: 300000 # 鍏佽杩炴帴鍦ㄨ繛鎺ユ睜涓┖闂茬殑鏈�闀挎椂闂达紙浠ユ绉掍负鍗曚綅锛�
max-lifetime: 1200000 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅)
-# 淇敼涓烘暟鎹簱瀛楁涓嬪垝绾垮垎闅旂洿鎺ュ搴攋ava椹煎嘲鍛藉悕
-mybatis:
- configuration:
- map-underscore-to-camel-case: true
# 淇敼鍒嗛〉鎻掍欢涓� postgresql锛� 鏁版嵁搴撶被鍨嬩负mysql涓嶉渶瑕�
#pagehelper:
@@ -145,6 +145,8 @@
enable: true
# [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛
port-range: 30000,30500 # 绔彛鑼冨洿
+ # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦锛岃涓嶈涓庢敹娴佺鍙ｈ寖鍥撮噸鍚�
+ send-port-range: 50502,50506 # 绔彛鑼冨洿
# 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
record-assist-port: 0
@@ -176,7 +178,7 @@
# 鍥芥爣鏄惁褰曞埗
record-sip: true
# 鏄惁灏嗘棩蹇楀瓨鍌ㄨ繘鏁版嵁搴�
- logInDatebase: true
+ logInDatabase: true
# 浣跨敤鎺ㄦ祦鐘舵�佷綔涓烘帹娴侀�氶亾鐘舵��
use-pushing-as-status: true
# 浣跨敤鏉ユ簮璇锋眰ip浣滀负streamIp,褰撲笖浠呭綋浣犲彧鏈墇lm鑺傜偣瀹冧笌wvp鍦ㄤ竴璧风殑鎯呭喌涓嬪紑鍚�
@@ -185,9 +187,6 @@
stream-on-demand: true
# 鎺ㄦ祦閴存潈锛� 榛樿寮�鍚�
push-authority: true
- # 鍥芥爣绾ц仈鍙戞祦涓ユ牸妯″紡锛屼弗鏍兼ā寮忎細浣跨敤涓巗dp淇℃伅涓竴鑷寸殑绔彛鍙戞祦锛岀鍙ｅ叡浜玬edia.rtp.port-range锛岃繖浼氭崯澶变竴浜涙�ц兘锛�
- # 闈炰弗鏍兼ā寮忎娇鐢ㄩ殢鏈虹鍙ｅ彂娴侊紝鎬ц兘鏇村ソ锛� 榛樿鍏抽棴
- gb-send-stream-strict: false
# 璁惧涓婄嚎鏃舵槸鍚﹁嚜鍔ㄥ悓姝ラ�氶亾
sync-channel-on-device-online: false
# 鏄惁浣跨敤璁惧鏉ユ簮Ip浣滀负鍥炲IP锛� 涓嶈缃垯涓� false
@@ -206,6 +205,10 @@
device-status-notify: false
# 涓婄骇骞冲彴鐐规挱鏃朵笉浣跨敤涓婄骇骞冲彴鎸囧畾鐨剆src锛屼娇鐢ㄨ嚜瀹氫箟鐨剆src锛屽弬鑰冨浗鏍囨枃妗�-鐐规挱澶栧煙璁惧濯掍綋娴丼SRC澶勭悊鏂瑰紡
use-custom-ssrc-for-parent-invite: true
+ # 鍥芥爣绾ц仈绂荤嚎鍚庡涔呴噸璇曚竴娆℃敞鍐�
+ register-again-after-time: 60
+ # 鍥芥爣缁鏂瑰紡锛宼rue涓虹画璁紝姣忔娉ㄥ唽鍦ㄥ悓涓�涓細璇濋噷锛宖alse涓洪噸鏂版敞鍐岋紝姣忔浣跨敤鏂扮殑浼氳瘽
+ register-keep-int-dialog: false
# 璺ㄥ煙閰嶇疆锛岄厤缃綘璁块棶鍓嶇椤甸潰鐨勫湴鍧�鍗冲彲锛� 鍙互閰嶇疆澶氫釜
allowed-origins:
- http://localhost:8008
--
Gitblit v1.8.0