648540858
|
5c15a2b382
|
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/service/impl/PlatformChannelServiceImpl.java
|
2024-03-05 10:45:53 +08:00 |
|
648540858
|
5bf87ca330
|
Merge pull request #1270 from hexq/playback
Playback
|
2024-03-05 10:41:22 +08:00 |
|
648540858
|
7cbc8c5fc2
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
|
2024-03-04 17:55:01 +08:00 |
|
648540858
|
bd4598e676
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2024-03-04 14:33:15 +08:00 |
|
648540858
|
38980826f9
|
修复平台删除时未移除心跳超时重新注册任务的问题 #1329
|
2024-03-04 14:32:57 +08:00 |
|
648540858
|
5a6044ef4e
|
Merge pull request #1336 from wendy512/bugfix
bugfix：修复紫光华智录像查询返回日期为2024-02-21T11:10:36+08:00解析报错，兼容多种不同日期格式
|
2024-03-01 14:51:51 +08:00 |
|
648540858
|
e932a9b824
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-03-01 10:55:49 +08:00 |
wendy512
|
268869c6a1
|
bugfix：修复紫光华智录像查询返回StartTime、EndTime为2024-02-21T11:10:36+08:00，兼容多种不同日期格式
|
2024-02-29 21:10:56 +08:00 |
|
648540858
|
c581974027
|
使用GetMapping替换RequestMapping
|
2024-02-29 18:15:55 +08:00 |
|
648540858
|
bb94831177
|
修复访问assist配置https访问失败的问题
|
2024-02-29 16:20:46 +08:00 |
|
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
|
9839eb5d30
|
临时提交
|
2024-02-04 15:24:36 +08:00 |
|
648540858
|
7df31fa5eb
|
Merge remote-tracking branch 'origin/结构优化' into 结构优化
|
2024-02-03 09:17:08 +08:00 |
|
648540858
|
ad9e5f8bce
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2024-02-02 21:48:41 +08:00 |
|
648540858
|
0f23c3bb46
|
临时提交
|
2024-02-02 16:11:44 +08:00 |
|
648540858
|
b079039f81
|
修复国标级联上级主动结束时ssrc未释放的问题
|
2024-02-02 09:20:13 +08:00 |
|
648540858
|
241fa9030a
|
临时提交
|
2024-02-01 22:50:41 +08:00 |
|
648540858
|
c4804af026
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-31 18:55:31 +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
|
09d610830f
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
|
2024-01-31 17:26:00 +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
|
02660913a0
|
临时提交
|
2024-01-31 17:17:28 +08:00 |
|
648540858
|
9d9681c663
|
优化点播流程
|
2024-01-31 10:49:50 +08:00 |
|
648540858
|
3e1bf69181
|
添加通用通道云台控制接口
|
2024-01-30 23:11:21 +08:00 |
|
648540858
|
f5a7b958b6
|
去除多余注释
|
2024-01-30 21:16:23 +08:00 |
|
648540858
|
a412f9c2d4
|
支持国标级联录像下载
|
2024-01-30 20:46:47 +08:00 |
|
648540858
|
02c0a45f11
|
支持国标级联录像播放
|
2024-01-30 19:14:05 +08:00 |
|
648540858
|
18214b8b82
|
支持国标级联录像查询
|
2024-01-30 18:13:35 +08:00 |
PengOu
|
1245ae7874
|
Fix 推流列表-> 添加通道 报错： 错误: 字段 "gbStreamId" 不存在 ,改为：gb_stream_id 自测试通过
|
2024-01-30 10:59:25 +08:00 |
|
648540858
|
398e0930ae
|
catqlog查询支持回复平台信息
|
2024-01-30 00:00:49 +08:00 |
|
648540858
|
8402edaf01
|
支持国标级联报警复位， 布防撤防，录像控制，强制关键帧，设备重启，拉框放大缩小， 看守位控制
|
2024-01-29 23:37:47 +08:00 |
|
648540858
|
ab34cb37f3
|
修复空指针异常
|
2024-01-29 21:20:03 +08:00 |
|
648540858
|
0688bb91d2
|
临时提交
|
2024-01-29 20:48:19 +08:00 |
|
648540858
|
695f9b7f4d
|
修复来自其他wvp的推流时平台名称未赋值的问题
|
2024-01-29 19:31:07 +08:00 |
|
648540858
|
70f3f3b431
|
临时提交
|
2024-01-29 18:57:12 +08:00 |
pedoc
|
3d68b56bb5
|
修复未配置sipdomain时出现异常
|
2024-01-29 18:05:17 +08:00 |
|
648540858
|
b17eea547a
|
支持国标级联云台控制
|
2024-01-29 17:19:38 +08:00 |
|
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
|
241d223b8a
|
添加日志
|
2024-01-25 17:46:38 +08:00 |