aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-25 14:37:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,909 Commits 27 Branches 1 Tag 210 MiB
396961ea20
Commit Graph

546 Commits

Author SHA1 Message Date
648540858
396961ea20 策略配置文件增加注释与使用Lombok 2024-10-30 15:19:17 +08:00
648540858
5304620861 重构报警SSE推送 2024-10-29 15:57:52 +08:00
648540858
059635c2cc 修复国标点播缓存启动未清理的BUG 2024-10-25 17:41:50 +08:00
648540858
bf3e181bdb 修复节点上线和下线时未清理redis流信息的BUG 2024-10-24 16:41:41 +08:00
648540858
0ddc374c34 修复多zlm节点上线时的空指针异常+单端口收流未设置到zlm的BUG 2024-10-24 15:55:38 +08:00
648540858
2cd21a26d4 修复国标级联点播未使用自动自定义SSRC的BUG 2024-10-24 10:04:38 +08:00
Klu5ure
22d6350778 修正拼写错误：重命名 ZLMMediaServerStatusManger 为 ZLMMediaServerStatusManager，node_manger.md 为 node_manager.md 2024-10-21 18:12:16 +08:00
648540858
550b90b157 Merge branch 'master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-09-18 09:10:12 +08:00
hx
f6eeb59371 修复端口初始化wssSslPort获取失败 
修复字符集空指针异常导致心跳的错误
 2024-09-14 15:16:47 +08:00
648540858
e078360928 修复语音对讲 2024-09-11 16:59:52 +08:00
648540858
1b34787d3a 临时提交 2024-09-10 17:47:58 +08:00
648540858
3140672e63 修复国标录像下载 2024-09-10 16:50:54 +08:00
648540858
489fbe31a5 临时提交 2024-09-09 00:07:00 +08:00
648540858
da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858
fa47f619ba 临时提交 2024-09-03 18:00:35 +08:00
648540858
dd794d4868 临时提交 2024-08-27 17:56:49 +08:00
648540858
5a259aaa63 临时提交 2024-08-24 00:18:54 +08:00
648540858
cce1d1de40 重构INVITE消息处理中的上级点播请求 2024-08-14 17:19:19 +08:00
648540858
16708e385b 支持多WVP的推流播放 2024-08-09 16:27:08 +08:00
648540858
5abf5012eb 完善分组通道管理 2024-08-07 17:12:39 +08:00
648540858
a3f7753b84 Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	web_src/src/components/PushVideoList.vue
 2024-08-07 11:17:34 +08:00
648540858
c88681c7ad 合并分支 2024-08-07 10:41:54 +08:00
Iwan Lebron
c7c94ee73d
修复 ZLMServerFactory 日志不打印 2024-08-01 14:47:43 +08:00
648540858
9f4e66a38b 优化拉流代理 2024-07-19 17:54:14 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
799932f614 优化日志以及属性设置代码 2024-07-03 16:14:18 +08:00
648540858
b630190e30 临时提交 2024-06-28 18:06:09 +08:00
panlinlin
019af90f6e 临时提交 2024-06-28 07:36:28 +08:00
panlinlin
9c0e69c6c5 临时提交 2024-06-28 06:48:49 +08:00
648540858
88c021948f 临时提交 2024-06-27 18:41:58 +08:00
648540858
400eef2d2e 临时提交 2024-06-27 16:02:43 +08:00
648540858
f32eb14125 临时提交 2024-06-26 18:36:32 +08:00
648540858
306c42b4b7 临时提交 2024-06-20 22:29:50 +08:00
648540858
da2662ab27 国标28181-支持自动识别网卡监听，可以不再配置SIP.IP 2024-06-13 18:10:01 +08:00
648540858
bec35ebf94 调整录像进度获取流程 2024-05-28 16:06:08 +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
aeeb61d141 合并271分支 2024-05-23 17:47:43 +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
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
bradyx
6e8071d820 fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。 2024-05-15 13:52:16 +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
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
edfd528dd5 Merge remote-tracking branch 'origin/master' 2024-04-30 15:01:43 +08:00
WuPeng
424c0b6333 修改on_stream_none_reader返回值 2024-04-28 14:31:38 +08:00
648540858
39c3274294 合并分支 2024-04-25 17:53:24 +08:00