aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-13 00:57:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,294 Commits 27 Branches 1 Tag 209 MiB
9839eb5d30
Commit Graph

1668 Commits

Author SHA1 Message Date
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
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