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,370 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

1734 Commits (3f6ef955f51ba13991d3e71d7fa031d39d06a689)

Author SHA1 Message Date
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
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 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 6eed486ff1 合并主线 2024-01-16 14:18:17 +08:00
648540858 9a96597e66 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
 2024-01-16 14:10:27 +08:00
648540858 c32ba1dea8 修复语音对讲 2024-01-16 11:33:12 +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 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 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
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 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 f3acf33fbf 添加日志 2024-01-05 17:53:20 +08:00
fine b6df13af24
修复zlm重连不在线 2024-01-05 14:14:19 +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 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
648540858 d91583b833 修复从redis同步推流列表更新失败 2024-01-04 11:33:08 +08:00
648540858 76e8480cb1 去除多余方法 2023-12-27 16:18:22 +08:00
648540858 b3eb319e05 合并主线 2023-12-26 15:39:04 +08:00
648540858 07b182da98 Merge branch 'wvp-28181-2.0' into feature/record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
 2023-12-26 15:38:40 +08:00
648540858 f8d2b933b1 为每个接口添加调试接口需要的描述 2023-12-26 15:30:24 +08:00
648540858 7c07ae9421 修复文档页面不可用BUG，支持设置认证消息头来方便调用其他接口 2023-12-26 15:03:00 +08:00
xiaoQQya 3ab4ce0a83 perf: 分屏监控设备列表优先使用自定义通道名称 2023-12-26 08:50:41 +08:00
xiaoQQya 9ae520a58a feat(channel): 新增通道支持自定义名称、位置及云台类型 2023-12-19 15:22:09 +08:00
xiaoQQya ef58f29cfc perf(catlog): 优化同步通道时通道名称的处理 
通道名称为空时，默认使用通道编码作为通道名称，避免级联时因通道名称为空导致上级接收通道失败
 2023-12-19 10:07:48 +08:00
648540858 41fdb9d13f Merge branch 'wvp-28181-record' into feature/record 2023-12-18 15:41:39 +08:00
648540858 a380246e49 修复每次注册都会发送状态变化的BUG 2023-12-18 15:27:51 +08:00
648540858 964d55431f 修复推流无声音的问题 2023-12-18 14:43:04 +08:00
648540858 c0b79878f4 合并主线 2023-12-18 14:40:54 +08:00
648540858 67d1ff0d26 Merge branch 'wvp-28181-2.0' into feature/record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-12-18 14:23:48 +08:00
648540858 76d09bcadb 修复sql注入 #1112 2023-12-18 11:14:59 +08:00
648540858 18a9f86a0a
Merge pull request #1209 from DavidSche/fix-1208 
fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误
 2023-12-18 09:59:06 +08:00
648540858 7430c98309 增加日志提示 2023-12-17 23:41:21 +08:00
648540858 d8011e9ee7 去除只有udp收流支持ssrc校验的判断 2023-12-17 23:33:18 +08:00
648540858 cb1f1417b6 兼容回复的invite 200OK消息中缺少ssrc(y字段)的情况 2023-12-15 22:44:41 +08:00
648540858 01ecb07a2f Merge branch 'wvp-28181-record' into feature/record 2023-12-15 17:54:56 +08:00
648540858 0a245c4cfe 修复非鉴权接口的跨域失败问题 2023-12-15 17:54:34 +08:00
648540858 df3f5795e7 修复非鉴权接口的跨域失败问题 2023-12-15 17:45:47 +08:00
648540858 3a1fc63d7a 优化ssrc释放逻辑 2023-12-15 17:28:55 +08:00
648540858 2397344973 优化ssrc释放逻辑 2023-12-15 16:44:46 +08:00
648540858 04a1bfa329 优化事务释放逻辑 2023-12-15 16:25:05 +08:00
648540858 60dffa5813 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-12-14 09:30:21 +08:00
648540858 b699158e43 修复点播流地址修改 2023-12-13 14:43:42 +08:00
648540858 eac72fd06e 优化日志打印样式 2023-12-13 14:37:08 +08:00
648540858 94edd95824
Merge pull request #1205 from xu-bin-bin/wvp-28181-2.0 
修改输出的日志格式
 2023-12-13 14:31:06 +08:00
davidche 572c8850dc
fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误 2023-12-13 13:48:04 +08:00
648540858 b4b9ad2873 修复写入事务信息callid错误 2023-12-13 09:40:30 +08:00
xubinbin 42a2772d1a bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195 2023-12-12 17:09:04 +08:00
xubinbin 360fe689b1 增加日志记录时的完全限定类名，用于定位日志位置。 
ps：2023-12-12 16:30:58.779 [Thread-10]  INFO --- gov.nist.javax.sip.stack.UDPMessageChannel : 81 Done processing MESSAGE sip:44010200492000000003@4401020049 SIP/2.0
日志中的“gov.nist.javax.sip.stack.UDPMessageChannel”内容
 2023-12-12 16:41:15 +08:00
