From 86fdf7285657727a3f893496fd54c65e7788c51b Mon Sep 17 00:00:00 2001 From: koisi Date: Mon, 5 Aug 2024 15:40:24 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E8=AF=AD=E6=B3=95?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E7=9A=84=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 最新的一次合并，ConsoleNet.vue 少了个逗号。 --- web_src/src/components/console/ConsoleNet.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/src/components/console/ConsoleNet.vue b/web_src/src/components/console/ConsoleNet.vue index e0136807..6266f35a 100755 --- a/web_src/src/components/console/ConsoleNet.vue +++ b/web_src/src/components/console/ConsoleNet.vue @@ -103,7 +103,7 @@ export default { bottom: "15px", selected: {}, } - } + }, chartEvents: { legendselectchanged: (item) => { this.extend.legend.selected = item.selected; From c1a8e62f2341e380f25f9f5b5029865777c0118a Mon Sep 17 00:00:00 2001 From: koisi Date: Mon, 5 Aug 2024 17:04:58 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D6=E6=9C=8825=E6=97=A5?= =?UTF-8?q?=E5=90=88=E5=B9=B6271=E6=97=B6=EF=BC=8C=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9C=AA=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 处理ZLM推拉流事件的参数由StreamPushItem变更成OnStreamChangedHookParam了，然后有个地方没有同步更新。 --- .../genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java index e70e195c..b33cad8a 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java @@ -10,7 +10,6 @@ import com.genersoft.iot.vmp.media.bean.MediaInfo; import com.genersoft.iot.vmp.media.bean.MediaServer; import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent; import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo; -import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; import com.genersoft.iot.vmp.service.bean.GPSMsgInfo; import com.genersoft.iot.vmp.service.bean.MessageForPushChannel; @@ -707,7 +706,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage { @Override public void removePushListItem(String app, String stream, String mediaServerId) { String key = VideoManagerConstants.PUSH_STREAM_LIST + app + "_" + stream; - StreamPushItem param = (StreamPushItem)redisTemplate.opsForValue().get(key); + OnStreamChangedHookParam param = (OnStreamChangedHookParam)redisTemplate.opsForValue().get(key); if (param != null && param.getMediaServerId().equalsIgnoreCase(mediaServerId)) { redisTemplate.delete(key); } From 5772d3f2315a70770cc357456a4a532c7130d2aa Mon Sep 17 00:00:00 2001 From: koisi Date: Mon, 5 Aug 2024 18:59:02 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=2087c071:=E5=90=88?= =?UTF-8?q?=E5=B9=B6271=E5=88=86=E6=94=AF=20=E7=9A=84=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=81=97=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将推流信息记录至redis，由StreamPushItem变更成OnStreamChangedHookParam时，漏了设置serverId。 --- .../genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java index b33cad8a..f4647cdb 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java @@ -694,6 +694,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage { @Override public void addPushListItem(String app, String stream, MediaArrivalEvent event) { String key = VideoManagerConstants.PUSH_STREAM_LIST + app + "_" + stream; + event.getHookParam().setSeverId(userSetting.getServerId()); redisTemplate.opsForValue().set(key, event.getHookParam()); } From 402ffa0b1e6b0453338a57469e00903564ac53f5 Mon Sep 17 00:00:00 2001 From: linshunhua Date: Tue, 6 Aug 2024 16:52:22 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8ORACLE,=E8=BE=BE?= =?UTF-8?q?=E6=A2=A6=E7=AD=89=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/genersoft/iot/vmp/storager/dao/UserMapper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java index 168a5778..8bfeab78 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java @@ -29,7 +29,7 @@ public interface UserMapper { @Delete("DELETE from wvp_user WHERE id != 1 and id=#{id}") int delete(int id); - @Select("select u.*, r.id as role_id, r.name as roleName, r.authority as roleAuthority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.username=#{username} AND u.password=#{password}") + @Select("select u.*, r.name as roleName, r.authority as roleAuthority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.username=#{username} AND u.password=#{password}") @Results(id = "roleMap", value = { @Result(column = "role_id", property = "role.id"), @Result(column = "role_name", property = "role.name"), @@ -39,19 +39,19 @@ public interface UserMapper { }) User select(@Param("username") String username, @Param("password") String password); - @Select("select u.*, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.id=#{id}") + @Select("select u.*, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.id=#{id}") @ResultMap(value="roleMap") User selectById(int id); - @Select("select u.*, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.username=#{username}") + @Select("select u.*, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.username=#{username}") @ResultMap(value="roleMap") User getUserByUsername(String username); - @Select("select u.*, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id") + @Select("select u.*, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id") @ResultMap(value="roleMap") List selectAll(); - @Select("select u.id, u.username,u.push_key,u.role_id, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u join wvp_user_role r on u.role_id=r.id") + @Select("select u.id, u.username,u.push_key,u.role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u join wvp_user_role r on u.role_id=r.id") @ResultMap(value="roleMap") List getUsers(); From fbc734354643c9c248f8ab2aada4c3566419d3e7 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Wed, 7 Aug 2024 14:20:48 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{2.7.2/初始化-mysql-2.7.2.sql => 2.7.3/初始化-mysql-2.7.3.sql} | 0 .../初始化-postgresql-kingbase-2.7.3.sql} | 0 数据库/{2.7.2/更新-mysql-2.7.2.sql => 2.7.3/更新-mysql-2.7.3.sql} | 0 .../更新-postgresql-kingbase-2.7.3.sql} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename 数据库/{2.7.2/初始化-mysql-2.7.2.sql => 2.7.3/初始化-mysql-2.7.3.sql} (100%) rename 数据库/{2.7.2/初始化-postgresql-kingbase-2.7.2.sql => 2.7.3/初始化-postgresql-kingbase-2.7.3.sql} (100%) rename 数据库/{2.7.2/更新-mysql-2.7.2.sql => 2.7.3/更新-mysql-2.7.3.sql} (100%) rename 数据库/{2.7.2/更新-postgresql-kingbase-2.7.2.sql => 2.7.3/更新-postgresql-kingbase-2.7.3.sql} (100%) diff --git a/数据库/2.7.2/初始化-mysql-2.7.2.sql b/数据库/2.7.3/初始化-mysql-2.7.3.sql similarity index 100% rename from 数据库/2.7.2/初始化-mysql-2.7.2.sql rename to 数据库/2.7.3/初始化-mysql-2.7.3.sql diff --git a/数据库/2.7.2/初始化-postgresql-kingbase-2.7.2.sql b/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql similarity index 100% rename from 数据库/2.7.2/初始化-postgresql-kingbase-2.7.2.sql rename to 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql diff --git a/数据库/2.7.2/更新-mysql-2.7.2.sql b/数据库/2.7.3/更新-mysql-2.7.3.sql similarity index 100% rename from 数据库/2.7.2/更新-mysql-2.7.2.sql rename to 数据库/2.7.3/更新-mysql-2.7.3.sql diff --git a/数据库/2.7.2/更新-postgresql-kingbase-2.7.2.sql b/数据库/2.7.3/更新-postgresql-kingbase-2.7.3.sql similarity index 100% rename from 数据库/2.7.2/更新-postgresql-kingbase-2.7.2.sql rename to 数据库/2.7.3/更新-postgresql-kingbase-2.7.3.sql From 72f7e1a1d124396fd8c534d1a5b96ab05c19a9bf Mon Sep 17 00:00:00 2001 From: rongzedong Date: Mon, 2 Sep 2024 16:22:17 +0800 Subject: [PATCH 6/8] Update deployment.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加wvp的默认账号密码。有人反馈，之前文档里并未提及。 --- doc/_content/introduction/deployment.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/_content/introduction/deployment.md b/doc/_content/introduction/deployment.md index f11fe7f2..822bb110 100644 --- a/doc/_content/introduction/deployment.md +++ b/doc/_content/introduction/deployment.md @@ -44,4 +44,8 @@ window.baseUrl = "http://xxx.com:18080" ``` `这里的地址是需要客户电脑能访问到的，因为请求是客户端电脑发起，与代理不同` [接入设备](./_content/ability/device.md) +### 默认账号和密码 +部署完毕后，可以通过访问 ip加端口的方式访问 WVP ，WVP的默认登录账号和密码均为 admin。 + + From 8d9e19c4407af3264546052a717fffbb4b65bee6 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Wed, 11 Sep 2024 09:12:34 +0800 Subject: [PATCH 7/8] Update solve.md --- .github/ISSUE_TEMPLATE/solve.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/solve.md b/.github/ISSUE_TEMPLATE/solve.md index 75a0eed7..473dbd19 100644 --- a/.github/ISSUE_TEMPLATE/solve.md +++ b/.github/ISSUE_TEMPLATE/solve.md @@ -16,7 +16,7 @@ assignees: '' - 5. 是否使用https - 6. 方便的话提供下使用的设备品牌或平台 - 7. 你做过哪些尝试 - - 8. 代码更新时间 + - 8. 代码更新时间（旧版本请更新最新版本代码测试） **内容描述:** From f6eeb59371816220b8daae493376928607c6ce4e Mon Sep 17 00:00:00 2001 From: hx <2907898590@qq.com> Date: Sat, 14 Sep 2024 15:16:47 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96wssSslPort=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=20=E4=BF=AE=E5=A4=8D=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E9=9B=86=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=BF=83=E8=B7=B3=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/media/zlm/ZLMMediaServerStatusManger.java | 6 ++++++ .../genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java index cdf1e3f2..1d4437a2 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java @@ -235,6 +235,12 @@ public class ZLMMediaServerStatusManger { if (mediaServerItem.getRtpProxyPort() == 0) { mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort()); } + if (mediaServerItem.getFlvSSLPort() == 0) { + mediaServerItem.setFlvSSLPort(zlmServerConfig.getHttpSSLport()); + } + if (mediaServerItem.getWsFlvSSLPort() == 0) { + mediaServerItem.setWsFlvSSLPort(zlmServerConfig.getHttpSSLport()); + } mediaServerItem.setHookAliveInterval(10F); } 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 47b902e1..3c521640 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java @@ -396,7 +396,7 @@ public class DeviceServiceImpl implements IDeviceService { String now = DateUtil.getNow(); device.setUpdateTime(now); - device.setCharset(device.getCharset().toUpperCase()); + device.setCharset(device.getCharset() == null ? "" : device.getCharset().toUpperCase()); device.setUpdateTime(DateUtil.getNow()); if (deviceMapper.update(device) > 0) { redisCatchStorage.updateDevice(device);