From ba769a0082d99c1773c568606062f9d610b9fa3a Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: Wed, 27 Jan 2021 15:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=A7=BB=E5=8A=A8=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.yml |  20 ++++++++++++--------
 src/main/resources/wvp.sqlite          | Bin 32768 -> 40960 bytes
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index c235c81e..26f5d084 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -35,18 +35,18 @@ server:
 # 作为28181服务器的配置
 sip:
     # [必须修改] 本机的IP, 必须是网卡上的IP
-    ip: 192.168.1.44
+    ip: 192.168.0.100
     # [可选] 28181服务监听的端口
     port: 5060
     # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007）
     # 后两位为行业编码，定义参照附录D.3
     # 3701020049标识山东济南历下区 信息行业接入
     # [可选]
-    domain: 3402000000
+    domain: 4401020049
     # [可选]
-    id: 34020000002000000001
+    id: 44010200492000000001
     # [可选] 默认设备认证密码，后续扩展使用设备单独密码
-    password: 12345678
+    password: admin123
 
 # 登陆的用户名密码
 auth:
@@ -58,7 +58,7 @@ auth:
 #zlm服务器配置
 media:
     # [必须修改] zlm服务器的内网IP
-    ip: 192.168.1.44
+    ip: 192.168.0.100
     # [可选] zlm服务器的公网IP, 内网部署置空即可
     wanIp:
     # [可选] zlm服务器的hook所使用的IP, 默认使用sip.ip
@@ -70,9 +70,9 @@ media:
     # [可选] zlm服务器的hook.admin_params=secret
     secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
     # [可选] zlm服务器的general.streamNoneReaderDelayMS
-    streamNoneReaderDelayMS:  600000  # 无人观看多久自动关闭流, -1表示永不自动关闭,即 关闭按需拉流
+    streamNoneReaderDelayMS:  18000  # 无人观看多久自动关闭流, -1表示永不自动关闭,即 关闭按需拉流
     # [可选] 自动点播， 使用固定流地址进行播放时，如果未点播则自动进行点播, 需要rtp.enable=true
-    autoApplyPlay: true
+    autoApplyPlay: false
     # [可选] 部分设备需要扩展SDP，需要打开此设置
     seniorSdp: false
     # 启用udp多端口模式, 详细解释参考: https://github.com/xia-chu/ZLMediaKit/wiki/GB28181%E6%8E%A8%E6%B5%81 下的高阶使用
@@ -92,4 +92,8 @@ logging:
     level:
         com:
             genersoft:
-                iot: debug
\ No newline at end of file
+                iot: debug
+# [根据业务需求配置]
+userSettings:
+    # 保存移动位置历史轨迹：true:保留历史数据，false:仅保留最后的位置(默认)
+    savePositionHistory: false
\ No newline at end of file
diff --git a/src/main/resources/wvp.sqlite b/src/main/resources/wvp.sqlite
index 023ea355e92eefd18ce96e253a769d687769c5ed..ff76bcd6634d96445d8a44c0b72dd1483a4801e6 100644
GIT binary patch
delta 1089
zcmZo@U}`wPG(lSMECT}r7ZfuA>9Z4cjOEWV=((@p<yy(W&h~_XmyI)mcRJe>o|AlB
z{F^{<v!K9Z=FN#L{%q{Qjf`yK>5h}n^GMXk7Z>JamZYXu6r>iF#FwPz7Q~k%Cgr5Y
z8v-FtIWFD^#>4F5j*g5ixe(<zmEtyp(>chs-Z8{gA;i(i$5lZIw@M`qUM>ZN=#<p5
z%;Z$hlvsrj*N6}WKYt(&_3_bBK$7)K%uR*JLxoE+VFKtHa`N-i>oZGAQ-B(RTpfKd
z<P%Hq$R_3>%R((HE=WxUIuB$T%vG61smUdo`FSX!MX3e(MJ2)crDjFRD9#NC^7M5K
zid67+jnqK+S4SZl><vv#-UtRi@pwyM)X6L7<|kzWBdQ?3I1^++ydflf;-TVfjZAEt
zkMJ-tGBLPKY;>w`R%v8n7q_%zY)uA78LDcSDcD6>fl-BsDX7C>7QwW};*F(xSb%^d
zk;G`i6Aw8=#!@{}q>vm<Xt5NXo|>PMT9TO@Tv-gvGAQXSInO6A9bF``B-RL=Xd!_>
zD3-k&nc1MRtU(}_VS&%KNWfr`g21E#ZbsJ4AML;JFG^4V@+StcvoZop2u`pV0323R
AW&i*H

delta 112
zcmZoTz|_#dG(lSM1Oo#D2N1IXF%u9UnW$qdeS$&H{w6QiN(NT8Ck(u7oDsa!*`Dy6
z<f-GS+bk&XoOyF1i$B}O7D=YbCwcxdG1+Wvv|yTKz`2=I;Jf~2g@)(+6DKIJG6GFw
N-7MJfg?~|k0svRQAC~|C