Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,310 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

1684 Commits (5c15a2b3827048a253f23ad3289668e1a72719af)

Author SHA1 Message Date
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
hexq 7055c53192 BUGFIX：回放时，优先从SDP中提取channelId，兼容从Subject无法提取到channelId的问题 2024-01-20 10:26:49 +08:00
hexq dd4e0d0d9c BUGFIX：向下级目录关联通道时，出现“未查询到目录xxx的信息" 2024-01-20 10:22:34 +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
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 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 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 81a32fdb47 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-10 19:12:06 +08:00
648540858 29f7a6b6eb 修复多wvp模式推流时信息存储错误 2024-01-10 18:55:14 +08:00
648540858 731a7e32c2 Merge branch 'wvp-28181-2.0' into 结构优化 2024-01-10 16:18:15 +08:00
648540858 64be28ed77 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-10 16:17:53 +08:00
648540858 c25a99d60b 修复空指针异常 2024-01-10 16:17:29 +08:00
648540858 28e060fd6f 修复空指针异常 2024-01-10 14:42:30 +08:00
648540858 0c10c77a56 优化录像路径的设置 2024-01-10 11:14:49 +08:00
648540858 48d4871ea4 添加编辑拉流代理接口 2024-01-09 17:43:16 +08:00
fine db493e2625
修复单端口下历史回放暂停和恢复发送的流ID与zlm不一致 2024-01-09 11:50:26 +08:00
fine 8874c90db2
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2024-01-09 11:45:30 +08:00
648540858 7c7b35ca80 添加拉流代理相关接口-获取FFMPEG命令模板 2024-01-08 23:50:41 +08:00
648540858 8d9916f94e 添加新的删除拉流代理接口 2024-01-08 18:40:46 +08:00
648540858 9b1c6c46a8 Merge branch 'wvp-28181-2.0' into 结构优化 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
 2024-01-08 16:21:39 +08:00
648540858 b15e559eae Merge branch '2.6.9' into wvp-28181-2.0 2024-01-08 16:18:28 +08:00
648540858 a74fb6ecd6 优化目录订阅处理，保证存储异常时不影响后续操作 2024-01-08 15:03:07 +08:00
648540858 fc2f9d8cca 优化方法 2024-01-08 14:16:56 +08:00
648540858 8db0192a27 添加拉流代理接口-新增拉流代理 2024-01-07 23:57:33 +08:00
648540858 c186ce94c1 优化推流列表接口 2024-01-07 01:50:02 +08:00
648540858 f3acf33fbf 添加日志 2024-01-05 17:53:20 +08:00
648540858 7fd03a50a0 临时提交 2024-01-05 16:58:31 +08:00
fine b6df13af24
修复zlm重连不在线 2024-01-05 14:14:19 +08:00
648540858 6bfc75286b 修复云端录像查询的时间设置问题 2024-01-04 20:47:33 +08:00
648540858 3fd7b0c025 优化视频流化调用 2024-01-04 19:02:38 +08:00
648540858 d2e7f247a6 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/storager/dao/PlatformGbStreamMapper.java
 2024-01-04 18:35:32 +08:00
648540858 a2cac5ca12 Merge branch '2.6.9' into wvp-28181-2.0 
# Conflicts:
#	pom.xml
 2024-01-04 18:34:46 +08:00
648540858 ed67afb7a2 添加云端录像获取视频播放地址的接口 2024-01-04 18:29:34 +08:00
648540858 6120e6bd7b 添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送 2024-01-04 17:26:47 +08:00
648540858 64b6a35603 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-04 11:33:29 +08:00