Commit Graph

2626 Commits (2f4d983f9feccb8d31fc2cd427d123d2d6acba7b)

Author SHA1 Message Date
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
648540858 f357bece62 优化回调设置方式 2024-04-16 22:22:00 +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 cdeb3acf7c 移除多余文件 2024-04-15 16:13:56 +08:00
648540858 bd0fafde81 修复目录订阅发送订阅未携带经纬度的问题 2024-04-15 15:51:10 +08:00
648540858 3cd3e97cd7 合并分支270 2024-04-12 16:06:21 +08:00
648540858 78f4e41536 Merge branch '2.7.0' 2024-04-12 16:05:48 +08:00
648540858 819ec97d66 移除全量脚本多余字段 2024-04-12 16:05:29 +08:00
648540858 f34143df6d 修改totalReaderCount类型 2024-04-12 10:36:18 +08:00
648540858 da54cdf3b8 解决空指针异常 2024-04-12 09:00:39 +08:00
648540858 5c0183a422 修复无法下载较长时间时间录像的BUG 2024-04-11 22:25:57 +08:00
648540858 8750f0f3dd 去除多余代码 2024-04-11 16:58:56 +08:00
648540858 ab20f76885 去除多余代码 2024-04-11 16:58:03 +08:00
648540858 e222095636 修复流数据写入缓存 2024-04-11 16:55:34 +08:00
648540858 71fe60d885 更新README 2024-04-11 15:34:56 +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
648540858 fe55920dab 更新文档 2024-04-10 23:17:27 +08:00
648540858 0f4b5eed7d 优化apikey列表样式 2024-04-10 23:09:28 +08:00
648540858 b45d71ba6d
Merge pull request #1389 from ancienter/develop-add-api-key
[add]新增ApiKey管理功能
2024-04-10 22:56:14 +08:00
648540858 31be0a3874 更新webrtc调用 2024-04-10 22:44:19 +08:00