From da2662ab27e5655636bfa6338d8d1f083a99f36f Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 13 六月 2024 18:10:01 +0800 Subject: [PATCH] 国标28181-支持自动识别网卡监听,可以不再配置SIP.IP --- doc/_content/introduction/config.md | 138 +++++++++++++++++++--------------------------- 1 files changed, 57 insertions(+), 81 deletions(-) diff --git a/doc/_content/introduction/config.md b/doc/_content/introduction/config.md index 29f00a4..359aac9 100644 --- a/doc/_content/introduction/config.md +++ b/doc/_content/introduction/config.md @@ -14,20 +14,11 @@ 鍩轰簬spring boot鐨勫紑鍙戞柟寮忥紝閰嶇疆鏂囦欢鐨勫姞杞芥槸寰堢伒娲荤殑銆傞粯璁ゅ湪src/main/resources/application.yml锛岄儴鍒嗛厤缃」鏄彲閫夛紝浣犱笉闇�瑕佸叏閮ㄩ厤缃湪閰嶇疆鏂囦欢涓紝 瀹屽叏鐨勯厤缃鏄庡彲浠ュ弬鐪媋ll-application.yml銆� ### 1.1 榛樿鍔犺浇閰嶇疆鏂囦欢鏂瑰紡 -浣跨敤maven鎵撳寘鍚庣殑jar鍖呴噷锛屽凡缁忓瓨鍦ㄤ簡閰嶇疆鏂囦欢锛屼絾鏄瘡娆℃墦寮�jar鍖呬慨鏀归厤缃枃浠舵垨鑰呬慨鏀瑰悗鍐嶆墦鍖呴兘鏄瘮杈冮夯鐑︾殑锛屾墍浠ュぇ瀹跺彲閫氳繃鎸囧畾閰嶇疆鏂囦欢璺緞鏉ュ姞杞芥寚瀹氫綅缃殑閰嶇疆鏂囦欢銆� +浣跨敤maven鎵撳寘鍚庣殑target閲岋紝宸茬粡瀛樺湪浜嗛厤缃枃浠讹紝榛樿鍔犺浇閰嶇疆鏂囦欢涓篴pplication.yml锛屾煡鐪嬪唴瀹瑰彂鐜板叾涓璼pring.profiles.active閰嶇疆鐨勫唴瀹癸紝灏嗗叆閰嶇疆鐨勫�间负dev锛岄偅涔堝叿浣撳姞杞界殑閰嶇疆鏂囦欢灏辨槸application-dev.yml锛屽鏋滈厤缃殑鍊兼壘涓嶅埌瀵瑰簲鐨勯厤缃枃浠讹紝淇敼鍊间负dev銆� ```shell cd wvp-GB28181-pro/target -java -jar wvp-pro-*.jar --spring.config.location=../src/main/resources/application.yml +java -jar wvp-pro-*.jar ``` -### 1.2 杩佺Щ閰嶇疆鏂囦欢浠ユ柟渚垮惎鍔� -鐢变簬閰嶇疆鏂囦欢鐨勫懡浠ゆ瘮杈冮暱锛屾墍浠ヤ负浜嗗惎鍔ㄦ柟渚块�氬父鎴戜細鎶婇厤缃枃浠舵斁鍒癹ar鍖呯殑鍚岀骇鐩綍锛岀被浼艰繖鏍�, -绉婚櫎jar鍖呭唴/BOOT-INF/classes/涓嬫墍鏈変互application寮�澶寸殑鏂囦欢锛屼娇鐢ㄨВ鍘嬬缉宸ュ叿鎵撳紑jar鍗冲彲锛屼笉闇�瑕佽В鍘嬪嚭鏉ャ�� -```shell -cd wvp-GB28181-pro/target -mv ../src/main/resources/application-dev.yml application.yml -java -jar wvp-pro-*.jar -``` -杩欎篃鏄垜鑷繁鏈�甯哥敤鐨勬柟寮忋�� ## 2 閰嶇疆WVP-PRO wvp鏀寔澶氱鏁版嵁搴擄紝鍖呮嫭Mysql锛孭ostgresql锛岄噾浠撶瓑锛岄厤缃换閫変竴绉嶅嵆鍙�� ### 2.1 鏁版嵁搴撻厤缃� @@ -37,27 +28,28 @@ 鏁版嵁搴撳悕绉颁互wvp涓轰緥 ```yaml spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true - username: root - password: 12345678 - -mybatis: - configuration: - map-underscore-to-camel-case: true + dynamic: + primary: master + datasource: + master: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true + username: root + password: root123 ``` #### 2.1.3 Postgresql鏁版嵁搴撻厤缃� 鏁版嵁搴撳悕绉颁互wvp涓轰緥 ```yaml spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: org.postgresql.Driver - url: jdbc:postgresql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true - username: root - password: 12345678 + dynamic: + primary: master + datasource: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: org.postgresql.Driver + url: jdbc:postgresql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true + username: root + password: 12345678 pagehelper: helper-dialect: postgresql @@ -66,12 +58,14 @@ 鏁版嵁搴撳悕绉颁互wvp涓轰緥 ```yaml spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.kingbase8.Driver - url: jdbc:kingbase8://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=utf8 - username: root - password: 12345678 + dynamic: + primary: master + datasource: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.kingbase8.Driver + url: jdbc:kingbase8://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=utf8 + username: root + password: 12345678 pagehelper: helper-dialect: postgresql @@ -88,8 +82,6 @@ ```yaml # 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆 sip: - # [蹇呴』淇敼] 鏈満鐨処P - ip: 192.168.1.3 # [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙� port: 5060 # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛� @@ -106,58 +98,42 @@ ```yaml #zlm 榛樿鏈嶅姟鍣ㄩ厤缃� media: - # ZLMediaKit鐨勬湇鍔D锛屽繀椤婚厤缃� - id: FQ3TF8yT83wh5Wvz - # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP锛宻dp-ip涓巗tream-ip浣跨敤榛樿鍊肩殑鎯呭喌涓嬶紝杩欓噷涓嶈浣跨敤127.0.0.1/0.0.0.0 - ip: 192.168.1.3 - # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port - http-port: 6080 - # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret - secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc - # 鍚敤澶氱鍙fā寮�, 澶氱鍙fā寮忎娇鐢ㄧ鍙e尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙d娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙f祴璇� - rtp: - # [鍙�塢 鏄惁鍚敤澶氱鍙fā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈� - enable: true - # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, - port-range: 30000,30500 # 绔彛鑼冨洿 - # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦, - send-port-range: 30000,30500 # 绔彛鑼冨洿 - # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢� - record-assist-port: 18081 + id: zlmediakit-local + # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP + ip: 172.19.128.50 + # [鍙�塢 鏈夊叕缃慖P灏遍厤缃叕缃慖P, 涓嶅彲鐢ㄥ煙鍚� + wan_ip: + # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port + http-port: 9092 + # [鍙�塢 zlm鏈嶅姟鍣ㄨ闂甒VP鎵�浣跨敤鐨処P, 榛樿浣跨敤127.0.0.1锛寊lm鍜寃vp娌℃湁閮ㄧ讲鍦ㄥ悓涓�鍙版湇鍔″櫒鏃跺繀椤婚厤缃� + hook-ip: 172.19.128.50 + # [蹇呴�夐�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret + secret: TWSYFgYJOQWB4ftgeYut8DW4wbs7pQnj + # 鍚敤澶氱鍙fā寮�, 澶氱鍙fā寮忎娇鐢ㄧ鍙e尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙d娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙f祴璇� + rtp: + # [鍙�塢 鏄惁鍚敤澶氱鍙fā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈� + enable: true + # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛 + port-range: 30000,35000 # 绔彛鑼冨洿 + # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦, + send-port-range: 40000,40300 # 绔彛鑼冨洿 ``` ### 2.4 涓�у寲瀹氬埗淇℃伅閰嶇疆 ```yaml # [鏍规嵁涓氬姟闇�姹傞厤缃甝 user-settings: - # [鍙�塢 鏈嶅姟ID锛屼笉鍐欏垯涓�000000 - server-id: - # [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱, 闇�瑕乺tp.enable=true - auto-apply-play: false - # [鍙�塢 閮ㄥ垎璁惧闇�瑕佹墿灞昐DP锛岄渶瑕佹墦寮�姝よ缃� - senior-sdp: false - # 淇濆瓨绉诲姩浣嶇疆鍘嗗彶杞ㄨ抗锛歵rue:淇濈暀鍘嗗彶鏁版嵁锛宖alse:浠呬繚鐣欐渶鍚庣殑浣嶇疆(榛樿) - save-position-history: false - # 鐐规挱绛夊緟瓒呮椂鏃堕棿,鍗曚綅锛氭绉� - play-timeout: 3000 - # 绛夊緟闊宠棰戠紪鐮佷俊鎭啀杩斿洖锛� true锛� 鍙互鏍规嵁缂栫爜閫夋嫨鍚堥�傜殑鎾斁鍣紝false锛� 鍙互鏇村揩鐐规挱 - wait-track: false - # 鏄惁寮�鍚帴鍙i壌鏉� - interface-authentication: true - # 鑷姩閰嶇疆redis 鍙互杩囨湡浜嬩欢 - redis-config: true - # 鎺ュ彛閴存潈渚嬪鐨勬帴鍙�, 鍗充笉杩涜鎺ュ彛閴存潈鐨勬帴鍙�,灏介噺璇︾粏涔﹀啓锛屽敖閲忎笉鐢�/**锛岃嚦灏戜袱绾х洰褰� - interface-authentication-excludes: - - /api/v1/** - # 鎺ㄦ祦鐩存挱鏄惁褰曞埗 - record-push-live: true - # 鍥芥爣鏄惁褰曞埗 - record-sip: true - # 鏄惁灏嗘棩蹇楀瓨鍌ㄨ繘鏁版嵁搴� - logInDatabase: true - # 绗笁鏂瑰尮閰嶏紝鐢ㄤ簬浠巗tream閽熻幏鍙栨湁鏁堜俊鎭� - thirdPartyGBIdReg: [\s\S]* + # 鐐规挱/褰曞儚鍥炴斁 绛夊緟瓒呮椂鏃堕棿,鍗曚綅锛氭绉� + play-timeout: 180000 + # [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱, 闇�瑕乺tp.enable=true + auto-apply-play: true + # 鎺ㄦ祦鐩存挱鏄惁褰曞埗 + record-push-live: true + # 鍥芥爣鏄惁褰曞埗 + record-sip: true + # 鍥芥爣鐐规挱 鎸夐渶鎷夋祦, true锛氭湁浜鸿鐪嬫媺娴侊紝鏃犱汉瑙傜湅閲婃斁锛� false锛氭媺璧峰悗涓嶈嚜鍔ㄩ噴鏀� + stream-on-demand: true ``` - +鏇村瀹屾暣鐨勯厤缃俊鎭弬鑰僡ll-application.yml鏂囦欢锛岄渶瑕侀偅涓厤缃」锛屽鍒跺埌姝e湪浣跨敤鐨勯厤缃枃浠朵腑瀵瑰簲鐨勬枃浠跺嵆鍙�� 濡傛灉閰嶇疆淇℃伅鏃犺锛屼綘鍙互鍚姩zlm锛屽啀鍚姩wvp鏉ユ祴璇曚簡锛屽惎鍔ㄦ垚鍔熺殑璇濓紝浣犲彲浠ュ湪wvp鐨勬棩蹇椾笅鐪嬪埌zlm宸茶繛鎺ョ殑鎻愮ず銆� 鎺ヤ笅鏉閮ㄧ讲鍒版湇鍔″櫒](./_content/introduction/deployment.md)锛� 濡傛灉浣犲彧鏄湰鍦拌繍琛岀洿鎺ュ湪鏈湴杩愯鍗冲彲銆� -- Gitblit v1.8.0