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

..

bean

Merge branch 'wvp-28181-2.0' into main-dev

2023-07-19 11:33:58 +08:00

gb28181

Merge branch 'wvp-28181-2.0' into main-dev

2023-07-19 11:33:58 +08:00

log

修复可空时间参数的校验 #784

2023-03-22 15:21:22 +08:00

record

优化跨域配置，支持同域的前后端分离部署

2023-03-05 09:53:26 +08:00

rtp

Merge branch '2.6.8' into wvp-28181-2.0

2023-07-17 16:56:58 +08:00

server

优化部分sql实现

2023-05-15 15:29:39 +08:00

streamProxy

修复录像下载，优化拉流代理接口

2023-06-07 20:15:08 +08:00

streamPush

优化异常处理以及级联设备状态查询

2023-03-17 13:22:05 +08:00

user

修复获取pushKey

2023-06-28 20:27:25 +08:00