648540858 03d6ad289b Merge branch 'wvp-28181-2.0' ...

# 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/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java

2022-09-01 14:50:28 +08:00

..

common

去除zlm使用redis过期作为心跳超时的方式

2022-08-29 11:50:36 +08:00

conf

Merge branch 'wvp-28181-2.0'

2022-09-01 14:50:28 +08:00

gb28181

Merge branch 'wvp-28181-2.0'

2022-09-01 14:50:28 +08:00

media/zlm

Merge branch 'wvp-28181-2.0'

2022-09-01 14:50:28 +08:00

service

Merge branch 'wvp-28181-2.0'

2022-09-01 14:50:28 +08:00

storager

去除对redis key过期事件的使用；重构国标级联的注册保活

2022-08-31 11:29:13 +08:00

utils

去除对redis key过期事件的使用；重构国标级联的注册保活

2022-08-31 11:29:13 +08:00

vmanager

Merge branch 'wvp-28181-2.0'

2022-09-01 14:50:28 +08:00

web/gb28181

实时直播 - 开始直播接口返回值增加WEBRTC字段

2022-08-18 15:32:12 +08:00

VManageBootstrap.java

依赖包版本升级

2022-08-19 17:11:51 +08:00