Merge branch 'master' into 重构/1078

# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/TcpServer.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/utils/CivilCodeUtil.java
#	src/main/resources/application.yml
#	web_src/src/layout/UiHeader.vue
#	web_src/src/router/index.js

src/main/resources/application-dev.yml

@@ -44,7 +44,7 @@ spring:
             max-lifetime: 1200000                 # 是池中连接关闭后的最长生命周期（以毫秒为单位)
 #[可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
 server:
-  port: 8080
+  port: 18080
   # [可选] HTTPS配置， 默认不开启
   ssl:
     # [可选] 是否开启HTTPS访问
@@ -68,21 +68,17 @@ sip:
   # [可选]
   id: 41010500002000000001
   # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验
-  password: bajiuwulian1006
+  password: 12345678
   # 是否存储alarm信息
-  alarm: true
+  alarm: false
 
 #zlm 默认服务器配置
 media:
   id: zlmediakit-local
   # [必须修改] zlm服务器的内网IP
-  ip: 172.19.128.50
-  # [可选] 有公网IP就配置公网IP, 不可用域名
-  wan_ip:
+  ip: 192.168.1.10
   # [必须修改] zlm服务器的http.port
   http-port: 9092
-  # [可选] zlm服务器访问WVP所使用的IP, 默认使用127.0.0.1，zlm和wvp没有部署在同一台服务器时必须配置
-  hook-ip: 172.19.128.50
   # [必选选] zlm服务器的hook.admin_params=secret
   secret: TWSYFgYJOQWB4ftgeYut8DW4wbs7pQnj
   # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
@@ -90,9 +86,9 @@ media:
     # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
     enable: true
     # [可选] 在此范围内选择端口用于媒体流传输, 必须提前在zlm上配置该属性，不然自动配置此属性可能不成功
-    port-range: 50000,50300 # 端口范围
+    port-range: 40000,45000 # 端口范围
     # [可选] 国标级联在此范围内选择端口发送媒体流,
-    send-port-range: 50000,50300 # 端口范围
+    send-port-range: 50000,55000 # 端口范围
 # [根据业务需求配置]
 user-settings:
   # 点播/录像回放 等待超时时间,单位：毫秒

src/main/resources/civilCode.csv

@@ -1,38 +1,40 @@
 编号,名称,上级
 11,北京市, 
-110101,东城区,11
-110102,西城区,11
-110105,朝阳区,11
-110106,丰台区,11
-110107,石景山区,11
-110108,海淀区,11
-110109,门头沟区,11
-110111,房山区,11
-110112,通州区,11
-110113,顺义区,11
-110114,昌平区,11
-110115,大兴区,11
-110116,怀柔区,11
-110117,平谷区,11
-110118,密云区,11
-110119,延庆区,11
+1101,市辖区,11
+110101,东城区,1101
+110102,西城区,1101
+110105,朝阳区,1101
+110106,丰台区,1101
+110107,石景山区,1101
+110108,海淀区,1101
+110109,门头沟区,1101
+110111,房山区,1101
+110112,通州区,1101
+110113,顺义区,1101
+110114,昌平区,1101
+110115,大兴区,1101
+110116,怀柔区,1101
+110117,平谷区,1101
+110118,密云区,1101
+110119,延庆区,1101
 12,天津市, 
-120101,和平区,12
-120102,河东区,12
-120103,河西区,12
-120104,南开区,12
-120105,河北区,12
-120106,红桥区,12
-120110,东丽区,12
-120111,西青区,12
-120112,津南区,12
-120113,北辰区,12
-120114,武清区,12
-120115,宝坻区,12
-120116,滨海新区,12
-120117,宁河区,12
-120118,静海区,12
-120119,蓟州区,12
+1201,市辖区,12
+120101,和平区,1201
+120102,河东区,1201
+120103,河西区,1201
+120104,南开区,1201
+120105,河北区,1201
+120106,红桥区,1201
+120110,东丽区,1201
+120111,西青区,1201
+120112,津南区,1201
+120113,北辰区,1201
+120114,武清区,1201
+120115,宝坻区,1201
+120116,滨海新区,1201
+120117,宁河区,1201
+120118,静海区,1201
+120119,蓟州区,1201
 13,河北省, 
 1301,石家庄市,13
 130102,长安区,1301
