From 614eaa8f4fd1b8b6cedd1d737c67da17a0a33c29 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 01 六月 2023 15:58:19 +0800 Subject: [PATCH] Merge pull request #872 from xu-bin-bin/wvp-28181-2.0 --- src/main/resources/all-application.yml | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index 7f8b278..def2a3c 100644 --- a/src/main/resources/all-application.yml +++ b/src/main/resources/all-application.yml @@ -43,6 +43,14 @@ idle-timeout: 300000 # 鍏佽杩炴帴鍦ㄨ繛鎺ユ睜涓┖闂茬殑鏈�闀挎椂闂达紙浠ユ绉掍负鍗曚綅锛� max-lifetime: 1200000 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅) +# 淇敼涓烘暟鎹簱瀛楁涓嬪垝绾垮垎闅旂洿鎺ュ搴攋ava椹煎嘲鍛藉悕 +mybatis: + configuration: + map-underscore-to-camel-case: true + +# 淇敼鍒嗛〉鎻掍欢涓� postgresql锛� 鏁版嵁搴撶被鍨嬩负mysql涓嶉渶瑕� +#pagehelper: +# helper-dialect: postgresql # [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙h皟鐢ㄩ兘鏄繖涓鍙� server: @@ -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: @@ -174,6 +194,8 @@ 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閫氶亾鐘舵�佸彉鍖栵紝 鍏煎娴峰悍骞冲彴鍙戦�侀敊璇秷鎭� @@ -182,6 +204,8 @@ max-notify-count-queue: 10000 # 璁惧/閫氶亾鐘舵�佸彉鍖栨椂鍙戦�佹秷鎭� device-status-notify: false + # 涓婄骇骞冲彴鐐规挱鏃朵笉浣跨敤涓婄骇骞冲彴鎸囧畾鐨剆src锛屼娇鐢ㄨ嚜瀹氫箟鐨剆src锛屽弬鑰冨浗鏍囨枃妗�-鐐规挱澶栧煙璁惧濯掍綋娴丼SRC澶勭悊鏂瑰紡 + use-custom-ssrc-for-parent-invite: true # 璺ㄥ煙閰嶇疆锛岄厤缃綘璁块棶鍓嶇椤甸潰鐨勫湴鍧�鍗冲彲锛� 鍙互閰嶇疆澶氫釜 allowed-origins: - http://localhost:8008 -- Gitblit v1.8.0