From 0aada74b70e80d259fa3e17202f061d45cb94bfc Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 07 八月 2023 17:04:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- src/main/resources/all-application.yml | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index bae9904..695bc74 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: @@ -44,6 +48,10 @@ max-lifetime: 1200000 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅) +# 淇敼鍒嗛〉鎻掍欢涓� postgresql锛� 鏁版嵁搴撶被鍨嬩负mysql涓嶉渶瑕� +#pagehelper: +# helper-dialect: postgresql + # [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙h皟鐢ㄩ兘鏄繖涓鍙� server: port: 18080 @@ -65,8 +73,11 @@ # 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆 sip: - # [蹇呴』淇敼] 鏈満鐨処P - ip: 192.168.0.100 + # [蹇呴』淇敼] 鏈満鐨処P锛屽搴斾綘鐨勭綉鍗★紝鐩戝惉浠�涔坕p灏辨槸浣跨敤浠�涔堢綉鍗★紝 + # 濡傛灉瑕佺洃鍚寮犵綉鍗★紝鍙互浣跨敤閫楀彿鍒嗛殧澶氫釜IP锛� 渚嬪锛� 192.168.1.4,10.0.0.4 + # 濡傛灉涓嶆槑鐧斤紝灏变娇鐢�0.0.0.0锛屽ぇ閮ㄥ垎鎯呭喌閮芥槸鍙互鐨� + # 璇蜂笉瑕佷娇鐢�127.0.0.1锛屼换浣曞寘鎷琹ocalhost鍦ㄥ唴鐨勫煙鍚嶉兘鏄笉鍙互鐨勩�� + ip: 0.0.0.0 # [鍙�塢 娌℃湁浠讳綍涓氬姟闇�姹傦紝浠呬粎鏄湪鍓嶇灞曠ず鐨勬椂鍊欑敤 show-ip: 192.168.0.100 # [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙� @@ -88,6 +99,15 @@ # keepalliveToOnline: false # 鏄惁瀛樺偍alarm淇℃伅 alarm: false + +# 鍋氫负JT1078鏈嶅姟鍣ㄧ殑閰嶇疆 +jt1078: + #[蹇呴』淇敼] 鏄惁寮�鍚�1078鐨勬湇鍔� + enable: true + #[蹇呬慨淇敼] 1708璁惧鎺ュ叆鐨勭鍙� + port: 21078 + #[鍙�塢 璁惧閴存潈鐨勫瘑鐮� + password: admin123 #zlm 榛樿鏈嶅姟鍣ㄩ厤缃� media: @@ -125,6 +145,8 @@ enable: true # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛 port-range: 30000,30500 # 绔彛鑼冨洿 + # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦锛岃涓嶈涓庢敹娴佺鍙h寖鍥撮噸鍚� + send-port-range: 50502,50506 # 绔彛鑼冨洿 # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢� record-assist-port: 0 @@ -165,21 +187,28 @@ stream-on-demand: true # 鎺ㄦ祦閴存潈锛� 榛樿寮�鍚� push-authority: true - # 鍥芥爣绾ц仈鍙戞祦涓ユ牸妯″紡锛屼弗鏍兼ā寮忎細浣跨敤涓巗dp淇℃伅涓竴鑷寸殑绔彛鍙戞祦锛岀鍙e叡浜玬edia.rtp.port-range锛岃繖浼氭崯澶变竴浜涙�ц兘锛� - # 闈炰弗鏍兼ā寮忎娇鐢ㄩ殢鏈虹鍙e彂娴侊紝鎬ц兘鏇村ソ锛� 榛樿鍏抽棴 - gb-send-stream-strict: false # 璁惧涓婄嚎鏃舵槸鍚﹁嚜鍔ㄥ悓姝ラ�氶亾 sync-channel-on-device-online: false # 鏄惁浣跨敤璁惧鏉ユ簮Ip浣滀负鍥炲IP锛� 涓嶈缃垯涓� false sip-use-source-ip-as-remote-address: false # 鏄惁寮�鍚痵ip鏃ュ織 sip-log: true + # 鏄惁寮�鍚痵ql鏃ュ織 + sql-log: true # 娑堟伅閫氶亾鍔熻兘-缂哄皯鍥芥爣ID鏄惁缁欐墍鏈変笂绾у彂閫佹秷鎭� send-to-platforms-when-id-lost: true # 淇濇寔閫氶亾鐘舵�侊紝涓嶆帴鍙梟otify閫氶亾鐘舵�佸彉鍖栵紝 鍏煎娴峰悍骞冲彴鍙戦�侀敊璇秷鎭� refuse-channel-status-channel-form-notify: false # 璁剧疆notify缂撳瓨闃熷垪鏈�澶ч暱搴︼紝瓒呰繃姝ら暱搴︾殑鏁版嵁灏嗚繑鍥�486 BUSY_HERE锛屾秷鎭涪寮�, 榛樿10000 max-notify-count-queue: 10000 + # 璁惧/閫氶亾鐘舵�佸彉鍖栨椂鍙戦�佹秷鎭� + 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