648540858
|
87c071fd5e
|
合并271分支
|
2024-06-25 10:24:35 +08:00 |
|
648540858
|
1909c7f71f
|
调整参数名称
|
2024-06-17 10:08:09 +08:00 |
|
panlinlin
|
7b46769a16
|
修复国标录像下载后负载统计未清除的BUG
|
2024-06-13 23:15:51 +08:00 |
|
panlinlin
|
b070b57259
|
拉流代理状态变化时，支持推送到国标平台
|
2024-06-11 23:10:12 +08:00 |
|
wangxinlong
|
208e034822
|
录像下载失败未正常释放ssrc
|
2024-06-07 18:13:45 +08:00 |
|
648540858
|
764d04b497
|
调整上级观看消息的发送
|
2024-05-29 15:02:51 +08:00 |
|
648540858
|
bec35ebf94
|
调整录像进度获取流程
|
2024-05-28 16:06:08 +08:00 |
|
648540858
|
c69b64c756
|
修复CSEQ重置错误 #1449
|
2024-05-28 10:23:17 +08:00 |
|
648540858
|
de6baa157e
|
合并271分支
|
2024-05-24 08:51:09 +08:00 |
|
648540858
|
8bdc406903
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
|
2024-05-24 08:50:14 +08:00 |
|
648540858
|
aeeb61d141
|
合并271分支
|
2024-05-23 17:47:43 +08:00 |
|
648540858
|
475b8a49a3
|
优化录像文件信息入库
|
2024-05-23 17:44:30 +08:00 |
|
648540858
|
2c89fae49a
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
# src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
# src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
|
2024-05-23 17:32:15 +08:00 |
|
648540858
|
2daa59d78c
|
支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题
|
2024-05-23 17:10:45 +08:00 |
|
648540858
|
d70bfb53dd
|
修复兼容zlm-pro转码时无人管看自动移除失败的BUG
|
2024-05-20 11:37:07 +08:00 |
|
648540858
|
49101a37e0
|
兼容zlm-pro转码
|
2024-05-17 16:32:01 +08:00 |
|
648540858
|
5564cfb384
|
优化大量notify 移动位置订阅的入库
|
2024-05-13 17:22:36 +08:00 |
|
648540858
|
588b1da35a
|
Merge branch 'refs/heads/2.7.0' into 271-优化notify存储
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
|
2024-05-13 11:12:20 +08:00 |
|
648540858
|
e6a850891e
|
支持移动位置订阅通知的数据存储
|
2024-05-11 17:48:47 +08:00 |
|
648540858
|
186b00e9b3
|
支持下载多个云端录像的zip压缩包
|
2024-05-08 11:18:47 +08:00 |
|
648540858
|
2ae4226e89
|
修复云端录像按年月查询时时间条件错误的BUG
|
2024-04-30 15:45:39 +08:00 |
|
648540858
|
d4cdf5510b
|
优化拉流代理调用流程
|
2024-04-30 14:39:53 +08:00 |
|
648540858
|
8ade012a6e
|
合并分支
|
2024-04-26 17:49:28 +08:00 |
|
648540858
|
5e359b64d6
|
合并分支
|
2024-04-26 17:41:00 +08:00 |
|
648540858
|
6bd3a187a0
|
合并分支
|
2024-04-26 15:42:31 +08:00 |
|
648540858
|
39c3274294
|
合并分支
|
2024-04-25 17:53:24 +08:00 |
|
648540858
|
b89af9a693
|
Merge branch 'refs/heads/2.7.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2024-04-24 20:51:28 +08:00 |
|
648540858
|
2113e8cf27
|
优化notify消息中目录的处理
|
2024-04-24 20:33:52 +08:00 |
|
648540858
|
d41d6b34af
|
Merge branch 'refs/heads/2.7.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
# 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/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
# src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
# src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
# src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
|
2024-04-23 20:59:20 +08:00 |
|
648540858
|
66a681d679
|
优化notify消息中目录和移动位置的处理
|
2024-04-23 20:45:12 +08:00 |
|
648540858
|
901dee2bf4
|
修复转发国标notify-update时信息错误的问题
|
2024-04-23 10:12:00 +08:00 |
|
648540858
|
8cba63642f
|
优化notify消息处理
|
2024-04-22 20:29:36 +08:00 |
|
648540858
|
b57dbeac13
|
优化通道更新
|
2024-04-20 18:58:53 +08:00 |
|
648540858
|
1aa197510f
|
临时提交
|
2024-04-19 14:39:35 +08:00 |
|
648540858
|
87629b7fc7
|
临时提交
|
2024-04-19 10:32:28 +08:00 |
|
648540858
|
0dab86f0b8
|
临时提交
|
2024-04-19 10:22:34 +08:00 |
|
648540858
|
94436de3e1
|
临时提交
|
2024-04-18 18:31:37 +08:00 |
|
648540858
|
678bb33562
|
临时提交
|
2024-04-18 18:07:47 +08:00 |
|
648540858
|
5d36c2a337
|
临时提交
|
2024-04-18 17:51:56 +08:00 |
|
648540858
|
9adf12ca6a
|
临时提交
|
2024-04-18 17:34:00 +08:00 |
|
648540858
|
55a240bb45
|
临时提交
|
2024-04-18 15:52:34 +08:00 |
|
648540858
|
313243195e
|
修复通道位置的展示
|
2024-04-17 17:56:36 +08:00 |
|
648540858
|
bf6e09d231
|
修复多wvp国标级联机制
|
2024-04-17 12:56:22 +08:00 |
|
648540858
|
9c6765d44e
|
重构多wvp国标级联机制
|
2024-04-16 22:10:35 +08:00 |
|
648540858
|
b4168c02cb
|
优化多wvp国标级联推流
|
2024-04-16 00:10:38 +08:00 |
|
648540858
|
f9abfca003
|
临时提交
|
2024-04-15 21:33:22 +08:00 |
|
648540858
|
f34143df6d
|
修改totalReaderCount类型
|
2024-04-12 10:36:18 +08:00 |
|
648540858
|
5c0183a422
|
修复无法下载较长时间时间录像的BUG
|
2024-04-11 22:25:57 +08:00 |
|
648540858
|
651d4a1b0e
|
优化代码调用
|
2024-04-11 14:28:42 +08:00 |
|
648540858
|
9978d30aa1
|
Merge branch '2.7.0'
|
2024-04-11 09:36:48 +08:00 |
|