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

2647 Commits (55c534ac90b0d7f39191f4fca7c407faf09dd50e)

Author SHA1 Message Date
648540858 b1d9ea8082
Merge pull request #1492 from iwanlebron/master 
修复参数名称
 2024-06-17 10:06:51 +08:00
648540858 107caf1171 调整前端使用转码后的流 2024-06-14 17:24:57 +08:00
648540858 f3ea07bdcd 调整转码后的流的输出位置 2024-06-14 17:03:55 +08:00
648540858 ee3d87b507
Update bug.md 2024-06-14 11:32:52 +08:00
648540858 aa56bb3c26 优化docker内ip变化的情况 2024-06-14 09:47:19 +08:00
panlinlin 07a8ef9e25 SIP只有一个监听时，直接返回 2024-06-14 00:03:57 +08:00
panlinlin 70e6d919e9 设备使用的注册网卡信息变化时，更新设备信息 2024-06-13 23:40:32 +08:00
panlinlin 317c5455c6 修复位置信息保存失败的BUG 2024-06-13 23:19:26 +08:00
panlinlin 7b46769a16 修复国标录像下载后负载统计未清除的BUG 2024-06-13 23:15:51 +08:00
648540858 da2662ab27 国标28181-支持自动识别网卡监听，可以不再配置SIP.IP 2024-06-13 18:10:01 +08:00
648540858 4ad711f61a 去除调试日志日志 2024-06-13 16:21:34 +08:00
648540858 c1b0365b02 增加设备上线判断双逻辑，兼容华为设备（前一条的描述大华是错误的，大华没有这个问题）注册后不再发送注册的设备 2024-06-12 11:16:21 +08:00
648540858 6c9d213394 Merge remote-tracking branch 'origin/master' 2024-06-12 11:10:22 +08:00
648540858 0ac27b03ff 增加设备上线判断双逻辑，兼容大华注册后不再发送注册的设备 2024-06-12 11:10:10 +08:00
panlinlin b070b57259 拉流代理状态变化时，支持推送到国标平台 2024-06-11 23:10:12 +08:00
648540858 2cf7178cb7 Merge branch 'refs/heads/2.7.1' 2024-06-11 10:14:14 +08:00
648540858 f8ef14bfea 修复移动位置位置订阅上报间隔为0的bug 2024-06-11 10:08:13 +08:00
Iwan Lebron 5bc3a71764
Merge pull request #1 from iwanlebron/iwanlebron-patch-1 
修复参数名称
 2024-06-10 09:19:16 +08:00
Iwan Lebron f6157cc42c
修复参数名称 2024-06-10 09:18:37 +08:00
648540858 8377d4a1c7
Merge pull request #1489 from Duktig-Jay/bug_fix-录像下载失败未正常释放ssrc 
[bugfix]录像下载失败未正常释放ssrc
 2024-06-09 20:47:55 +08:00
wangxinlong 208e034822 录像下载失败未正常释放ssrc 2024-06-07 18:13:45 +08:00
648540858 619a86e0ed 修复循环引用 2024-06-06 19:59:48 +08:00
648540858 2226d34898 修复空指针异常 2024-06-06 00:29:52 +08:00
648540858 2127cbeca3 调整收到移动位置订阅后开启定时任务 2024-06-05 22:45:13 +08:00
648540858 764d04b497 调整上级观看消息的发送 2024-05-29 15:02:51 +08:00
648540858 bec35ebf94 调整录像进度获取流程 2024-05-28 16:06:08 +08:00
648540858 5a70a4742d 修正数据库sql文件 2024-05-28 10:39:26 +08:00
648540858 c69b64c756 修复CSEQ重置错误 #1449 2024-05-28 10:23:17 +08:00
648540858 de390d3982 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2024-05-28 10:16:46 +08:00
648540858 1efabbe4cc 支持把推流的额外参数加入redis缓存 2024-05-24 10:50:29 +08:00
648540858 3a056acbc1 合并271分支 2024-05-24 10:18:29 +08:00
648540858 de6baa157e 合并271分支 2024-05-24 08:51:09 +08:00
648540858 8bdc406903 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
 2024-05-24 08:50:14 +08:00
648540858 aeeb61d141 合并271分支 2024-05-23 17:47:43 +08:00
648540858 475b8a49a3 优化录像文件信息入库 2024-05-23 17:44:30 +08:00
648540858 2c89fae49a Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
 2024-05-23 17:32:15 +08:00
648540858 fe9b8154e0 去除调试日志 2024-05-23 17:15:14 +08:00
648540858 2daa59d78c 支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题 2024-05-23 17:10:45 +08:00
648540858 d70bfb53dd 修复兼容zlm-pro转码时无人管看自动移除失败的BUG 2024-05-20 11:37:07 +08:00
648540858 49101a37e0 兼容zlm-pro转码 2024-05-17 16:32:01 +08:00
648540858 7f9c903344
Merge pull request #1455 from hexq/master 
Bugfix: 解决疑似Mac 14寸下国标设备直播之Jessibuca下出现的部分黑屏问题
 2024-05-17 05:12:23 +08:00
hexq 09efdef4ce 解决MacOS 14寸 M2：最新Chrome国标设备通道“直播”Jessibuca播放下方出现黑屏的兼容BUG 2024-05-16 13:25:06 +08:00
648540858 b3eba418a2
Merge pull request #1453 from BradyXs/master 
fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。
 2024-05-16 09:08:07 +08:00
BradyXu 7565b2ea77 fix 优化及联本地IP选择 2024-05-15 23:28:38 +08:00
bradyx 6e8071d820 fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。 2024-05-15 13:52:16 +08:00
648540858 5564cfb384 优化大量notify 移动位置订阅的入库 2024-05-13 17:22:36 +08:00
648540858 588b1da35a Merge branch 'refs/heads/2.7.0' into 271-优化notify存储 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
 2024-05-13 11:12:20 +08:00
648540858 69c81b3b96
Merge pull request #1450 from BradyXs/master 
修复sip绑定监听多网卡IP时，新增上级平台新增失败的问题，本地IP改成从配置的多IP下拉选择
 2024-05-12 06:05:31 +08:00
BradyXu 72b437cc52 修复当上级平台点播时，上级平台和下级平台局域网不通时，导致推流失败。推流目标IP地址改为配置的SDP发流IP，如果SDP发流IP存在的话。否则还是从连接中获取推流目标IP 2024-05-12 02:15:41 +08:00
BradyXu a8c424e49d 修复sip绑定监听多网卡IP时，新增上级平台新增失败的问题，本地IP改成从配置的多IP下拉选择 2024-05-12 02:00:55 +08:00