648540858
|
d70bfb53dd
|
修复兼容zlm-pro转码时无人管看自动移除失败的BUG
|
2024-05-20 11:37:07 +08:00 |
|
648540858
|
49101a37e0
|
兼容zlm-pro转码
|
2024-05-17 16:32:01 +08:00 |
bradyx
|
6e8071d820
|
fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。
|
2024-05-15 13:52:16 +08:00 |
|
648540858
|
5564cfb384
|
优化大量notify 移动位置订阅的入库
|
2024-05-13 17:22:36 +08:00 |
|
648540858
|
588b1da35a
|
Merge branch 'refs/heads/2.7.0' into 271-优化notify存储
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
|
2024-05-13 11:12:20 +08:00 |
BradyXu
|
72b437cc52
|
修复当上级平台点播时，上级平台和下级平台局域网不通时，导致推流失败。推流目标IP地址改为配置的SDP发流IP，如果SDP发流IP存在的话。否则还是从连接中获取推流目标IP
|
2024-05-12 02:15:41 +08:00 |
|
648540858
|
e6a850891e
|
支持移动位置订阅通知的数据存储
|
2024-05-11 17:48:47 +08:00 |
|
648540858
|
17e9631de4
|
修复多节点时端口丢失的问题
|
2024-05-09 23:53:36 +08:00 |
|
648540858
|
632075da9b
|
优化接收BYE消息后的处理
|
2024-05-09 23:41:27 +08:00 |
|
648540858
|
622d72b3f0
|
解决刷新通道异常
|
2024-05-08 12:16:18 +08:00 |
|
648540858
|
186b00e9b3
|
支持下载多个云端录像的zip压缩包
|
2024-05-08 11:18:47 +08:00 |
|
648540858
|
2ae4226e89
|
修复云端录像按年月查询时时间条件错误的BUG
|
2024-04-30 15:45:39 +08:00 |
|
648540858
|
edfd528dd5
|
Merge remote-tracking branch 'origin/master'
|
2024-04-30 15:01:43 +08:00 |
|
648540858
|
d4cdf5510b
|
优化拉流代理调用流程
|
2024-04-30 14:39:53 +08:00 |
WuPeng
|
424c0b6333
|
修改on_stream_none_reader返回值
|
2024-04-28 14:31:38 +08:00 |
|
648540858
|
8ade012a6e
|
合并分支
|
2024-04-26 17:49:28 +08:00 |
|
648540858
|
5e359b64d6
|
合并分支
|
2024-04-26 17:41:00 +08:00 |
|
648540858
|
6bd3a187a0
|
合并分支
|
2024-04-26 15:42:31 +08:00 |
|
648540858
|
3f6ef955f5
|
修复空指针异常
|
2024-04-26 15:02:49 +08:00 |
|
648540858
|
39c3274294
|
合并分支
|
2024-04-25 17:53:24 +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
|
2113e8cf27
|
优化notify消息中目录的处理
|
2024-04-24 20:33:52 +08:00 |
|
648540858
|
44aa37ad6e
|
优化notify消息中目录的处理
|
2024-04-24 16:12:42 +08:00 |
|
648540858
|
c21d973977
|
修复收到catalog消息是更新导致是否有音频的设置失效的BUG
|
2024-04-24 14:59:41 +08:00 |
|
648540858
|
1a30992985
|
合并270
|
2024-04-24 09:11:53 +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
|
66a681d679
|
优化notify消息中目录和移动位置的处理
|
2024-04-23 20:45:12 +08:00 |
|
648540858
|
901dee2bf4
|
修复转发国标notify-update时信息错误的问题
|
2024-04-23 10:12:00 +08:00 |
|
648540858
|
8cba63642f
|
优化notify消息处理
|
2024-04-22 20:29:36 +08:00 |
|
648540858
|
b57dbeac13
|
优化通道更新
|
2024-04-20 18:58:53 +08:00 |
|
648540858
|
1aa197510f
|
临时提交
|
2024-04-19 14:39:35 +08:00 |
|
648540858
|
87629b7fc7
|
临时提交
|
2024-04-19 10:32:28 +08:00 |
|
648540858
|
0d0b31f715
|
临时提交
|
2024-04-19 10:27:24 +08:00 |
|
648540858
|
0dab86f0b8
|
临时提交
|
2024-04-19 10:22:34 +08:00 |
|
648540858
|
94436de3e1
|
临时提交
|
2024-04-18 18:31:37 +08:00 |
|
648540858
|
73559cc6b3
|
临时提交
|
2024-04-18 18:19:27 +08:00 |
|
648540858
|
38ce529dd2
|
临时提交
|
2024-04-18 18:14:59 +08:00 |
|
648540858
|
678bb33562
|
临时提交
|
2024-04-18 18:07:47 +08:00 |
|
648540858
|
5d36c2a337
|
临时提交
|
2024-04-18 17:51:56 +08:00 |
|
648540858
|
9adf12ca6a
|
临时提交
|
2024-04-18 17:34:00 +08:00 |
|
648540858
|
3639d2224d
|
临时提交
|
2024-04-18 17:22:25 +08:00 |
|
648540858
|
f536123b11
|
修改toString方法
|
2024-04-18 17:05:03 +08:00 |
|
648540858
|
2a765a93eb
|
添加RedisRpcResponse的toString
|
2024-04-18 17:00:13 +08:00 |
|
648540858
|
6025eb29fd
|
添加注释
|
2024-04-18 16:30:21 +08:00 |
|
648540858
|
55a240bb45
|
临时提交
|
2024-04-18 15:52:34 +08:00 |
|
648540858
|
407a5edebf
|
优化多wvp国标级联推流时推流信息的清理
|
2024-04-17 23:31:48 +08:00 |
|
648540858
|
e85cef4345
|
优化多wvp国标级联推流时缓存的清理
|
2024-04-17 23:23:42 +08:00 |
|
648540858
|
313243195e
|
修复通道位置的展示
|
2024-04-17 17:56:36 +08:00 |
|
648540858
|
bf6e09d231
|
修复多wvp国标级联机制
|
2024-04-17 12:56:22 +08:00 |
|
648540858
|
f357bece62
|
优化回调设置方式
|
2024-04-16 22:22:00 +08:00 |
|
648540858
|
9c6765d44e
|
重构多wvp国标级联机制
|
2024-04-16 22:10:35 +08:00 |
|
648540858
|
b4168c02cb
|
优化多wvp国标级联推流
|
2024-04-16 00:10:38 +08:00 |
|
648540858
|
f9abfca003
|
临时提交
|
2024-04-15 21:33:22 +08:00 |
|
648540858
|
cdeb3acf7c
|
移除多余文件
|
2024-04-15 16:13:56 +08:00 |
|
648540858
|
bd0fafde81
|
修复目录订阅发送订阅未携带经纬度的问题
|
2024-04-15 15:51:10 +08:00 |
|
648540858
|
f34143df6d
|
修改totalReaderCount类型
|
2024-04-12 10:36:18 +08:00 |
|
648540858
|
da54cdf3b8
|
解决空指针异常
|
2024-04-12 09:00:39 +08:00 |
|
648540858
|
5c0183a422
|
修复无法下载较长时间时间录像的BUG
|
2024-04-11 22:25:57 +08:00 |
|
648540858
|
8750f0f3dd
|
去除多余代码
|
2024-04-11 16:58:56 +08:00 |
|
648540858
|
ab20f76885
|
去除多余代码
|
2024-04-11 16:58:03 +08:00 |
|
648540858
|
e222095636
|
修复流数据写入缓存
|
2024-04-11 16:55:34 +08:00 |
|
648540858
|
651d4a1b0e
|
优化代码调用
|
2024-04-11 14:28:42 +08:00 |
|
648540858
|
9978d30aa1
|
Merge branch '2.7.0'
|
2024-04-11 09:36:48 +08:00 |
|
648540858
|
b45d71ba6d
|
Merge pull request #1389 from ancienter/develop-add-api-key
[add]新增ApiKey管理功能
|
2024-04-10 22:56:14 +08:00 |
|
648540858
|
f458c9b793
|
优化代码调用
|
2024-04-10 22:38:12 +08:00 |
leesam
|
ce950dea4a
|
Merge branch 'refs/heads/master' into develop-add-api-key
|
2024-04-10 22:18:40 +08:00 |
|
leesam
|
53199b32f6
|
适配postgres数据库
|
2024-04-10 22:16:56 +08:00 |
|
648540858
|
6c0087db88
|
优化代码调用
|
2024-04-10 20:56:45 +08:00 |
|
leesam
|
16b7e4a7ef
|
Merge branch 'refs/heads/master' into develop-add-api-key
|
2024-04-10 20:49:44 +08:00 |
|
leesam
|
10e2180c72
|
[bugfix]支持context-path配置
|
2024-04-10 19:07:37 +08:00 |
|
648540858
|
9bb5ef6522
|
修复多个wvp执行推流转发失败的BUG
|
2024-04-10 18:22:42 +08:00 |
|
648540858
|
82ca3a778a
|
优化媒体节点redis数据格式
|
2024-04-09 22:52:06 +08:00 |
|
648540858
|
54b878d2e1
|
优化代码，升级版本号为2.7.1
|
2024-04-09 22:43:45 +08:00 |
|
648540858
|
cf8320e749
|
Merge pull request #1400 from Anyuei/master
处理可能会出现的空指针异常
|
2024-04-09 20:57:50 +08:00 |
|
648540858
|
a1861038e5
|
修复录像下载
|
2024-04-09 19:53:43 +08:00 |
|
648540858
|
7a59acc8e6
|
合并主线
|
2024-04-09 17:30:18 +08:00 |
|
648540858
|
de5d025cee
|
修复单端口收流时音频禁用失败的问题
|
2024-04-09 16:10:02 +08:00 |
|
648540858
|
ab318fcf70
|
修复点播错误时关闭rtpserver
|
2024-04-09 14:53:11 +08:00 |
|
648540858
|
6dd870e74c
|
修复点播端口为空
|
2024-04-09 10:59:59 +08:00 |
|
648540858
|
bbf19c7909
|
合并主线
|
2024-04-09 10:40:16 +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
|
0b2f635176
|
移除非主线内容
|
2024-04-09 10:30:00 +08:00 |
ancienter
|
25ff2fc4ef
|
Merge branch '648540858:master' into develop-add-api-key
|
2024-04-09 09:52:23 +08:00 |
|
648540858
|
a890b62fa1
|
Merge branch '2.7.0'
|
2024-04-08 18:13:33 +08:00 |
|
648540858
|
48351c875e
|
国标级联支持制定200OK中sdp的IP
|
2024-04-08 18:13:15 +08:00 |
|
648540858
|
7d0aebd311
|
Merge branch '2.7.0'
|
2024-04-07 20:26:01 +08:00 |
|
648540858
|
aeb75c0df1
|
优化推流结束后发送BYE
|
2024-04-07 20:25:44 +08:00 |
|
648540858
|
7d53009987
|
优化推流通知
|
2024-04-07 20:06:48 +08:00 |
|
648540858
|
a1c02605c1
|
abl-实现closeRtpServer
|
2024-04-02 14:41:02 +08:00 |
|
648540858
|
86a35f3612
|
合并开源主线
|
2024-04-02 11:25:19 +08:00 |
|
648540858
|
1bb813758a
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2024-04-02 11:20:51 +08:00 |
|
648540858
|
67688d4a4b
|
优化停止国标收流
|
2024-04-02 11:20:19 +08:00 |
|
648540858
|
969ff86ebe
|
放行abl hook 接口
|
2024-04-02 09:53:47 +08:00 |
|
648540858
|
8b90fade9e
|
支持使用abl接收国标流
|
2024-04-02 00:05:09 +08:00 |
|
648540858
|
b78769f997
|
临时提交
|
2024-04-01 18:35:26 +08:00 |
|
648540858
|
33b75be71a
|
支持abl hook
|
2024-04-01 18:21:38 +08:00 |
|
648540858
|
4d6f881460
|
修复空指针异常
|
2024-04-01 16:20:30 +08:00 |
|
648540858
|
722f1d0ee7
|
国标级联-修复拉流代理播放
|
2024-04-01 16:17:01 +08:00 |
|
648540858
|
426ea72d7f
|
修复拉流代理播放
|
2024-04-01 15:46:36 +08:00 |
|
648540858
|
73733ab13f
|
修复推流播放
|
2024-04-01 15:40:21 +08:00 |