From 3e4d2b682c7c3aeb3dcc181a922e90cde2e6f6b6 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 21 三月 2023 17:23:38 +0800 Subject: [PATCH] Merge pull request #783 from StreamLuna/wvp-28181-2.0 --- src/main/resources/application.yml | 110 +++++++----------------------------------------------- 1 files changed, 15 insertions(+), 95 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a15c88c..4efb527 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,96 +1,16 @@ spring: - # [涓嶉渶瑕佹敼] - application: - name: iot-vmp-vmanager - # [涓嶉渶瑕佹敼] 褰卞瓙鏁版嵁瀛樺偍鏂瑰紡锛屾敮鎸乺edis銆乯dbc,鏆備笉鏀寔mysql, - database: redis - # [涓嶉渶瑕佹敼] 閫氫俊鏂瑰紡锛屾敮鎸乲afka銆乭ttp - communicate: http - # REDIS鏁版嵁搴撻厤缃� - redis: - # [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1 - host: 192.168.1.141 - # [蹇呴』淇敼] 绔彛鍙� - port: 6379 - # [鍙�塢 鏁版嵁搴� DB - database: 6 - # [鍙�塢 璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺� - password: 4767cb971b40a1300fa09b7f87b09d1c - # [鍙�塢 瓒呮椂鏃堕棿 - timeout: 10000 - # [涓嶅彲鐢╙ jdbc鏁版嵁搴撻厤缃�, 鏆備笉鏀寔 - datasource: - name: eiot - url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true - username: - password: - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver - -# [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙h皟鐢ㄩ兘鏄繖涓鍙� -server: - port: 18080 - -# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆 -sip: - # [蹇呴』淇敼] 鏈満鐨処P, 蹇呴』鏄綉鍗′笂鐨処P - ip: 192.168.1.20 - # [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙� - port: 5060 - # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛� - # 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3 - # 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆 - # [鍙�塢 - domain: 3402000000 - # [鍙�塢 - id: 34020000002000000001 - # [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮� - password: 12345678 - -# 鐧婚檰鐨勭敤鎴峰悕瀵嗙爜 -auth: - # [鍙�塢 鐢ㄦ埛鍚� - username: admin - # [鍙�塢 瀵嗙爜, 榛樿涓篴dmin - password: 21232f297a57a5a743894a0e4a801fc3 - -#zlm鏈嶅姟鍣ㄩ厤缃� -media: - # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP - ip: 127.0.0.1 - # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑鍏綉IP, 鍐呯綉閮ㄧ讲缃┖鍗冲彲 - wanIp: 192.168.1.20 - # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook鎵�浣跨敤鐨処P, 榛樿浣跨敤sip.ip - hookIp: - # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port - port: 6080 - # [鍙�塢 鏄惁鑷姩閰嶇疆ZLM, 濡傛灉甯屾湜鎵嬪姩閰嶇疆ZLM, 鍙互璁句负false, 涓嶅缓璁柊鎺ヨЕ鐨勭敤鎴蜂慨鏀� - autoConfig: true - # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret - secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc - # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑general.streamNoneReaderDelayMS - streamNoneReaderDelayMS: 600000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴� - # [鍙�塢 鍏抽棴绛夊緟鏀跺埌娴佺紪鐮佷俊鎭悗鍦ㄨ繑鍥�, - # 璁句负false鍙互鑾峰緱鏇村ソ鐨勫吋瀹规��,淇濊瘉杩斿洖鍚庢祦灏卞彲浠ユ挱鏀�, - # 璁句负true鍙互蹇�熸墦寮�鎾斁绐楀彛,鍙互鑾峰緱鏇村ソ鐨勪綋楠� - closeWaitRTPInfo: false - # 鍚敤udp澶氱鍙fā寮�, 璇︾粏瑙i噴鍙傝��: https://github.com/xia-chu/ZLMediaKit/wiki/GB28181%E6%8E%A8%E6%B5%81 涓嬬殑楂橀樁浣跨敤 - rtp: - # [鍙�塢 鏄惁鍚敤udp澶氱鍙fā寮�, 寮�鍚悗浼氬湪udpPortRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈� - enable: true - # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 涓嶅彧鏄痷dp, 浣跨敤TCP琚姩浼犺緭妯″紡鏃�,涔熸槸浠庤繖涓寖鍥村唴閫夋嫨绔彛 - udpPortRange: 30000,30500 # 绔彛鑼冨洿 - -# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼 -logging: - file: - name: logs/wvp.log - max-history: 30 - max-size: 10MB - total-size-cap: 300MB - level: - com: - genersoft: - iot: debug - - + application: + name: wvp + profiles: + active: local + # flayway鐩稿叧閰嶇疆 + flyway: + enabled: true #鏄惁鍚敤flyway(榛樿true) + locations: classpath:db/migration #杩欎釜璺緞鎸囩殑鏄痜ly鐗堟湰鎺у埗鐨剆ql璇彞瀛樻斁鐨勮矾寰�,鍙互澶氫釜锛屽彲浠ョ粰姣忎釜鐜浣跨敤涓嶅悓浣嶇疆,姣斿classpath:db/migration,classpath:test/db/migration + baseline-on-migrate: true #寮�鍚嚜鍔ㄥ垱寤篺lyway鍏冩暟鎹〃鏍囪瘑 榛樿: false + # 涓� baseline-on-migrate: true 鎼厤浣跨敤,灏嗗綋鍓嶆暟鎹簱鍒濆鐗堟湰璁剧疆涓�0 + baseline-version: 0 + clean-disabled: true #绂佹flyway鎵ц娓呯悊 + # 鍋囧宸茬粡鎵ц浜嗙増鏈�1鍜岀増鏈�3锛屽鏋滃鍔犱簡涓�涓増鏈�2锛屼笅闈㈣繖涓�夐」灏嗕細鍏佽鎵ц鐗堟湰2鐨勮剼鏈� + out-of-order: true + table: flyway_schema_history_${spring.application.name} #鐢ㄤ簬璁板綍鎵�鏈夌殑鐗堟湰鍙樺寲璁板綍 \ No newline at end of file -- Gitblit v1.8.0