465 Commits

Author	SHA1	Message	Date
648540858	ab318fcf70	修复点播错误时关闭rtpserver	2024-04-09 14:53:11 +08:00
648540858	6dd870e74c	修复点播端口为空	2024-04-09 10:59:59 +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	aeb75c0df1	优化推流结束后发送BYE	2024-04-07 20:25:44 +08:00
648540858	7d53009987	优化推流通知	2024-04-07 20:06:48 +08:00
648540858	8b90fade9e	支持使用abl接收国标流	2024-04-02 00:05:09 +08:00
648540858	33b75be71a	支持abl hook	2024-04-01 18:21:38 +08:00
648540858	73733ab13f	修复推流播放	2024-04-01 15:40:21 +08:00
648540858	4548695a0b	hook优化	2024-03-31 00:28:45 +08:00
648540858	0447b83c3a	临时提交	2024-03-29 23:41:00 +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	f96250ef45	Merge branch 'master' into dev/abl支持	2024-03-21 16:59:14 +08:00
648540858	3291c4b2e6	修复多平台推流无人观看redis通知	2024-03-21 16:54:44 +08:00
648540858	181bf76862	优化节点在线状态	2024-03-20 18:54:39 +08:00
648540858	267085e945	修复插入国标设备时字段错误	2024-03-17 22:21:01 +08:00
648540858	e1d476a54a	处理收到redis推动的推流设备信息内容重复的问题	2024-03-13 15:24:09 +08:00
648540858	66210ec51a	支持国标级联语音喊话TCP主动模式	2024-02-27 17:41:14 +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	fc74ce9de4	Merge branch '2.6.9' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/resources/application-dev.yml	2024-01-31 17:25:32 +08:00
PengOu	1245ae7874	Fix 推流列表-> 添加通道 报错： 错误: 字段 "gbStreamId" 不存在 ,改为：gb_stream_id 自测试通过	2024-01-30 10:59:25 +08:00
648540858	ab34cb37f3	修复空指针异常	2024-01-29 21:20:03 +08:00
648540858	654599b659	修复通道重命名后无法被检索到	2024-01-19 16:07:30 +08:00
648540858	88721511e7	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-16 14:51:17 +08:00
648540858	0371f5a96e	修复国标级联全部添加与全部删除	2024-01-15 15:31:20 +08:00
648540858	81a32fdb47	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-10 19:12:06 +08:00
648540858	29f7a6b6eb	修复多wvp模式推流时信息存储错误	2024-01-10 18:55:14 +08:00
648540858	a2cac5ca12	Merge branch '2.6.9' into wvp-28181-2.0 ... # Conflicts: # pom.xml	2024-01-04 18:34:46 +08:00
648540858	6120e6bd7b	添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送	2024-01-04 17:26:47 +08:00
648540858	64b6a35603	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-04 11:33:29 +08:00
648540858	d91583b833	修复从redis同步推流列表更新失败	2024-01-04 11:33:08 +08:00
648540858	07b182da98	Merge branch 'wvp-28181-2.0' into feature/record ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java # src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java	2023-12-26 15:38:40 +08:00
xiaoQQya	3ab4ce0a83	perf: 分屏监控设备列表优先使用自定义通道名称	2023-12-26 08:50:41 +08:00
xiaoQQya	9ae520a58a	feat(channel): 新增通道支持自定义名称、位置及云台类型	2023-12-19 15:22:09 +08:00
648540858	41fdb9d13f	Merge branch 'wvp-28181-record' into feature/record	2023-12-18 15:41:39 +08:00
648540858	a380246e49	修复每次注册都会发送状态变化的BUG	2023-12-18 15:27:51 +08:00
648540858	67d1ff0d26	Merge branch 'wvp-28181-2.0' into feature/record ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java	2023-12-18 14:23:48 +08:00
648540858	76d09bcadb	修复sql注入 #1112	2023-12-18 11:14:59 +08:00
648540858	92e5ed2e30	优化前端云端录像的播放	2023-12-06 16:10:32 +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	ffc8a530f3	修复定时录像删除	2023-11-24 10:47:33 +08:00
648540858	c98ef23b98	修复定时删除过期录像文件时，收藏文件被删除的问题	2023-11-21 14:30:33 +08:00
648540858	5d3f307b44	将录像存储路径迁移至wvp中配置，assist以有在需要视频合成的时候才会用	2023-11-01 14:07:32 +08:00