xubinbin 5a9621840c 修改控制台输出日志格式，增加显示线程名称，调用类的全类路径以及日子输出行的行号。 2023-12-12 16:37:06 +08:00
648540858 e73d00060e
Merge pull request #1137 from xiaoQQya/develop 
bugfix: 修复推流鉴权、报警推送等问题
 2023-12-11 10:22:26 +08:00
648540858 7a52db4e89
Merge pull request #1138 from shuxiaoyuan/fix-subscribe-catalog 
bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加
 2023-12-11 10:11:36 +08:00
648540858 083523d204
Merge pull request #1188 from lunasaw/wvp-28181-2.0-fix 
fix find stream
 2023-12-11 10:06:35 +08:00
648540858 9f7dc295cf
Merge pull request #1140 from shuxiaoyuan/fix-update-time 
bugfix：目录订阅收到更新事件时，sql字段update_time为空导致的报错
 2023-12-11 10:05:57 +08:00
648540858 33506a0046
Merge pull request #1146 from leibnewton/fix_on_stream_changed 
修复OnStreamChangedHook媒体轨道信息解析错误
 2023-12-11 10:05:36 +08:00
648540858 bdd1846eb4 优化自动点播判断逻辑 2023-12-06 22:31:26 +08:00
648540858 92e5ed2e30 优化前端云端录像的播放 2023-12-06 16:10:32 +08:00
648540858 7e136c9ac7 完成下载文件的前后调试 2023-12-06 15:11:21 +08:00
648540858 ad36354ef4 优化国标录像服务端，使用zlm新接口实现功能 2023-12-05 11:29:05 +08:00
648540858 fc77b3f819 支持重新接入zlm的时候检查拉流代理数据是否异常，异常数据自动移除 2023-12-01 15:49:18 +08:00
chenzhangyue 0542700225 fix find stream 2023-12-01 10:34:16 +08:00
648540858 67e4060053 添加推流信息专属redis数据 2023-11-30 18:09:43 +08:00
648540858 3d5842e9e2 查询合并文件列表增加app，stream, callId过滤参数 2023-11-28 09:30:49 +08:00
648540858 dbf92b96b0 添加TODO 后续实现删除空了的过期日期文件夹 2023-11-27 14:21:40 +08:00
648540858 ffc8a530f3 修复定时录像删除 2023-11-24 10:47:33 +08:00
648540858 29ef68038d 优化拉流代理中关于ffmpeg.cmd的判断 2023-11-21 14:50:16 +08:00
648540858 db24f49275 定时删除过期录像的时间设置 2023-11-21 14:32:35 +08:00
648540858 c98ef23b98 修复定时删除过期录像文件时，收藏文件被删除的问题 2023-11-21 14:30:33 +08:00
648540858 fc8bb378de Merge branch 'wvp-28181-2.0' into main-dev 2023-11-21 10:50:02 +08:00
648540858 8422d3a343 添加数据库链接参数 2023-11-21 10:49:29 +08:00
dongzhou.xie 9a572b97df 修复OnStreamChangedHook媒体轨道信息解析错误 2023-11-07 11:52:07 +08:00
xiaoQQya f78657473e fix(报警推送): 修复报警推送功能无效的问题 
该问题原因为 com.genersoft.iot.vmp.conf.GlobalResponseAdvice 类改变了 sse 响应体的数据结构，导致前端无法正确解析 sse 数据，调试后未发现 GlobalResponseAdvice 如何修改的 sse 数据结构，故根据 sse 消息体结构自定义实现了 sse 连接
 2023-11-06 20:34:58 +08:00
xiaoQQya b73747138d
Merge branch '648540858:wvp-28181-2.0' into develop 2023-11-06 15:43:07 +08:00
648540858 c1bc45fe8f 修复点播接口状态判断错误 2023-11-06 15:13:58 +08:00
648540858 a01295603a 简化配置 2023-11-03 17:32:37 +08:00
648540858 58b333604d 修改错别字 2023-11-02 15:30:17 +08:00
648540858 073b6acec3 取出多余注释 2023-11-02 15:25:39 +08:00
648540858 f36eb7ebeb 添加打包文件 2023-11-02 14:17:20 +08:00
lishuyuan 8bd2f47c9a bugfix：目录订阅收到更新事件时，sql字段update_time为空导致的报错 2023-11-02 10:17:47 +08:00
xiaoQQya f0d09d1808 perf(snap): 优化点播后 ffmpeg 截图使用的命令参数，解决部分情况下截图失败的问题 2023-11-01 17:15:19 +08:00
xiaoQQya 8a9f8c6cab fix: 修复推流鉴权时 enable_audio 设置错误的问题 
推流鉴权获取 ssrc 缓存事务时通过 zlm 回调参数中的 stream 查询，因回调参数中的 stream 为 ssrc，而缓存事务中的 stream 为 deviceId_channelId，故导致查询不到缓存事务信息，进而导致查询不到设备信息无法正确配置 enable_audio 信息，现改为通过 deviceId 与 channelId 查询缓存事务信息
 2023-11-01 16:04:12 +08:00
