648540858 8b0ff3767b Merge branch 'wvp-28181-2.0' ...

# Conflicts:
#	sql/update.sql
#	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/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

2022-08-09 14:41:21 +08:00

..

common

支持从redis消息更新推流设备状态

2022-07-12 17:33:17 +08:00

conf

fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug

2022-07-27 18:31:33 +08:00

gb28181

Merge branch 'wvp-28181-2.0'

2022-08-09 14:41:21 +08:00

media/zlm

Merge branch 'wvp-28181-2.0'

2022-08-09 14:41:21 +08:00

service

Merge branch 'wvp-28181-2.0'

2022-08-09 14:41:21 +08:00

storager

修复单个添加的推流级联国标的问题

2022-08-05 09:48:13 +08:00

utils

数据库优化

2022-07-06 09:44:37 +08:00

vmanager

Merge branch 'wvp-28181-2.0'

2022-08-09 14:41:21 +08:00

web/gb28181

设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84

2022-06-14 17:00:24 +08:00

VManageBootstrap.java

测试提交权限

2022-07-13 11:29:46 +08:00