@@ -786,22 +788,23 @@
 232721,呼玛县,2327
 232722,塔河县,2327
 31,上海市, 
-310101,黄浦区,31
-310104,徐汇区,31
-310105,长宁区,31
-310106,静安区,31
-310107,普陀区,31
-310109,虹口区,31
-310110,杨浦区,31
-310112,闵行区,31
-310113,宝山区,31
-310114,嘉定区,31
-310115,浦东新区,31
-310116,金山区,31
-310117,松江区,31
-310118,青浦区,31
-310120,奉贤区,31
-310151,崇明区,31
+3101,市辖区,31
+310101,黄浦区,3101
+310104,徐汇区,3101
+310105,长宁区,3101
+310106,静安区,3101
+310107,普陀区,3101
+310109,虹口区,3101
+310110,杨浦区,3101
+310112,闵行区,3101
+310113,宝山区,3101
+310114,嘉定区,3101
+310115,浦东新区,3101
+310116,金山区,3101
+310117,松江区,3101
+310118,青浦区,3101
+310120,奉贤区,3101
+310151,崇明区,3101
 32,江苏省, 
 3201,南京市,32
 320102,玄武区,3201
@@ -2226,44 +2229,45 @@
 469029,保亭黎族苗族自治县,46
 469030,琼中黎族苗族自治县,46
 50,重庆市, 
-500101,万州区,50
-500102,涪陵区,50
-500103,渝中区,50
-500104,大渡口区,50
-500105,江北区,50
-500106,沙坪坝区,50
-500107,九龙坡区,50
-500108,南岸区,50
-500109,北碚区,50
-500110,綦江区,50
-500111,大足区,50
-500112,渝北区,50
-500113,巴南区,50
-500114,黔江区,50
-500115,长寿区,50
-500116,江津区,50
-500117,合川区,50
-500118,永川区,50
-500119,南川区,50
-500120,璧山区,50
-500151,铜梁区,50
-500152,潼南区,50
-500153,荣昌区,50
-500154,开州区,50
-500155,梁平区,50
-500156,武隆区,50
-500229,城口县,50
-500230,丰都县,50
-500231,垫江县,50
-500233,忠县,50
-500235,云阳县,50
-500236,奉节县,50
-500237,巫山县,50
-500238,巫溪县,50
-500240,石柱土家族自治县,50
-500241,秀山土家族苗族自治县,50
-500242,酉阳土家族苗族自治县,50
-500243,彭水苗族土家族自治县,50
+5001,市辖区,50
+500101,万州区,5001
+500102,涪陵区,5001
+500103,渝中区,5001
+500104,大渡口区,5001
+500105,江北区,5001
+500106,沙坪坝区,5001
+500107,九龙坡区,5001
+500108,南岸区,5001
+500109,北碚区,5001
+500110,綦江区,5001
+500111,大足区,5001
+500112,渝北区,5001
+500113,巴南区,5001
+500114,黔江区,5001
+500115,长寿区,5001
+500116,江津区,5001
+500117,合川区,5001
+500118,永川区,5001
+500119,南川区,5001
+500120,璧山区,5001
+500151,铜梁区,5001
+500152,潼南区,5001
+500153,荣昌区,5001
+500154,开州区,5001
+500155,梁平区,5001
+500156,武隆区,5001
+500229,城口县,5001
+500230,丰都县,5001
+500231,垫江县,5001
+500233,忠县,5001
+500235,云阳县,5001
+500236,奉节县,5001
+500237,巫山县,5001
+500238,巫溪县,5001
+500240,石柱土家族自治县,5001
+500241,秀山土家族苗族自治县,5001
+500242,酉阳土家族苗族自治县,5001
+500243,彭水苗族土家族自治县,5001
 51,四川省, 
 5101,成都市,51
 510104,锦江区,5101
@@ -3217,4 +3221,4 @@
 659009,昆玉市,65
 71,台湾省, 
 81,香港特别行政区, 
-82,澳门特别行政区, 
+82,澳门特别行政区, 

src/main/resources/配置详情.yml

@@ -123,6 +123,8 @@ sip:
     # keepalliveToOnline: false
     # 是否存储alarm信息
     alarm: false
+    # 命令发送等待回复的超时时间, 单位:秒
+    timeout: 15
 
 # 做为JT1078服务器的配置
 jt1078: