218 Commits

Author	SHA1	Message	Date
648540858	2cf7178cb7	Merge branch 'refs/heads/2.7.1'	2024-06-11 10:14:14 +08:00
648540858	f8ef14bfea	修复移动位置位置订阅上报间隔为0的bug	2024-06-11 10:08:13 +08:00
648540858	619a86e0ed	修复循环引用	2024-06-06 19:59:48 +08:00
648540858	2127cbeca3	调整收到移动位置订阅后开启定时任务	2024-06-05 22:45:13 +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	c21d973977	修复收到catalog消息是更新导致是否有音频的设置失效的BUG	2024-04-24 14:59:41 +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	b57dbeac13	优化通道更新	2024-04-20 18:58:53 +08:00
648540858	55a240bb45	临时提交	2024-04-18 15:52:34 +08:00
648540858	313243195e	修复通道位置的展示	2024-04-17 17:56:36 +08:00
648540858	b4168c02cb	优化多wvp国标级联推流	2024-04-16 00:10:38 +08:00
648540858	f9abfca003	临时提交	2024-04-15 21:33:22 +08:00
648540858	f458c9b793	优化代码调用	2024-04-10 22:38:12 +08:00
648540858	6c0087db88	优化代码调用	2024-04-10 20:56:45 +08:00
648540858	b1b6fae22c	Merge branch 'master' into dev/zlm ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.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/vmanager/cloudRecord/CloudRecordController.java	2024-04-09 10:35:11 +08:00
648540858	48351c875e	国标级联支持制定200OK中sdp的IP	2024-04-08 18:13:15 +08:00
648540858	7d53009987	优化推流通知	2024-04-07 20:06:48 +08:00
648540858	33b75be71a	支持abl hook	2024-04-01 18:21:38 +08:00
648540858	dae67453c4	Merge branch 'master' into dev/abl支持 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java	2024-03-28 16:50:44 +08:00
648540858	f1e902af7f	支持级联移动位置订阅通知转发	2024-03-28 16:28:41 +08:00
648540858	7dda1f6a2e	Merge branch 'master' into dev/abl支持	2024-03-27 17:18:35 +08:00
648540858	e886aa4833	修复PTZType导致声音开关失效的问题	2024-03-27 11:15:35 +08:00
648540858	b90dc789b4	优化媒体节点服务的代码结构	2024-03-21 23:39:32 +08:00
648540858	97dc926b28	调整ptzType字段名称	2024-03-18 17:41:49 +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	a9ab5c28e9	优化订阅机制，需要重新订阅时，取消命令发送后再发送订阅命令 #1273	2024-02-20 11:12:42 +08:00
648540858	7de73ebd2b	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java	2023-10-11 01:36:12 +08:00
648540858	b9a33f03d6	国标级联支持添加通道后主动推动到上级	2023-09-22 17:46:31 +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
chenzhangyue	7155680793	fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set	2023-09-05 17:35:46 +08:00
648540858	91e49745e4	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00
648540858	e898c344aa	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # 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/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java	2023-08-07 17:28:02 +08:00
648540858	ba884fa9ef	默认关闭ssrc check	2023-08-03 16:08:22 +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
648540858	ff1e9f79c2	优化海康发送的Message消息设置的消息体长度为0，导致无法解析的问题 #920	2023-07-07 14:51:41 +08:00
648540858	e4754af417	修复数据错误导致无法转成JSON返回 #919	2023-07-06 15:35:59 +08:00
648540858	4604aaea99	优化语音对讲支持根据设备设置释放收到ACK后开始发流	2023-07-02 13:53:45 +08:00
648540858	5a7a7a12bd	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # src/main/resources/all-application.yml # web_src/config/index.js # web_src/src/components/dialog/devicePlayer.vue	2023-06-27 16:46:26 +08:00
648540858	9e28923b8c	Merge branch 'wvp-28181-2.0' into wvp-28181-2.0	2023-06-20 14:15:27 +08:00
648540858	d310204d00	去除多余字段	2023-06-20 09:57:28 +08:00
648540858	6b3732b8c4	Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java # src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java # src/main/resources/all-application.yml # web_src/package-lock.json	2023-06-19 20:19:31 +08:00
648540858	8942ab0112	优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范	2023-06-19 18:42:36 +08:00
‘sxh’	652489b47e	Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java	2023-06-15 11:10:20 +08:00
‘sxh’	15df08964b	新增设备主子码流选择，默认为不开启	2023-06-15 11:00:29 +08:00
648540858	446f729e55	优化sdp解析，兼容带有f=的设备	2023-06-10 00:32:42 +08:00
648540858	30ae9e929f	合并主线	2023-05-25 17:28:57 +08:00
648540858	be9bf60e81	兼容人大金仓对online作为保留字段的要求	2023-05-16 15:13:38 +08:00
648540858	5d40080468	优化部分sql实现	2023-05-15 15:29:39 +08:00
648540858	d849352441	重构以适配postgresql	2023-05-12 10:37:03 +08:00