From 7ee33172a5e4edeaf7f9ce370c3bc64eda0bec9d Mon Sep 17 00:00:00 2001 From: mk1990 <153958232@qq.com> Date: Fri, 15 Apr 2022 17:05:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=96=B9=E6=A1=88=E8=A7=A3=E5=86=B3=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=80=9A=E9=81=93=E8=B0=83=E7=94=A8=E7=99=BE=E5=BA=A6?= =?UTF-8?q?API=E9=97=AE=E9=A2=98=E4=B9=8B=E5=89=8D=E7=9A=84=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 16 +++++++++------- src/main/resources/application.yml | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b1950c5d..b59419ab 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,13 +7,13 @@ spring: # REDIS数据库配置 redis: # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1 - host: 127.0.0.1 + host: 192.168.213.114 # [必须修改] 端口号 port: 6379 # [可选] 数据库 DB database: 6 # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接 - password: face2020 + password: 123456 # [可选] 超时时间 timeout: 10000 # [可选] jdbc数据库配置, 项目使用sqlite作为数据库，一般不需要配置 @@ -50,7 +50,7 @@ server: # 作为28181服务器的配置 sip: # [必须修改] 本机的IP - ip: 192.168.41.16 + ip: 192.168.213.58 # [可选] 28181服务监听的端口 port: 5060 # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007） @@ -61,15 +61,17 @@ sip: # [可选] id: 44010200492000000001 # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验 - password: admin123 + password: 12345678 #zlm 默认服务器配置 media: - id: FQ3TF8yT83wh5Wvz + id: mediaServer01 # [必须修改] zlm服务器的内网IP - ip: 192.168.41.16 + ip: 192.168.213.114 # [必须修改] zlm服务器的http.port - http-port: 8091 + http-port: 80 + rtp-proxy-port: 10000 + auto-config: true # [可选] zlm服务器的hook.admin_params=secret secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d74c444c..3d7808a0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: local + active: dev From 3cb59aa4d1407a43322784990a6b34e7b030486c Mon Sep 17 00:00:00 2001 From: mk1990 <153958232@qq.com> Date: Mon, 16 May 2022 10:10:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9application-dev.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 16 +++++++--------- src/main/resources/application.yml | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b59419ab..b1950c5d 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,13 +7,13 @@ spring: # REDIS数据库配置 redis: # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1 - host: 192.168.213.114 + host: 127.0.0.1 # [必须修改] 端口号 port: 6379 # [可选] 数据库 DB database: 6 # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接 - password: 123456 + password: face2020 # [可选] 超时时间 timeout: 10000 # [可选] jdbc数据库配置, 项目使用sqlite作为数据库，一般不需要配置 @@ -50,7 +50,7 @@ server: # 作为28181服务器的配置 sip: # [必须修改] 本机的IP - ip: 192.168.213.58 + ip: 192.168.41.16 # [可选] 28181服务监听的端口 port: 5060 # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007） @@ -61,17 +61,15 @@ sip: # [可选] id: 44010200492000000001 # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验 - password: 12345678 + password: admin123 #zlm 默认服务器配置 media: - id: mediaServer01 + id: FQ3TF8yT83wh5Wvz # [必须修改] zlm服务器的内网IP - ip: 192.168.213.114 + ip: 192.168.41.16 # [必须修改] zlm服务器的http.port - http-port: 80 - rtp-proxy-port: 10000 - auto-config: true + http-port: 8091 # [可选] zlm服务器的hook.admin_params=secret secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3d7808a0..d74c444c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: dev + active: local From 6319f8f3f4440d1066ac7e394b8672e4eb6aaf33 Mon Sep 17 00:00:00 2001 From: mk1990 <153958232@qq.com> Date: Wed, 25 May 2022 13:39:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=B3=A8=E5=86=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=92=8C?= =?UTF-8?q?=E9=80=9A=E9=81=93=E4=BF=A1=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java index 0144e83b..e4a2a19c 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java @@ -77,13 +77,15 @@ public class DeviceServiceImpl implements IDeviceService { if (device.getCreateTime() == null) { device.setCreateTime(now); logger.info("[设备上线,首次注册]: {}，查询设备信息以及通道信息", device.getDeviceId()); + deviceMapper.add(device); + redisCatchStorage.updateDevice(device); commander.deviceInfoQuery(device); sync(device); - deviceMapper.add(device); }else { deviceMapper.update(device); + redisCatchStorage.updateDevice(device); } - redisCatchStorage.updateDevice(device); + // 上线添加订阅 if (device.getSubscribeCycleForCatalog() > 0) { // 查询在线设备那些开启了订阅，为设备开启定时的目录订阅