648540858
|
bc0ee2bf13
|
拉流代理通用通道默认在线
|
2024-01-20 06:47:36 +08:00 |
|
648540858
|
55b15f8ba6
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-19 17:45:11 +08:00 |
|
648540858
|
cf8a1261b5
|
支持合并录像使用https
|
2024-01-19 17:44:31 +08:00 |
|
648540858
|
3a6e098f7b
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
|
2024-01-19 16:16:28 +08:00 |
|
648540858
|
654599b659
|
修复通道重命名后无法被检索到
|
2024-01-19 16:07:30 +08:00 |
|
648540858
|
47e5d2b00b
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-19 15:58:50 +08:00 |
|
648540858
|
782e8b9800
|
修复sendRtpItem写入不及时导致的发流失败
|
2024-01-19 15:43:08 +08:00 |
|
648540858
|
85f20df9de
|
修复空指针异常
|
2024-01-19 15:05:24 +08:00 |
|
648540858
|
6290e94733
|
临时提交
|
2024-01-19 14:33:34 +08:00 |
|
648540858
|
47526e241e
|
修复多wvp推流时，收到停止消息数据处理失败问题
|
2024-01-19 12:12:35 +08:00 |
|
648540858
|
481c88f517
|
临时提交
|
2024-01-19 11:06:45 +08:00 |
|
648540858
|
f0e9c85c85
|
修复拉流代理
|
2024-01-18 18:19:26 +08:00 |
|
648540858
|
bd52096884
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2024-01-18 14:55:13 +08:00 |
|
648540858
|
ebc65b40d3
|
添加收到invite消息后的日志，减少国标级联推送代理流的等待时间
|
2024-01-18 14:54:03 +08:00 |
|
648540858
|
7200e56d59
|
临时提交
|
2024-01-18 14:11:07 +08:00 |
|
648540858
|
1538ad358d
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-18 10:17:21 +08:00 |
|
648540858
|
7f79b92568
|
修复设备在事务内注销失败的问题
|
2024-01-18 10:17:03 +08:00 |
|
648540858
|
8795281443
|
修复设备上线通用通道不上线的问题
|
2024-01-18 10:16:09 +08:00 |
|
648540858
|
f38d561e60
|
支持通用通道播放
|
2024-01-17 18:05:39 +08:00 |
|
648540858
|
20be213faf
|
优化日志管理接口
|
2024-01-17 00:08:27 +08:00 |
|
648540858
|
9c3eb1493d
|
合并主线
|
2024-01-16 14:56:22 +08:00 |
|
648540858
|
8d7d2a3045
|
Merge remote-tracking branch 'origin/结构优化' into 结构优化
|
2024-01-16 14:53:34 +08:00 |
|
648540858
|
2a4a0d36f2
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
|
2024-01-16 14:53:26 +08:00 |
|
648540858
|
88721511e7
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-16 14:51:17 +08:00 |
|
648540858
|
6eed486ff1
|
合并主线
|
2024-01-16 14:18:17 +08:00 |
|
648540858
|
9a96597e66
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# 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/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/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
|
2024-01-16 14:10:27 +08:00 |
|
648540858
|
c32ba1dea8
|
修复语音对讲
|
2024-01-16 11:33:12 +08:00 |
|
648540858
|
96efff51bc
|
临时提交
|
2024-01-15 23:35:19 +08:00 |
|
648540858
|
9b62fbe467
|
优化设备编辑页面
|
2024-01-15 18:36:31 +08:00 |
|
648540858
|
13e2a96dae
|
添加删除通道时通知的日志
|
2024-01-15 15:39:28 +08:00 |
|
648540858
|
0371f5a96e
|
修复国标级联全部添加与全部删除
|
2024-01-15 15:31:20 +08:00 |
|
648540858
|
2ac51548f4
|
优化通用通道接口
|
2024-01-15 00:15:02 +08:00 |
|
648540858
|
e2fd8ddf8b
|
优化通用通道接口
|
2024-01-14 16:01:32 +08:00 |
|
648540858
|
25a46d1833
|
注释优化
|
2024-01-14 11:15:46 +08:00 |
|
648540858
|
be011a7c85
|
支持拉流代理检索，播放
|
2024-01-14 00:01:34 +08:00 |
|
648540858
|
8805966f89
|
优化拉流代理启停
|
2024-01-13 00:40:41 +08:00 |
|
648540858
|
1d28869fd3
|
优化拉流代理接口哦i
|
2024-01-12 18:26:14 +08:00 |
|
648540858
|
07401b8621
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-12 15:03:53 +08:00 |
|
648540858
|
674ab18c02
|
修复rtp暂停检查调用失败
|
2024-01-12 15:03:11 +08:00 |
|
648540858
|
9c114823af
|
临时提交
|
2024-01-12 14:52:57 +08:00 |
|
648540858
|
d287ff7763
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
|
2024-01-12 14:20:01 +08:00 |
|
648540858
|
e5a9dd24ef
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-12 14:17:01 +08:00 |
|
648540858
|
18b5c73365
|
获取InviteInfo添加异常日志
|
2024-01-12 10:35:26 +08:00 |
|
648540858
|
41c7137e3a
|
Merge pull request #1242 from criver31/wvp-28181-2.0
1、修复zlm重连不在线 2、单端口下历史回放暂停和恢复发送的流ID与zlm不一致
|
2024-01-12 09:06:10 +08:00 |
|
648540858
|
4e60d7ed55
|
优化拉流代理逻辑
|
2024-01-11 18:10:28 +08:00 |
|
648540858
|
2b2efb59a6
|
修复多个推流推送到上级是不完整的问题，修改平台注销时不删除自己模拟的订阅信息
|
2024-01-11 14:56:11 +08:00 |
|
648540858
|
591fcc6b3d
|
临时提交
|
2024-01-10 23:12:30 +08:00 |
|
648540858
|
db075b5255
|
临时提交
|
2024-01-10 23:11:38 +08:00 |
|
648540858
|
fb39e4ff0e
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
|
2024-01-10 19:19:28 +08:00 |
|
648540858
|
a23c1aca40
|
合并269分支修复的内容
|
2024-01-10 19:14:11 +08:00 |