Commit Graph

2123 Commits (5f096921985f0a79abe426396ceada42c841b03c)

Author SHA1 Message Date
648540858 5f09692198 添加统一回调管理 2024-02-23 18:48:01 +08:00
648540858 f6c48588da 支持支持主码流子码流切换 2024-02-22 17:22:28 +08:00
648540858 18898e982f 支持读取warning header作为错误消息的内容 #1030 2024-02-20 15:08:06 +08:00
648540858 a9ab5c28e9 优化订阅机制,需要重新订阅时,取消命令发送后再发送订阅命令 #1273 2024-02-20 11:12:42 +08:00
648540858 b079039f81 修复国标级联上级主动结束时ssrc未释放的问题 2024-02-02 09:20:13 +08:00
648540858 bf0efc2739 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-31 18:50:15 +08:00
648540858 105ad25580 默认设备状态变化发送通知 2024-01-31 18:48:27 +08:00
648540858 fc74ce9de4 Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/resources/application-dev.yml
2024-01-31 17:25:32 +08:00
648540858 68fbc8fef1 优化跨域配置,默认允许全部跨域 2024-01-31 17:23:47 +08:00
648540858 33b125262b 优化jessibuca播放窗口尺寸 2024-01-31 11:07:31 +08:00
648540858 f146203fd3
Merge pull request #1289 from oulover/fix_wvp-28181-2.0_gbStreamId
Fix 推流列表-> 添加通道 报错: 错误: 字段 "gbStreamId" 不存在 ,改为:gb_stream_id 自测试通过
2024-01-30 14:11:09 +08:00
PengOu 1245ae7874 Fix 推流列表-> 添加通道 报错: 错误: 字段 "gbStreamId" 不存在 ,改为:gb_stream_id 自测试通过 2024-01-30 10:59:25 +08:00
648540858 3436e73e72 修复云端录像时间显示错误 2024-01-30 10:55:41 +08:00
648540858 ab34cb37f3 修复空指针异常 2024-01-29 21:20:03 +08:00
648540858 9c3967d67a
Merge pull request #1288 from pedoc/wvp-28181-2.0
修复未配置sipdomain时出现异常
2024-01-29 20:03:55 +08:00
648540858 695f9b7f4d 修复来自其他wvp的推流时平台名称未赋值的问题 2024-01-29 19:31:07 +08:00
pedoc 3d68b56bb5
修复未配置sipdomain时出现异常 2024-01-29 18:05:17 +08:00
648540858 241d223b8a 添加日志 2024-01-25 17:46:38 +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 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 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 46af350868 优化多节点国标级联国标录像查询 2024-01-21 22:38:50 +08:00
648540858 31df0fb3ff 修复级联点播时tcp模式信令回复的错误 2024-01-21 16:56:13 +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 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 47526e241e 修复多wvp推流时,收到停止消息数据处理失败问题 2024-01-19 12:12:35 +08:00
648540858 ebc65b40d3 添加收到invite消息后的日志,减少国标级联推送代理流的等待时间 2024-01-18 14:54:03 +08:00
648540858 7f79b92568 修复设备在事务内注销失败的问题 2024-01-18 10:17:03 +08:00
648540858 88721511e7 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-16 14:51:17 +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 674ab18c02 修复rtp暂停检查调用失败 2024-01-12 15:03:11 +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 2b2efb59a6 修复多个推流推送到上级是不完整的问题,修改平台注销时不删除自己模拟的订阅信息 2024-01-11 14:56:11 +08:00
648540858 a23c1aca40 合并269分支修复的内容 2024-01-10 19:14:11 +08:00
648540858 81a32fdb47 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-10 19:12:06 +08:00