648540858
|
86a35f3612
|
合并开源主线
|
2024-04-02 11:25:19 +08:00 |
|
648540858
|
1bb813758a
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2024-04-02 11:20:51 +08:00 |
|
648540858
|
67688d4a4b
|
优化停止国标收流
|
2024-04-02 11:20:19 +08:00 |
|
648540858
|
969ff86ebe
|
放行abl hook 接口
|
2024-04-02 09:53:47 +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
|
0324855190
|
Merge branch 'master' into dev/abl支持
|
2024-03-29 22:55:09 +08:00 |
|
648540858
|
486daf4dfe
|
调整看守位控制接口
|
2024-03-29 19:18:34 +08:00 |
|
648540858
|
150e7a3199
|
调整节点管理代码结构
|
2024-03-22 16:45:18 +08:00 |
|
648540858
|
b90dc789b4
|
优化媒体节点服务的代码结构
|
2024-03-21 23:39:32 +08:00 |
|
648540858
|
1e0b73b939
|
调整节点管理代码结构
|
2024-03-19 17:52:11 +08:00 |
|
648540858
|
1768565ce0
|
优化媒体节点服务的代码结构
|
2024-03-18 23:42:18 +08:00 |
|
648540858
|
e1d476a54a
|
处理收到redis推动的推流设备信息内容重复的问题
|
2024-03-13 15:24:09 +08:00 |
|
648540858
|
1fcdf5a8f3
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
|
2024-03-08 09:30:48 +08:00 |
|
648540858
|
38980826f9
|
修复平台删除时未移除心跳超时重新注册任务的问题 #1329
|
2024-03-04 14:32:57 +08:00 |
|
648540858
|
a90098b90b
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2024-03-01 14:46:33 +08:00 |
|
648540858
|
e932a9b824
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-03-01 10:55:49 +08:00 |
|
648540858
|
c581974027
|
使用GetMapping替换RequestMapping
|
2024-02-29 18:15:55 +08:00 |
|
648540858
|
509d9b3cbb
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
|
2024-02-27 10:22:13 +08:00 |
|
648540858
|
f6c48588da
|
支持支持主码流子码流切换
|
2024-02-22 17:22:28 +08:00 |
|
648540858
|
a9ab5c28e9
|
优化订阅机制，需要重新订阅时，取消命令发送后再发送订阅命令 #1273
|
2024-02-20 11:12:42 +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
|
88721511e7
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-16 14:51:17 +08:00 |
|
648540858
|
0371f5a96e
|
修复国标级联全部添加与全部删除
|
2024-01-15 15:31:20 +08:00 |
|
648540858
|
07b182da98
|
Merge branch 'wvp-28181-2.0' into feature/record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
|
2023-12-26 15:38:40 +08:00 |
|
648540858
|
f8d2b933b1
|
为每个接口添加调试接口需要的描述
|
2023-12-26 15:30:24 +08:00 |
|
648540858
|
67d1ff0d26
|
Merge branch 'wvp-28181-2.0' into feature/record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-12-18 14:23:48 +08:00 |
|
648540858
|
7e136c9ac7
|
完成下载文件的前后调试
|
2023-12-06 15:11:21 +08:00 |
|
648540858
|
ad36354ef4
|
优化国标录像服务端，使用zlm新接口实现功能
|
2023-12-05 11:29:05 +08:00 |
|
xiaoQQya
|
f78657473e
|
fix(报警推送): 修复报警推送功能无效的问题
该问题原因为 com.genersoft.iot.vmp.conf.GlobalResponseAdvice 类改变了 sse 响应体的数据结构，导致前端无法正确解析 sse 数据，调试后未发现 GlobalResponseAdvice 如何修改的 sse 数据结构，故根据 sse 消息体结构自定义实现了 sse 连接
|
2023-11-06 20:34:58 +08:00 |
|
648540858
|
7de73ebd2b
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
|
2023-10-11 01:36:12 +08:00 |
|
648540858
|
e8411bc797
|
修复截图截图未关闭流 #1087
|
2023-09-25 16:22:36 +08:00 |
|
648540858
|
a34db2ee8b
|
增加根据国标编号添加国标级联通道的接口
|
2023-09-21 21:34:02 +08:00 |
|
648540858
|
4df90d9ba4
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-09-20 09:17:28 +08:00 |
|
Cloud User
|
bc431e4290
|
fix-use-source-ip-as-stream-ip
|
2023-09-15 22:39:08 +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
|
e898c344aa
|
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/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2023-08-07 17:28:02 +08:00 |
|
648540858
|
988dc36fa5
|
重构点播，回放，下载时ssrc不一致以及TCP主动播放的逻辑
|
2023-08-04 15:47:56 +08:00 |
|
648540858
|
6797f77259
|
优化点播超时的处理，修复tcp主动点播时ssrc不一致时点播失败的问题
|
2023-08-03 15:36:59 +08:00 |
|
tnt group
|
e9a48e5303
|
fix: 修复请求截图api生成文件名称的异常
|
2023-07-30 13:25:38 +08:00 |
|
648540858
|
11c7deb876
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-07-19 15:35:22 +08:00 |
|
648540858
|
9cd63f0105
|
修复国标级联时添加目录不同平台无法使用同一个目录的问题
|
2023-07-19 15:33:21 +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 |
|
朱俊杰
|
4f2cd41134
|
修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突
|
2023-07-17 10:54:34 +08:00 |
|
648540858
|
ff1e9f79c2
|
优化海康发送的Message消息设置的消息体长度为0，导致无法解析的问题 #920
|
2023-07-07 14:51:41 +08:00 |
|
648540858
|
457c5e3821
|
修复拉流代理无人观看自动停用失败
|
2023-07-04 11:10:17 +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
|
c014a90cc6
|
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/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-06-29 16:08:05 +08:00 |
|