Commit Graph

32 Commits (68fce9177fb3ac2605d6de7f5b0e0d8532d733e2)

Author SHA1 Message Date
648540858 68fce9177f 临时提交 2024-06-25 16:45:31 +08:00
648540858 306c42b4b7 临时提交 2024-06-20 22:29:50 +08:00
648540858 1909c7f71f 调整参数名称 2024-06-17 10:08:09 +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 150e7a3199 调整节点管理代码结构 2024-03-22 16:45:18 +08:00
648540858 b90dc789b4 优化媒体节点服务的代码结构 2024-03-21 23:39:32 +08:00
648540858 e1d476a54a 处理收到redis推动的推流设备信息内容重复的问题 2024-03-13 15:24:09 +08:00
648540858 298a9f4280 开始重构云端录像 2023-10-12 18:34:16 +08:00
648540858 91e49745e4 修复心跳异常,支持通道列表,推流列表,拉流代理列表直接查看对应的云端录像,兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
648540858 5d40080468 优化部分sql实现 2023-05-15 15:29:39 +08:00
648540858 2466a24860 去除发送流端口范围 2022-11-10 16:48:17 +08:00
648540858 4c8e2beb4d 优化hook处理速度 2022-11-08 19:58:36 +08:00
648540858 ca891f367c 首页改造完成,待添加系统信息 2022-10-24 15:20:35 +08:00
jiang 8f77d0c25c 根据redis消息更新推流列表 2022-08-18 16:17:23 +08:00
648540858 e29d94c83f 增加推流添加功能,修复级联目录推送 2022-07-22 16:02:14 +08:00
648540858 81f69eb6f4 支持从redis消息更新推流设备状态 2022-07-12 17:33:17 +08:00
648540858 a42dda2bd3 规范数据库,添加必要约束,优化通道批量导入功能 2022-02-24 16:55:06 +08:00
648540858 bf66f8f694 推流导入支持添加平台信息与目录信息 2022-02-11 16:45:06 +08:00
648540858 d07a5680f3 为推流列表增加批量移除功能 2022-02-07 18:30:43 +08:00
648540858 e0028a87cb 为推流列表增加搜索功能 2022-02-07 14:12:34 +08:00
648540858 06e22d980e 支持推流通道预导入 2022-01-16 10:40:57 +08:00
648540858 bc0319b3f3 将device信息写入redis以提高sip处理速度 2021-12-13 17:20:23 +08:00
648540858 ab81136765 优化适配zlm的hook保活 2021-12-08 16:45:50 +08:00
648540858 9b1af8ef13 适配zlm的hook保活 2021-12-07 21:13:55 +08:00
648540858 5b0b17d741 添加第三方服务参与的推流直接转发到国标功能 2021-12-04 17:27:23 +08:00
648540858 42d8fff574 兼容流注销时流产生类型错误的问题 2021-12-03 10:18:50 +08:00
648540858 f61051c463 优化streamchannge hook以及对推流的识别 2021-11-24 11:19:52 +08:00
64850858 3469271ec2 优化集群方案, 每个zlm一套ssrc;
优化集群下的docker接入逻辑;
更正sql脚本;
支持重启不设置设备离线。重启SIP事务不丢失
2021-07-26 11:40:32 +08:00
64850858 89a9ab4534 添加zlm集群支持 2021-07-16 16:34:51 +08:00
lawrencehj 8b4f7095e2 去除多余引用,修正个别错误 2021-04-13 10:13:36 +08:00
panlinlin b17280522b 增加推流转发到国标,尚不完善 2021-04-02 19:04:01 +08:00