From 3609d361118d75dd221959977bfac33a37815953 Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期一, 15 三月 2021 15:24:41 +0800
Subject: [PATCH] 完成响应上级远程启动信令执行
---
src/main/resources/application-dev.yml | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 6cee0cb..b879403 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,11 +1,4 @@
spring:
- # [涓嶉渶瑕佹敼]
- application:
- name: iot-vmp-vmanager
- # [涓嶉渶瑕佹敼] 褰卞瓙鏁版嵁瀛樺偍鏂瑰紡锛屾敮鎸乺edis銆乯dbc,鏆備笉鏀寔mysql,
- database: redis
- # [涓嶉渶瑕佹敼] 閫氫俊鏂瑰紡锛屾敮鎸乲afka銆乭ttp
- communicate: http
# REDIS鏁版嵁搴撻厤缃�
redis:
# [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1
@@ -20,13 +13,20 @@
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
name: eiot
- url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
+ url: jdbc:sqlite::resource:wvp.sqlite
username:
password:
type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.jdbc.Driver
-
+ driver-class-name: org.sqlite.JDBC
+ max-active: 1
+ min-idle: 1
# [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙h皟鐢ㄩ兘鏄繖涓鍙�
server:
@@ -35,18 +35,18 @@
# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
sip:
# [蹇呴』淇敼] 鏈満鐨処P, 蹇呴』鏄綉鍗′笂鐨処P
- ip: 192.168.1.44
+ ip: 192.168.0.100
# [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
port: 5060
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
# 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
# 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆
# [鍙�塢
- domain: 3402000000
+ domain: 4401020049
# [鍙�塢
- id: 34020000002000000001
+ id: 44010200492000000001
# [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�
- password: 12345678
+ password: admin123
# 鐧婚檰鐨勭敤鎴峰悕瀵嗙爜
auth:
@@ -58,9 +58,9 @@
#zlm鏈嶅姟鍣ㄩ厤缃�
media:
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
- ip: 192.168.1.44
+ ip: 192.168.0.100
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑鍏綉IP, 鍐呯綉閮ㄧ讲缃┖鍗冲彲
- wanIp:
+ wanIp:
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook鎵�浣跨敤鐨処P, 榛樿浣跨敤sip.ip
hookIp:
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port
@@ -70,12 +70,12 @@
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑general.streamNoneReaderDelayMS
- streamNoneReaderDelayMS: 600000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�, -1琛ㄧず姘镐笉鑷姩鍏抽棴,鍗� 鍏抽棴鎸夐渶鎷夋祦
+ streamNoneReaderDelayMS: 18000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�, -1琛ㄧず姘镐笉鑷姩鍏抽棴,鍗� 鍏抽棴鎸夐渶鎷夋祦
# [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱, 闇�瑕乺tp.enable=true
- autoApplyPlay: true
+ autoApplyPlay: false
# [鍙�塢 閮ㄥ垎璁惧闇�瑕佹墿灞昐DP锛岄渶瑕佹墦寮�姝よ缃�
seniorSdp: false
- # 鍚敤udp澶氱鍙fā寮�, 璇︾粏瑙i噴鍙傝��: https://github.com/xia-chu/ZLMediaKit/wiki/GB28181%E6%8E%A8%E6%B5%81 涓嬬殑楂橀樁浣跨敤
+ # 鍚敤udp澶氱鍙fā寮�
rtp:
# [鍙�塢 鏄惁鍚敤udp澶氱鍙fā寮�, 寮�鍚悗浼氬湪udpPortRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
enable: true
@@ -92,4 +92,8 @@
level:
com:
genersoft:
- iot: debug
\ No newline at end of file
+ iot: debug
+# [鏍规嵁涓氬姟闇�姹傞厤缃甝
+userSettings:
+ # 淇濆瓨绉诲姩浣嶇疆鍘嗗彶杞ㄨ抗锛歵rue:淇濈暀鍘嗗彶鏁版嵁锛宖alse:浠呬繚鐣欐渶鍚庣殑浣嶇疆(榛樿)
+ savePositionHistory: false
\ No newline at end of file
--
Gitblit v1.8.0