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

61 Commits

Author SHA1 Message Date
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
9bb5ef6522 修复多个wvp执行推流转发失败的BUG 2024-04-10 18:22:42 +08:00
648540858
aeb75c0df1 优化推流结束后发送BYE 2024-04-07 20:25:44 +08:00
648540858
7d53009987 优化推流通知 2024-04-07 20:06:48 +08:00
648540858
a2b1065fe9 修复redis推流设备推送bug 2024-03-27 16:51:02 +08:00
648540858
0f18d4cbe1 修复redis推流设备推送bug 2024-03-27 16:20:46 +08:00
648540858
3291c4b2e6 修复多平台推流无人观看redis通知 2024-03-21 16:54:44 +08:00
648540858
dc8869be49 优化收到redis推动的推流设备信息更新内容重复的问题 2024-03-13 15:40:30 +08:00
648540858
e1d476a54a 处理收到redis推动的推流设备信息内容重复的问题 2024-03-13 15:24:09 +08:00
648540858
f2f70fce98 修复合并错误 2024-02-07 20:53:13 +08:00
648540858
2e7c9a7341 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.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/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	src/main/resources/all-application.yml
#	src/main/resources/application-dev.yml
 2024-02-07 20:30:37 +08:00
648540858
47526e241e 修复多wvp推流时，收到停止消息数据处理失败问题 2024-01-19 12:12:35 +08:00
648540858
29f7a6b6eb 修复多wvp模式推流时信息存储错误 2024-01-10 18:55:14 +08:00
648540858
f3acf33fbf 添加日志 2024-01-05 17:53:20 +08:00
648540858
88350873ee Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
 2023-09-11 11:21:50 +08:00
648540858
91e49745e4 修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
648540858
db6dd3f755 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.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/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
 2023-07-19 11:33:58 +08:00
648540858
457c5e3821 修复拉流代理无人观看自动停用失败 2023-07-04 11:10:17 +08:00
648540858
9889f908c8 合并主线 2023-07-04 11:08:14 +08:00
648540858
becea82736 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.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/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
 2023-07-04 10:10:48 +08:00
648540858
e4622d17a6 优化字段名称 2023-07-03 10:36:02 +08:00
648540858
975ace051b Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	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/media/zlm/ZLMRTPServerFactory.java
 2023-07-01 18:28:28 +08:00
648540858
b64f320805 优化发流逻辑 2023-07-01 18:10:33 +08:00
648540858
1458014fe3 修复合并主线后语音对讲失败的问题 2023-06-30 15:24:07 +08:00
648540858
f62bf7b2c6 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.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/gb28181/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
 2023-06-29 09:52:05 +08:00
648540858
bfae9780f7 增加流关闭时的处理 2023-06-28 20:32:48 +08:00
648540858
def56793ba 增加上级推流和停止推流的通知 2023-06-28 16:52:27 +08:00
648540858
a77628e875 优化端口预占用，防止占用无法释放 2023-06-28 14:50:46 +08:00
648540858
7b24d51db9 优化国标级联的端口保持 2023-06-21 14:03:31 +08:00
648540858
534be3f580 支持redis消息强制关闭流 2023-06-07 20:58:35 +08:00
648540858
e2f9ee8f7b 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题 2023-05-06 17:40:57 +08:00
648540858
5c5699ae11 redis优化 2023-04-13 17:14:04 +08:00
648540858
4f2d47385d 去除redis工具类直接使用RedisTemplate存取数据 2023-04-03 10:26:55 +08:00
648540858
c3ce2bc5d0 优化异常处理以及级联设备状态查询 2023-03-17 13:22:05 +08:00
648540858
72b9239c5a 优化消息通道 2023-03-16 20:32:22 +08:00
648540858
943f95ba8c 增加消息通道配置，可以通道redis在wvp上下级之间发送消息 2023-03-14 14:02:33 +08:00
648540858
048a6ce072 优化报警时间 2023-03-08 11:42:28 +08:00
gaofw189
40ece192fe 修复WVP作为下级平台接收设备告警消息后上报上级平台的问题 2023-02-03 14:35:44 +08:00