648540858
|
c9d2c69155
|
修复多平台同时导入时的bug
|
2022-03-15 11:44:11 +08:00 |
|
648540858
|
3cb0677fe0
|
#396
|
2022-03-15 10:47:07 +08:00 |
|
mrjackwang
|
29585e09bb
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-15 10:28:23 +08:00 |
|
648540858
|
c570a88b0f
|
修复平台编辑的bug
|
2022-03-15 10:13:19 +08:00 |
|
648540858
|
319e149692
|
修复使用ffmpeg拉流代理时ffmpeg cmd模板空白的bug
|
2022-03-15 09:45:11 +08:00 |
|
648540858
|
00b9831fe4
|
#394
|
2022-03-14 18:34:25 +08:00 |
|
648540858
|
f2af3bd989
|
优化点播, 级联点播级联录像。级联列表显示订阅状态
|
2022-03-14 18:24:30 +08:00 |
|
648540858
|
91eb4a09b8
|
使用zlm新特性支持对与国标流关闭音频以加快拉流速度
|
2022-03-14 11:36:01 +08:00 |
|
648540858
|
d1b0f3dcee
|
#390
|
2022-03-11 11:22:55 +08:00 |
|
648540858
|
ddc0779b4f
|
移除多余字段
|
2022-03-11 11:22:47 +08:00 |
|
648540858
|
dd2deaaa3c
|
#376
|
2022-03-11 09:58:36 +08:00 |
|
648540858
|
3735943594
|
优化目录订阅时父节点的更新
|
2022-03-11 09:54:35 +08:00 |
|
648540858
|
613c771c45
|
Merge pull request #388 from AbnerSC/wvp-28181-2.0
修复关闭按需拉流无效的问题，和几个小问题
|
2022-03-11 09:49:48 +08:00 |
|
648540858
|
edc98da01b
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-11 09:49:38 +08:00 |
|
mrjackwang
|
6a77a7ded7
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-10 21:00:42 +08:00 |
|
648540858
|
0932382a36
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-10 20:54:14 +08:00 |
|
648540858
|
63fec78d24
|
优化目录订阅以及国标级联目录订阅回复
|
2022-03-10 20:53:56 +08:00 |
|
dengming
|
dd7695d7c6
|
Merge branch 'wvp-28181-2.0' of github.com:AbnerSC/wvp-GB28181-pro into wvp-28181-2.0
|
2022-03-10 17:52:59 +08:00 |
|
sc.dm
|
e8c244e907
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-10 17:42:02 +08:00 |
|
dengming
|
c0139c4230
|
优化pom配置，解决编译Failed to perform fetch问题
|
2022-03-10 17:40:45 +08:00 |
|
dengming
|
54b2b1c867
|
删除重复字段，channelId字段查询了两次
|
2022-03-10 17:27:07 +08:00 |
|
dengming
|
0c9691ccf5
|
删除多余依赖包com.google.guava:30.0-jre，项目引用了版本31
|
2022-03-10 15:24:50 +08:00 |
|
dengming
|
740fedc005
|
修复关闭按需拉流无效的问题
|
2022-03-10 15:08:41 +08:00 |
|
648540858
|
b00e099e6f
|
Merge pull request #387 from AbnerSC/wvp-28181-2.0
修复云端录像播放和下载路径错误的问题
|
2022-03-10 14:59:12 +08:00 |
|
dengming
|
1a1394bf9d
|
修复云端录像播放和下载路径错误的问题
|
2022-03-10 11:33:51 +08:00 |
|
Fang
|
339b51d233
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-07 14:21:29 +08:00 |
|
李防
|
b9710228dd
|
InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
|
2022-03-07 14:20:27 +08:00 |
|
648540858
|
7044cf8c29
|
修复导入通道时无平台关联时的bug
|
2022-03-07 10:47:06 +08:00 |
|
mrjackwang
|
d58fd269e8
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-07 09:01:14 +08:00 |
|
648540858
|
1bdb87ae5a
|
导出sql
|
2022-03-07 08:27:38 +08:00 |
|
648540858
|
09855e03e8
|
优化失败的录像点播的ssrc释放逻辑
|
2022-03-07 01:23:23 +08:00 |
|
648540858
|
13899f771b
|
优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项
|
2022-03-07 01:17:45 +08:00 |
|
648540858
|
38d31a97b8
|
Merge pull request #375 from MeBetterMan/wvp-28181-2.0
修改3个小bug
|
2022-03-06 00:09:34 +08:00 |
|
李防
|
a1cb002609
|
修改3个小bug
|
2022-03-05 17:05:05 +08:00 |
|
mrjackwang
|
f1e5218a6a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-04 20:37:17 +08:00 |
|
648540858
|
a919611214
|
修复合并分支造成的bug
|
2022-03-04 15:59:29 +08:00 |
|
648540858
|
9450cb0c40
|
Merge remote-tracking branch 'gitee.com/wvp-pro-record' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-03-04 15:39:30 +08:00 |
|
648540858
|
bdc704644a
|
Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题"
This reverts commit 16e8aa323f.
|
2022-03-04 15:36:16 +08:00 |
|
648540858
|
922d61c781
|
Merge remote-tracking branch 'origin/wvp-pro-record' into wvp-28181-2.0
# Conflicts:
# web_src/src/components/control.vue
|
2022-03-04 15:29:56 +08:00 |
|
648540858
|
d6d226ef2c
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-03-04 15:27:28 +08:00 |
|
648540858
|
346c90d9d0
|
修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题
|
2022-03-04 11:26:53 +08:00 |
|
648540858
|
c1231f28d8
|
readme更新
|
2022-03-04 10:32:28 +08:00 |
|
648540858
|
b48e93e97a
|
去除lombok，readme更新
|
2022-03-04 10:30:55 +08:00 |
|
mrjackwang
|
0e4c22f72a
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-03 19:52:16 +08:00 |
|
648540858
|
7af0cc437a
|
优化国标级联录像预览
|
2022-03-03 18:23:52 +08:00 |
|
648540858
|
42cbec85e8
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-03-03 16:55:20 +08:00 |
|
648540858
|
5c69ffce33
|
参数名错误
|
2022-03-03 16:54:47 +08:00 |
|
648540858
|
cc7f784198
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-03-03 16:28:32 +08:00 |
|
648540858
|
0c909e0c85
|
Merge pull request #365 from TristingChen/zlm-node-manage
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 16:23:03 +08:00 |
|
648540858
|
1527b0e839
|
国标录像支持多端同时播放
|
2022-03-03 15:57:28 +08:00 |
|