Commit Graph

166 Commits (547432e194018aa589603aac58ea25b11a862d22)

Author SHA1 Message Date
648540858 28961f51f7 完善数据库结构调用 2024-12-23 23:49:54 +08:00
648540858 19453f7ca9 临时提交 2024-12-23 07:20:48 +08:00
648540858 daa8e8358c 修复点播异常后无法再次点播的BUG 2024-10-29 18:20:24 +08:00
648540858 98b4566c6c 移除操作日志记录到数据库功能 2024-10-29 16:56:14 +08:00
648540858 5304620861 重构报警SSE推送 2024-10-29 15:57:52 +08:00
648540858 296cf1e3fe 调整推流鉴权信息的RedisKEY 2024-10-27 23:45:31 +08:00
648540858 6fc8db8bd0 优化INVITE事务REDIS缓存存取 2024-10-25 18:03:30 +08:00
648540858 059635c2cc 修复国标点播缓存启动未清理的BUG 2024-10-25 17:41:50 +08:00
648540858 ef66bd8781 移除无用方法和变量 2024-10-25 15:08:05 +08:00
648540858 34cc8251e2 优化国标设备点播的信息的Redis缓存策略 2024-10-25 14:46:51 +08:00
648540858 193f80963d 优化国标设备的Redis缓存策略 2024-10-24 18:32:37 +08:00
648540858 7abafef230 优化媒体节点的Redis缓存策略 2024-10-24 18:25:55 +08:00
648540858 e5faad8b8d 暂时移除通道列表子节点数量展示,目前无法正确统计 2024-10-24 18:04:53 +08:00
648540858 189e56c839 优化部分redis scan查询 2024-10-21 17:42:26 +08:00
648540858 614ff4c71e 优化短的录像文件的下载 2024-09-13 15:43:22 +08:00
648540858 7cc4c9d14a 临时提交 2024-09-09 17:56:46 +08:00
648540858 489fbe31a5 临时提交 2024-09-09 00:07:00 +08:00
648540858 cc302be2f2 临时提交 2024-09-07 22:27:32 +08:00
648540858 da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858 fa47f619ba 临时提交 2024-09-03 18:00:35 +08:00
648540858 cce1d1de40 重构INVITE消息处理中的上级点播请求 2024-08-14 17:19:19 +08:00
648540858 9aad6ac719 临时提交 2024-08-08 17:47:08 +08:00
648540858 5a812e7f08 临时提交 2024-07-24 17:54:19 +08:00
648540858 1616a2a731 Merge remote-tracking branch 'gitee-c/dev/master-通道结构重构' into dev/master-通道结构重构 2024-06-26 18:41:37 +08:00
648540858 57a230afb3 Merge branch 'refs/heads/2.7.1'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
2024-06-25 09:45:34 +08:00
panlinlin 397ac956de 调整通用通道的位置 2024-06-21 16:05:13 +08:00
648540858 f3ea07bdcd 调整转码后的流的输出位置 2024-06-14 17:03:55 +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 b4168c02cb 优化多wvp国标级联推流 2024-04-16 00:10:38 +08:00
648540858 f9abfca003 临时提交 2024-04-15 21:33:22 +08:00
648540858 82ca3a778a 优化媒体节点redis数据格式 2024-04-09 22:52:06 +08:00
648540858 8b90fade9e 支持使用abl接收国标流 2024-04-02 00:05:09 +08:00
648540858 150e7a3199 调整节点管理代码结构 2024-03-22 16:45:18 +08:00
648540858 b90dc789b4 优化媒体节点服务的代码结构 2024-03-21 23:39:32 +08:00
648540858 c7ca9703c1 优化媒体节点服务的代码结构 2024-03-20 23:50:30 +08:00
648540858 509d9b3cbb Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
2024-02-27 10:22:13 +08:00
648540858 f6c48588da 支持支持主码流子码流切换 2024-02-22 17:22:28 +08:00
648540858 2e7c9a7341 Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.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/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	src/main/resources/all-application.yml
#	src/main/resources/application-dev.yml
2024-02-07 20:30:37 +08:00
648540858 ad36354ef4 优化国标录像服务端,使用zlm新接口实现功能 2023-12-05 11:29:05 +08:00
648540858 67e4060053 添加推流信息专属redis数据 2023-11-30 18:09:43 +08:00
648540858 b7ad0a907f 合并pr 优化sql 2023-10-27 18:06:46 +08:00
648540858 4df90d9ba4 Merge branch 'wvp-28181-2.0' into main-dev 2023-09-20 09:17:28 +08:00
Cloud User bc431e4290 fix-use-source-ip-as-stream-ip 2023-09-15 22:39:08 +08:00
648540858 88350873ee Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
2023-09-11 11:21:50 +08:00
648540858 91e49745e4 修复心跳异常,支持通道列表,推流列表,拉流代理列表直接查看对应的云端录像,兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
648540858 3e2486d0ab Merge branch '2.6.8' into wvp-28181-2.0 2023-08-08 09:50:31 +08:00
648540858 874a57387a 支持与第三方对接PS流 2023-08-08 09:49:27 +08:00
648540858 7d3cbb8253 Merge branch 'wvp-28181-2.0' into main-dev 2023-07-24 09:42:32 +08:00
648540858 d48f89eee4 修复端口分配的并发问题 2023-07-24 09:04:47 +08:00
648540858 db6dd3f755 Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.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/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
2023-07-19 11:33:58 +08:00