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

..

alarm

为每个接口添加调试接口需要的描述

2023-12-26 15:30:24 +08:00

device

调整看守位控制接口

2024-03-29 19:18:34 +08:00

gbStream

处理收到redis推动的推流设备信息内容重复的问题

2024-03-13 15:24:09 +08:00

media

hook优化

2024-03-31 00:28:45 +08:00

MobilePosition

优化订阅机制，需要重新订阅时，取消命令发送后再发送订阅命令 #1273

2024-02-20 11:12:42 +08:00

platform

修复平台删除时未移除心跳超时重新注册任务的问题 #1329

2024-03-04 14:32:57 +08:00

play

Merge branch 'master' into dev/zlm

2024-04-09 10:35:11 +08:00

playback

为每个接口添加调试接口需要的描述

2023-12-26 15:30:24 +08:00

ptz

为每个接口添加调试接口需要的描述

2023-12-26 15:30:24 +08:00

record

Merge branch 'wvp-28181-2.0' into feature/record

2023-12-26 15:38:40 +08:00

sse

fix(报警推送): 修复报警推送功能无效的问题

2023-11-06 20:34:58 +08:00