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

2108 Commits (3436e73e720b5a15cf038369a88f2e99c1ad17f5)

Author SHA1 Message Date
648540858 d91583b833 修复从redis同步推流列表更新失败 2024-01-04 11:33:08 +08:00
648540858 e7e407eb57 增加版本号 2024-01-03 16:00:03 +08:00
648540858 9d61a93077 优化数据库sql文件组织方式 2024-01-03 15:50:47 +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
648540858 33fba05a38
Merge pull request #1219 from xiaoQQya/develop 
Feature: 新增通道编辑功能
 2023-12-26 09:52:03 +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 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