648540858
|
e9586687f7
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-25 10:01:12 +08:00 |
|
648540858
|
a77ba194ad
|
优化目录推送CivilCode值
|
2022-03-24 15:59:38 +08:00 |
648540858
|
2142b7ffcd
|
Merge pull request #379 from MeBetterMan/wvp-28181-2.0
级联场景，invite消息中获取channelid。以前从invite的第一行读取，现在从subject header读取。
|
2022-03-22 11:45:11 +08:00 |
|
648540858
|
bc1b8098a2
|
修身颠簸与录像回放redis前缀重复的问题
|
2022-03-21 16:58:42 +08:00 |
brewswang
|
7af3cb03ec
|
执法记录仪在更新目录数据的时候需要更新位置信息
|
2022-03-17 12:39:59 +08:00 |
|
648540858
|
59ef6e67d3
|
统一国标设备与级联平台字符集的使用
|
2022-03-17 10:29:49 +08:00 |
|
648540858
|
c8f9f19c38
|
#393
|
2022-03-16 17:46:24 +08:00 |
|
648540858
|
4a0fd9ead3
|
修复合并pr带来的bug
|
2022-03-16 16:55:04 +08:00 |
|
648540858
|
57e6cdefdf
|
#401
|
2022-03-16 16:46:18 +08:00 |
|
648540858
|
bf10cc1b35
|
Merge pull request #399 from nikmu/wvp-28181-2.0
修复device_channel的Id改变带来的tree查询bug
|
2022-03-16 16:42:50 +08:00 |
朱俊杰
|
ba3c38d7d3
|
去掉createinfo中的cseq参数
|
2022-03-16 11:21:39 +08:00 |
|
朱俊杰
|
b1c479b938
|
修复info请求头中的cseq序列
|
2022-03-16 11:18:09 +08:00 |
|
648540858
|
e752dbd1a7
|
修复推流关联平台的bug again
|
2022-03-16 10:12:31 +08:00 |
|
648540858
|
66aac4526b
|
修复推流关联平台的bug
|
2022-03-15 17:45:55 +08:00 |
|
648540858
|
d21a00418e
|
修复推流关联平台的bug
|
2022-03-15 16:58:50 +08:00 |
|
朱俊杰
|
70ada79c7a
|
修复device_channel的Id改变带来的tree查询bug
|
2022-03-15 16:31:06 +08:00 |
|
648540858
|
ea08969bfc
|
使用zlm原生的rtp随机端口配置
|
2022-03-15 15:37:22 +08:00 |
|
648540858
|
0e69251281
|
修复多平台同时导入时的bug
|
2022-03-15 11:44:11 +08:00 |
|
648540858
|
11d40d3e22
|
#396
|
2022-03-15 10:47:07 +08:00 |
|
648540858
|
28e5c1ae05
|
修复平台编辑的bug
|
2022-03-15 10:13:19 +08:00 |
|
648540858
|
bde0e13682
|
#394
|
2022-03-14 18:34:25 +08:00 |
|
648540858
|
354a39961a
|
优化点播, 级联点播级联录像。级联列表显示订阅状态
|
2022-03-14 18:24:30 +08:00 |
|
648540858
|
1171cf1ea9
|
使用zlm新特性支持对与国标流关闭音频以加快拉流速度
|
2022-03-14 11:36:01 +08:00 |
|
648540858
|
61e91afd91
|
#390
|
2022-03-11 11:22:55 +08:00 |
|
648540858
|
1c95f1b4aa
|
移除多余字段
|
2022-03-11 11:22:47 +08:00 |
|
648540858
|
5cfaad2d6d
|
#376
|
2022-03-11 09:58:36 +08:00 |
|
648540858
|
4a22611320
|
优化目录订阅时父节点的更新
|
2022-03-11 09:54:35 +08:00 |
|
648540858
|
45e9fc880c
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-11 09:49:38 +08:00 |
|
648540858
|
c1d7f867c2
|
优化目录订阅以及国标级联目录订阅回复
|
2022-03-10 20:53:56 +08:00 |
dengming
|
f88c70d38c
|
删除重复字段，channelId字段查询了两次
|
2022-03-10 17:27:07 +08:00 |
|
dengming
|
bef7fb2440
|
修复关闭按需拉流无效的问题
|
2022-03-10 15:08:41 +08:00 |
Fang
|
bea63f67e7
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-07 14:21:29 +08:00 |
李防
|
335916f1f1
|
InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
|
2022-03-07 14:20:27 +08:00 |
|
648540858
|
41616f726d
|
修复导入通道时无平台关联时的bug
|
2022-03-07 10:47:06 +08:00 |
|
648540858
|
ca79100b6f
|
优化失败的录像点播的ssrc释放逻辑
|
2022-03-07 01:23:23 +08:00 |
|
648540858
|
b2c953fc76
|
优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项
|
2022-03-07 01:17:45 +08:00 |
|
李防
|
cbea5f64c9
|
修改3个小bug
|
2022-03-05 17:05:05 +08:00 |
|
648540858
|
3dc1e0368e
|
修复合并分支造成的bug
|
2022-03-04 15:59:29 +08:00 |
|
648540858
|
ee746e53cd
|
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
|
50c2a5a728
|
Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题"
This reverts commit 16e8aa323f.
|
2022-03-04 15:36:16 +08:00 |
|
648540858
|
cadd0ee038
|
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
|
83671d8f10
|
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
|
16e8aa323f
|
修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题
|
2022-03-04 11:26:53 +08:00 |
|
648540858
|
b10a65483d
|
去除lombok，readme更新
|
2022-03-04 10:30:55 +08:00 |
|
648540858
|
d21322a932
|
优化国标级联录像预览
|
2022-03-03 18:23:52 +08:00 |
|
648540858
|
01a619f9e3
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-03-03 16:55:20 +08:00 |
|
648540858
|
28d7fd3b58
|
参数名错误
|
2022-03-03 16:54:47 +08:00 |
|
648540858
|
14174ff400
|
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
|
b019106c44
|
Merge pull request #365 from TristingChen/zlm-node-manage
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 16:23:03 +08:00 |
|
648540858
|
2eb1ca2d94
|
国标录像支持多端同时播放
|
2022-03-03 15:57:28 +08:00 |