aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-21 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,682 Commits 27 Branches 1 Tag 209 MiB
0177831e86
Commit Graph

99 Commits

Author SHA1 Message Date
panlinlin
0177831e86 临时提交 2024-08-11 23:20:42 +08:00
panlinlin
76a0d248ef 临时提交 2024-08-10 23:27:21 +08:00
648540858
d8d9f76d89 支持多WVP的推流播放 2024-08-09 17:55:39 +08:00
648540858
16708e385b 支持多WVP的推流播放 2024-08-09 16:27:08 +08:00
648540858
9aad6ac719 临时提交 2024-08-08 17:47:08 +08:00
648540858
6bd0cdd37b 临时提交 2024-07-23 18:00:47 +08:00
648540858
b843958ed7 临时提交 2024-07-10 14:43:22 +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
b2aa5c839d 临时提交 2024-06-27 17:51:13 +08:00
648540858
400eef2d2e 临时提交 2024-06-27 16:02:43 +08:00
648540858
f32eb14125 临时提交 2024-06-26 18:36:32 +08:00
648540858
81049b5a9e 临时提交 2024-06-25 17:46:33 +08:00
648540858
68fce9177f 临时提交 2024-06-25 16:45:31 +08:00
648540858
306c42b4b7 临时提交 2024-06-20 22:29:50 +08:00
648540858
764d04b497 调整上级观看消息的发送 2024-05-29 15:02:51 +08:00
648540858
8ade012a6e 合并分支 2024-04-26 17:49:28 +08:00
648540858
5e359b64d6 合并分支 2024-04-26 17:41:00 +08:00
648540858
39c3274294 合并分支 2024-04-25 17:53:24 +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
1aa197510f 临时提交 2024-04-19 14:39:35 +08:00
648540858
87629b7fc7 临时提交 2024-04-19 10:32:28 +08:00
648540858
0dab86f0b8 临时提交 2024-04-19 10:22:34 +08:00
648540858
94436de3e1 临时提交 2024-04-18 18:31:37 +08:00
648540858
678bb33562 临时提交 2024-04-18 18:07:47 +08:00
648540858
5d36c2a337 临时提交 2024-04-18 17:51:56 +08:00
648540858
9adf12ca6a 临时提交 2024-04-18 17:34:00 +08:00
648540858
55a240bb45 临时提交 2024-04-18 15:52:34 +08:00
648540858
313243195e 修复通道位置的展示 2024-04-17 17:56:36 +08:00
648540858
bf6e09d231 修复多wvp国标级联机制 2024-04-17 12:56:22 +08:00
648540858
9c6765d44e 重构多wvp国标级联机制 2024-04-16 22:10:35 +08:00
648540858
b4168c02cb 优化多wvp国标级联推流 2024-04-16 00:10:38 +08:00
648540858
f9abfca003 临时提交 2024-04-15 21:33:22 +08:00
648540858
f34143df6d 修改totalReaderCount类型 2024-04-12 10:36:18 +08:00
648540858
651d4a1b0e 优化代码调用 2024-04-11 14:28:42 +08:00
648540858
9978d30aa1 Merge branch '2.7.0' 2024-04-11 09:36:48 +08:00
648540858
6c0087db88 优化代码调用 2024-04-10 20:56:45 +08:00
648540858
9bb5ef6522 修复多个wvp执行推流转发失败的BUG 2024-04-10 18:22:42 +08:00
648540858
54b878d2e1 优化代码，升级版本号为2.7.1 2024-04-09 22:43:45 +08:00
648540858
bbf19c7909 合并主线 2024-04-09 10:40:16 +08:00
648540858
b1b6fae22c Merge branch 'master' into dev/zlm 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.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/vmanager/cloudRecord/CloudRecordController.java
 2024-04-09 10:35:11 +08:00
648540858
aeb75c0df1 优化推流结束后发送BYE 2024-04-07 20:25:44 +08:00
648540858
7d53009987 优化推流通知 2024-04-07 20:06:48 +08:00
648540858
33b75be71a 支持abl hook 2024-04-01 18:21:38 +08:00
648540858
4548695a0b hook优化 2024-03-31 00:28:45 +08:00
648540858
7a3b9c6f69 调整hook订阅通知的位置 2024-03-28 19:10:53 +08:00
648540858
cc793d16f5 调整hook订阅通知的位置 2024-03-28 18:35:28 +08:00
648540858
7dda1f6a2e Merge branch 'master' into dev/abl支持 2024-03-27 17:18:35 +08:00
648540858
a2b1065fe9 修复redis推流设备推送bug 2024-03-27 16:51:02 +08:00