lishuyuan 5cd2e2c41b bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加 2023-11-01 15:17:28 +08:00
648540858 5d3f307b44 将录像存储路径迁移至wvp中配置，assist以有在需要视频合成的时候才会用 2023-11-01 14:07:32 +08:00
648540858 75fccfaf17 使用zlm原生接口删除录像文件 2023-11-01 10:45:36 +08:00
648540858 6c13317faf Merge branch 'wvp-28181-2.0' into main-dev 2023-10-31 16:24:57 +08:00
648540858 b7ad0a907f 合并pr 优化sql 2023-10-27 18:06:46 +08:00
648540858 829ff200b8 Merge branch 'wvp-28181-2.0' into wvp-28181-record 
# Conflicts:
#	sql/2.6.9更新.sql
 2023-10-27 16:01:07 +08:00
648540858 f4f3e60a6b
Merge pull request #1082 from DavidSche/Live_streaming_push 
推流列表-->添加通道 补充播放需要的默认参数  媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示)
 2023-10-27 15:47:27 +08:00
648540858 af911d4f02
Merge pull request #1102 from xu-bin-bin/wvp-28181-2.0 
修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题
 2023-10-27 15:42:32 +08:00
648540858 47783946fe
Merge pull request #1105 from lunasaw/dev-wvp-1011 
feat:支持代理拉流状态检测，离线查询流是否离线
 2023-10-27 15:41:26 +08:00
lishuyuan da7889bf67 bugfix：编辑国标设备时，若目录订阅周期本来不为0时不生效 2023-10-27 11:15:30 +08:00
lishuyuan 26ca854db5 bugfix：去掉目录订阅通知处理重复逻辑代码 2023-10-27 11:09:42 +08:00
648540858 99506108cd 添加日志 2023-10-26 15:29:04 +08:00
648540858 5ff2faa5bd 添加日志 2023-10-25 15:02:15 +08:00
648540858 79f3ca9791 优化收藏功能 2023-10-25 14:45:45 +08:00
xu-bin-bin ae9976bb3a
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-10-24 09:28:16 +08:00
648540858 16c056e338 优化云端录像转化 2023-10-23 17:59:27 +08:00
648540858 daac0010b1 优化云端录像定时清理 2023-10-19 17:52:19 +08:00
648540858 92a25393f3 基于新的云端录像实现页面功能 2023-10-17 17:55:40 +08:00
xiaoQQya 613399cc6d fix(play): 修复单端口推流下级自定义 ssrc 时, 流注册后接口仍然超时的问题 2023-10-17 17:49:31 +08:00
648540858 5a75381a00 基于新的云端录像结构实现国标录像 2023-10-17 15:34:01 +08:00
xu-bin-bin 90d9cd8ac8
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-10-17 09:23:45 +08:00
648540858 7aa8444e67 临时提交 2023-10-13 18:25:36 +08:00
648540858 14d5549876 Merge branch 'wvp-28181-2.0' into main-dev 2023-10-13 15:47:22 +08:00
648540858 4d62f77025 Merge branch 'wvp-28181-2.0' into wvp-28181-record 2023-10-13 15:45:23 +08:00
648540858 12c4128e81 修复目录更新时已删除数据的整理功能 2023-10-13 15:44:49 +08:00
648540858 e4d37864d1 开始重构云端录像继续 2023-10-13 15:26:51 +08:00
xu-bin-bin 124d83fc0c
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-10-13 08:55:27 +08:00
648540858 298a9f4280 开始重构云端录像 2023-10-12 18:34:16 +08:00
648540858 2673fbb0bf Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
 2023-10-12 17:08:59 +08:00
648540858 78f628dd6f 修复同步目录时批量提交的错误 2023-10-12 17:01:25 +08:00
648540858 7d6aaf3bb0 修复国标接连选择通道相关的问题 2023-10-12 16:36:07 +08:00
chenzhangyue f5d89e06a3 feat:支持代理拉流状态检测，离线查询流是否离线 2023-10-11 13:52:08 +08:00
648540858 7443f2b123 修复目录名称修改，修复多层级目录删除，修复全部移除 2023-10-11 02:37:02 +08:00
648540858 7de73ebd2b Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
 2023-10-11 01:36:12 +08:00
648540858 e45b443664 测试提交 2023-10-11 01:33:36 +08:00
xubinbin 4084080a8e 修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题。 2023-10-10 15:17:06 +08:00