Commit Graph

2394 Commits

Author SHA1 Message Date
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
bradyx
6e8071d820 fix: 系统启动时,停止已启动国标推流抛出异常被系统捕获,启动服务失败。 2024-05-15 13:52:16 +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
BradyXu
72b437cc52 修复当上级平台点播时,上级平台和下级平台局域网不通时,导致推流失败。推流目标IP地址改为配置的SDP发流IP,如果SDP发流IP存在的话。否则还是从连接中获取推流目标IP 2024-05-12 02:15:41 +08:00
648540858
e6a850891e 支持移动位置订阅通知的数据存储 2024-05-11 17:48:47 +08:00
648540858
17e9631de4 修复多节点时端口丢失的问题 2024-05-09 23:53:36 +08:00
648540858
632075da9b 优化接收BYE消息后的处理 2024-05-09 23:41:27 +08:00
648540858
622d72b3f0 解决刷新通道异常 2024-05-08 12:16:18 +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
edfd528dd5 Merge remote-tracking branch 'origin/master' 2024-04-30 15:01:43 +08:00
648540858
d4cdf5510b 优化拉流代理调用流程 2024-04-30 14:39:53 +08:00
WuPeng
424c0b6333 修改on_stream_none_reader返回值 2024-04-28 14:31:38 +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
3f6ef955f5 修复空指针异常 2024-04-26 15:02:49 +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
44aa37ad6e 优化notify消息中目录的处理 2024-04-24 16:12:42 +08:00
648540858
c21d973977 修复收到catalog消息是更新导致是否有音频的设置失效的BUG 2024-04-24 14:59:41 +08:00
648540858
1a30992985 合并270 2024-04-24 09:11:53 +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
0d0b31f715 临时提交 2024-04-19 10:27:24 +08:00
648540858
0dab86f0b8 临时提交 2024-04-19 10:22:34 +08:00
648540858
94436de3e1 临时提交 2024-04-18 18:31:37 +08:00
648540858
73559cc6b3 临时提交 2024-04-18 18:19:27 +08:00
648540858
38ce529dd2 临时提交 2024-04-18 18:14:59 +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
3639d2224d 临时提交 2024-04-18 17:22:25 +08:00
648540858
f536123b11 修改toString方法 2024-04-18 17:05:03 +08:00
648540858
2a765a93eb 添加RedisRpcResponse的toString 2024-04-18 17:00:13 +08:00
648540858
6025eb29fd 添加注释 2024-04-18 16:30:21 +08:00
648540858
55a240bb45 临时提交 2024-04-18 15:52:34 +08:00
648540858
407a5edebf 优化多wvp国标级联推流时推流信息的清理 2024-04-17 23:31:48 +08:00
648540858
e85cef4345 优化多wvp国标级联推流时缓存的清理 2024-04-17 23:23:42 +08:00
648540858
313243195e 修复通道位置的展示 2024-04-17 17:56:36 +08:00
648540858
bf6e09d231 修复多wvp国标级联机制 2024-04-17 12:56:22 +08:00