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

2818 Commits (225a444f9bfa3f75c05dc4503a4e400670d46221)

Author SHA1 Message Date
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
648540858 e6a850891e 支持移动位置订阅通知的数据存储 2024-05-11 17:48:47 +08:00
648540858 17e9631de4 修复多节点时端口丢失的问题 2024-05-09 23:53:36 +08:00
648540858 632075da9b 优化接收BYE消息后的处理 2024-05-09 23:41:27 +08:00
648540858 622d72b3f0 解决刷新通道异常 2024-05-08 12:16:18 +08:00
648540858 186b00e9b3 支持下载多个云端录像的zip压缩包 2024-05-08 11:18:47 +08:00
648540858 d79298c795 提升版本号 2024-05-07 14:18:49 +08:00
648540858 fa8ff09b42 新功能-云端录像列表支持下载 2024-04-30 17:53:31 +08:00
648540858 69185d3db8 修复云端录像下载 2024-04-30 17:51:15 +08:00
648540858 2ae4226e89 修复云端录像按年月查询时时间条件错误的BUG 2024-04-30 15:45:39 +08:00
648540858 78c2b5a63d 修复云端录像详情页时间显示错误 2024-04-30 15:36:32 +08:00
648540858 b6e604f244 修改云端录像详情页使用直接访问zlm的方式播放录像 2024-04-30 15:20:03 +08:00
648540858 edfd528dd5 Merge remote-tracking branch 'origin/master' 2024-04-30 15:01:43 +08:00
648540858 d4cdf5510b 优化拉流代理调用流程 2024-04-30 14:39:53 +08:00
648540858 1fc2916c2b
Merge pull request #1432 from AlphaWu/Zafu-Dev-20240428 
修改on_stream_none_reader返回值
 2024-04-28 22:25:58 +08:00
WuPeng 424c0b6333 修改on_stream_none_reader返回值 2024-04-28 14:31:38 +08:00
648540858 8ade012a6e 合并分支 2024-04-26 17:49:28 +08:00
648540858 5e359b64d6 合并分支 2024-04-26 17:41:00 +08:00
648540858 6bd3a187a0 合并分支 2024-04-26 15:42:31 +08:00
648540858 3f6ef955f5 修复空指针异常 2024-04-26 15:02:49 +08:00
648540858 39c3274294 合并分支 2024-04-25 17:53:24 +08:00
648540858 b89af9a693 Merge branch 'refs/heads/2.7.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2024-04-24 20:51:28 +08:00
648540858 2113e8cf27 优化notify消息中目录的处理 2024-04-24 20:33:52 +08:00
648540858 44aa37ad6e 优化notify消息中目录的处理 2024-04-24 16:12:42 +08:00
648540858 c21d973977 修复收到catalog消息是更新导致是否有音频的设置失效的BUG 2024-04-24 14:59:41 +08:00
648540858 1a30992985 合并270 2024-04-24 09:11:53 +08:00
648540858 d41d6b34af Merge branch 'refs/heads/2.7.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.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/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-04-23 20:59:20 +08:00
648540858 66a681d679 优化notify消息中目录和移动位置的处理 2024-04-23 20:45:12 +08:00
648540858 901dee2bf4 修复转发国标notify-update时信息错误的问题 2024-04-23 10:12:00 +08:00
648540858 8cba63642f 优化notify消息处理 2024-04-22 20:29:36 +08:00