648540858
|
565acaefb5
|
临时提交
|
2024-01-29 12:32:35 +08:00 |
|
648540858
|
367acdaf97
|
支持国标控制命令解析
|
2024-01-28 00:41:24 +08:00 |
|
648540858
|
8892975d77
|
临时提交
|
2024-01-26 18:03:58 +08:00 |
|
648540858
|
2a84e44610
|
去除多余实现
|
2024-01-25 23:44:32 +08:00 |
|
648540858
|
993773860e
|
优化sedRTP的管理
|
2024-01-25 23:39:18 +08:00 |
|
648540858
|
dfb1b701d5
|
优化sendRtp管理
|
2024-01-25 19:58:59 +08:00 |
|
648540858
|
932eff1d73
|
修复国标级联点播
|
2024-01-25 18:18:42 +08:00 |
|
648540858
|
7c7c1cf398
|
优化国标级联通道发送
|
2024-01-25 17:04:40 +08:00 |
|
648540858
|
5d973ef246
|
支持国标级联通道查询
|
2024-01-24 19:11:50 +08:00 |
|
648540858
|
3821dba14d
|
支持通道列表云台类型和在线状态筛选
|
2024-01-24 10:54:02 +08:00 |
|
648540858
|
407828e880
|
优化国标级联接口
|
2024-01-23 16:20:36 +08:00 |
|
648540858
|
1411de77fe
|
临时提交
|
2024-01-23 09:56:05 +08:00 |
|
648540858
|
be8d66423f
|
优化国标级联
|
2024-01-23 00:07:17 +08:00 |
|
648540858
|
a8ba1630d2
|
合并主线
|
2024-01-22 17:55:27 +08:00 |
|
648540858
|
16548e4f3c
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-22 17:03:32 +08:00 |
|
648540858
|
b3d21c7452
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-22 16:35:17 +08:00 |
|
648540858
|
a9264a8bc0
|
修复assist使用https时无法请求的bug
|
2024-01-22 16:34:58 +08:00 |
|
648540858
|
6258e05574
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# 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/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
|
2024-01-22 16:03:27 +08:00 |
|
648540858
|
e8770eec36
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-22 16:02:28 +08:00 |
|
648540858
|
d68aebd409
|
指定service使用的数据源
|
2024-01-22 15:56:24 +08:00 |
|
648540858
|
b4358a6dbe
|
临时提交
|
2024-01-22 15:01:56 +08:00 |
|
648540858
|
e9fce889ba
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
# src/main/resources/all-application.yml
# src/main/resources/application-dev.yml
# src/main/resources/application-docker.yml
|
2024-01-22 12:12:36 +08:00 |
|
648540858
|
5a3b1c04d6
|
补充日志
|
2024-01-22 12:09:04 +08:00 |
|
648540858
|
97a87542a6
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# pom.xml
|
2024-01-22 10:37:13 +08:00 |
|
648540858
|
0e94aeaf5f
|
优化录像合并下载,支持不过滤zlm节点ID
|
2024-01-22 10:16:16 +08:00 |
|
648540858
|
07729fbe49
|
优化录像合并下载
|
2024-01-22 09:46:03 +08:00 |
|
648540858
|
9a89cf81b8
|
添加多数据源配置实例
|
2024-01-22 00:33:04 +08:00 |
|
648540858
|
79c8447298
|
支持使用多数据源
|
2024-01-22 00:29:09 +08:00 |
|
648540858
|
7cb4c5c1df
|
优化拉流代理的播放
|
2024-01-22 00:02:50 +08:00 |
|
648540858
|
46af350868
|
优化多节点国标级联国标录像查询
|
2024-01-21 22:38:50 +08:00 |
|
648540858
|
31df0fb3ff
|
修复级联点播时tcp模式信令回复的错误
|
2024-01-21 16:56:13 +08:00 |
|
648540858
|
d9d8aaca6e
|
拉流代理优化未完成
|
2024-01-21 15:19:31 +08:00 |
|
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 |