197 Commits

Author	SHA1	Message	Date
lin	227239f7f7	去除调试日志	2025-06-03 17:17:04 +08:00
lin	f4bbca78e5	优化通道变化消息发送以及增加设备状态丢失检测	2025-06-03 16:52:42 +08:00
lin	75b1e8deb2	Merge branch '2.7.3' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java	2025-05-23 18:18:32 +08:00
lin	55f36f660b	修复集群播放BUG	2025-05-23 17:26:17 +08:00
648540858	a1a5c53fad	合并国标级联状态重构	2025-05-22 21:14:50 +08:00
648540858	7c7ef34045	Merge branch '2.7.3' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java	2025-05-22 21:09:22 +08:00
lin	b0b5a0f5e0	国标级联调整注册逻辑	2025-05-22 15:17:13 +08:00
lin	dd17462b68	重构设备订阅保活和更新机制	2025-05-21 14:57:10 +08:00
lin	2dcd070fbe	调整PR修复方式	2025-05-19 14:42:26 +08:00
lin	38059f4c38	Merge branch '2.7.3'	2025-05-19 14:41:29 +08:00
vannewang	23e3173ed0	修复CatalogEventLister未判空ServerGBId引发的空指针异常	2025-05-19 11:32:55 +08:00
lin	a83a48e40e	修复因发送失败消息捕捉导致的消息处理异常	2025-05-13 15:25:17 +08:00
648540858	9903f25cc1	强化消息发送失败的处理	2025-05-11 22:00:33 +08:00
lin	e5c3f82d54	播放地址携带流来源信息	2025-03-12 16:09:54 +08:00
lin	b904e594a1	Merge branch 'dev/数据库统合' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java # src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java	2025-03-12 14:20:28 +08:00
lin	cb5a09214a	移除多余代码	2025-03-11 15:11:45 +08:00
lin	9618f23af8	修复message和sip消息超时未回复的判断机制	2025-02-12 20:54:20 +08:00
lin	5808c7aff5	[集群] 重构message消息接受返回值的方式	2025-02-12 17:20:12 +08:00
648540858	a2e7cd0323	[集群] 修复catalog 递归循环BUG	2025-01-03 17:34:30 +08:00
648540858	a9a4c7a4e5	[集群] 修复BUG	2025-01-03 16:34:11 +08:00
648540858	42322c75cc	[集群] 优化国标级联目录更新	2025-01-03 16:21:20 +08:00
648540858	232fa760e2	[集群] 支持国标级联目录更新	2025-01-03 15:34:53 +08:00
648540858	3903bc31b5	Merge branch 'master' into dev/数据库统合	2025-01-03 15:10:23 +08:00
648540858	cb7c41c3c1	[国标级联] 优化catalog推送代码	2025-01-03 15:10:02 +08:00
648540858	3e78af64de	增加RPC录像列表查询	2024-12-13 15:02:06 +08:00
648540858	5304620861	重构报警SSE推送	2024-10-29 15:57:52 +08:00
648540858	ace7b78498	优化报警推送心跳定时任务	2024-10-29 14:30:56 +08:00
648540858	bf9262283e	优化报警推送	2024-10-28 17:53:27 +08:00
648540858	059635c2cc	修复国标点播缓存启动未清理的BUG	2024-10-25 17:41:50 +08:00
648540858	321b1b98fb	去除多余日志	2024-10-19 20:30:18 +08:00
648540858	91e671ec4b	修复消息超时未回复误报	2024-10-19 20:27:42 +08:00
648540858	2492b0d638	修复 SiP消息超时未未回复无法识别的BUG	2024-10-16 17:17:17 +08:00
648540858	632b1f3e53	修复错别字	2024-09-24 15:44:48 +08:00
648540858	c4076ed393	修复旧版本拉流代理的兼容接口	2024-09-18 14:32:40 +08:00
648540858	875285418b	修复编辑通道编号后无法点播的BUG	2024-09-13 15:06:11 +08:00
648540858	fa47f619ba	临时提交	2024-09-03 18:00:35 +08:00
648540858	e55cd08b08	国标级联通道共享支持按照设备添加共享和移除共享	2024-08-29 11:08:42 +08:00
648540858	1efb5fca0f	临时提交	2024-08-28 18:00:42 +08:00
648540858	9247c7e805	完善国标级联点播推流，拉流代理，国标	2024-08-17 22:31:13 +08:00
panlinlin	76a0d248ef	临时提交	2024-08-10 23:27:21 +08:00
648540858	d97accee4a	临时提交	2024-08-06 16:55:33 +08:00
648540858	6bd0cdd37b	临时提交	2024-07-23 18:00:47 +08:00
648540858	b98cfd1fed	使用Slf4j注解打印日志	2024-07-03 17:24:35 +08:00
648540858	adf040ec4b	优化日志以及属性设置代码	2024-07-03 17:09:49 +08:00
648540858	799932f614	优化日志以及属性设置代码	2024-07-03 16:14:18 +08:00
648540858	68fce9177f	临时提交	2024-06-25 16:45:31 +08:00
648540858	2226d34898	修复空指针异常	2024-06-06 00:29: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	901dee2bf4	修复转发国标notify-update时信息错误的问题	2024-04-23 10:12:00 +08:00
648540858	5c0183a422	修复无法下载较长时间时间录像的BUG	2024-04-11 22:25:57 +08:00