aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-20 20:37:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,874 Commits 27 Branches 1 Tag 209 MiB
bf3e181bdb
Commit Graph

542 Commits

Author SHA1 Message Date
648540858
bf3e181bdb 修复节点上线和下线时未清理redis流信息的BUG 2024-10-24 16:41:41 +08:00
648540858
189e56c839 优化部分redis scan查询 2024-10-21 17:42:26 +08:00
648540858
9506bef6cb 移除未使用的方法 2024-10-21 12:36:37 +08:00
648540858
59a52705cf 临时提交 2024-09-25 14:32:09 +08:00
648540858
3b2a28fd00 移除旧的数据库操作类 2024-09-24 15:59:47 +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
648540858
800d6c926a 修复数据库语法兼容以及redis接收推流信息导入 2024-09-14 15:19:07 +08:00
648540858
2e90344c89 临时提交 2024-09-09 11:16:02 +08:00
648540858
489fbe31a5 临时提交 2024-09-09 00:07:00 +08:00
648540858
3fafe83e88 临时提交 2024-09-07 22:37:32 +08:00
648540858
da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858
4597fb197d 临时提交 2024-09-04 10:30:26 +08:00
648540858
fa47f619ba 临时提交 2024-09-03 18:00:35 +08:00
648540858
8dc27d1353 国标级联通道共享支持自定义通道编号和名称 2024-08-29 16:47:46 +08:00
648540858
ddf917d127 临时提交 2024-08-28 17:10:53 +08:00
648540858
abed3ecbec 临时提交 2024-08-15 17:45:24 +08:00
648540858
cce1d1de40 重构INVITE消息处理中的上级点播请求 2024-08-14 17:19:19 +08:00
panlinlin
76a0d248ef 临时提交 2024-08-10 23:27:21 +08:00
648540858
baeffa4311
Merge pull request #1559 from koisi-io/fix 
[bugfix]修复前面几次合并所遗漏的一些问题
 2024-08-10 20:59:52 +08:00
648540858
16708e385b 支持多WVP的推流播放 2024-08-09 16:27:08 +08:00
648540858
7f8a15f017 优化收到目录时的分组信息处理 2024-08-09 11:08:40 +08:00
648540858
8ab88c0f02 临时提交 2024-08-08 22:43:37 +08:00
panlinlin
3e220a2c1e 临时提交 2024-08-07 23:45:29 +08:00
648540858
d97accee4a 临时提交 2024-08-06 16:55:33 +08:00
linshunhua
402ffa0b1e 修复在ORACLE,达梦等数据库下的用户查询BUG 2024-08-06 16:52:22 +08:00
koisi
5772d3f231
修复 87c071:合并271分支 的参数遗漏 
将推流信息记录至redis，由StreamPushItem变更成OnStreamChangedHookParam时，漏了设置serverId。
 2024-08-05 18:59:02 +08:00
koisi
c1a8e62f23
修复6月25日合并271时，变量类型未同步更新的问题 
处理ZLM推拉流事件的参数由StreamPushItem变更成OnStreamChangedHookParam了，然后有个地方没有同步更新。
 2024-08-05 17:04:58 +08:00
648540858
8c95485504 修复推流信息播放 2024-07-16 17:44:27 +08:00
648540858
6619c5c53d 临时提交 2024-07-11 18:25:16 +08:00
648540858
b843958ed7 临时提交 2024-07-10 14:43:22 +08:00
648540858
046e7802f3 临时提交 2024-07-09 17:55:51 +08:00
648540858
4912ce16ec 临时提交 2024-07-08 17:44:35 +08:00
648540858
1cb1b0bd36 临时提交 2024-07-04 18:00:41 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
adf040ec4b 优化日志以及属性设置代码 2024-07-03 17:09:49 +08:00
648540858
799932f614 优化日志以及属性设置代码 2024-07-03 16:14:18 +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
e4c11bfebe Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-06-25 16:46:47 +08:00
648540858
68fce9177f 临时提交 2024-06-25 16:45:31 +08:00
648540858
87c071fd5e 合并271分支 2024-06-25 10:24:35 +08:00
648540858
57a230afb3 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
 2024-06-25 09:45:34 +08:00
648540858
306c42b4b7 临时提交 2024-06-20 22:29:50 +08:00
648540858
45410d8091 优化拉流代理国标级联点播 2024-06-20 19:46:48 +08:00
648540858
f5abf8df4c 修改排序 2024-06-19 16:00:26 +08:00
648540858
764d04b497 调整上级观看消息的发送 2024-05-29 15:02:51 +08:00
648540858
c69b64c756 修复CSEQ重置错误 #1449 2024-05-28 10:23:17 +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
49101a37e0 兼容zlm-pro转码 2024-05-17 16:32:01 +08:00