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
|
243f7f62b7
|
国标级联调整心跳逻辑
|
2025-05-22 17:40:10 +08:00 |
|
lin
|
dd17462b68
|
重构设备订阅保活和更新机制
|
2025-05-21 14:57:10 +08:00 |
|
lin
|
e2678f39e3
|
临时提交
|
2025-04-25 18:04:51 +08:00 |
|
lin
|
a4e810da12
|
调整代码位置
|
2025-03-20 14:18:41 +08:00 |
|
lin
|
1e98f1df65
|
移除无用类
|
2025-03-19 14:11:05 +08:00 |
|
lin
|
298fb05378
|
优化录像下载。 支持八倍速（设备支持的最高速度）下载
|
2025-03-13 16:48:15 +08:00 |
|
lin
|
e5c3f82d54
|
播放地址携带流来源信息
|
2025-03-12 16:09:54 +08:00 |
|
lin
|
e0f9c93b0f
|
修复方法名错别字
|
2025-03-12 15:02:32 +08:00 |
|
648540858
|
33abdb1db6
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
# web_src/src/components/DeviceList.vue
|
2025-03-10 21:36:52 +08:00 |
|
lin
|
bc249b6786
|
[国标级联] 完善通用通道前端控制处理接口
|
2025-03-06 16:30:42 +08:00 |
|
lin
|
8a71208035
|
[国标级联] 增加通用通道云台控制和预置位处理接口
|
2025-03-06 16:01:05 +08:00 |
|
lin
|
b6c3f42a1f
|
Merge branch 'refs/heads/master' into dev/数据库统合2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
# src/main/resources/配置详情.yml
|
2025-02-11 19:30:20 +08:00 |
|
lin
|
3fe131eed3
|
修复录制计划以来全局录像配置， 目前去除依赖，目前录制计划开启录像
|
2025-02-11 11:08:52 +08:00 |
|
648540858
|
d022eb72d6
|
[集群-自动切换过国标级联] 添加检测wvp奔溃与重新注册
|
2025-01-02 16:16:50 +08:00 |
|
648540858
|
884fcb827f
|
[集群-自动切换过国标级联] 添加数据库脚本
|
2025-01-02 14:29:13 +08:00 |
|
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 |
|