648540858 6c9d6f0054 Merge branch 'wvp-28181-2.0' ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java

2022-11-29 13:16:20 +08:00

..

common

修复协议端口配置不全导致前端播放页面无法弹出的问题

2022-11-25 10:50:16 +08:00

conf

优化语音对讲

2022-11-24 20:01:03 +08:00

gb28181

Merge branch 'wvp-28181-2.0'

2022-11-29 13:16:20 +08:00

media/zlm

Merge branch 'wvp-28181-2.0'

2022-11-29 13:16:20 +08:00

service

Merge branch 'wvp-28181-2.0'

2022-11-29 13:16:20 +08:00

storager

优化拉流代理表单以及逻辑

2022-11-22 17:17:35 +08:00

utils

优化使用来源ip作为流ip

2022-11-10 09:40:01 +08:00

vmanager

Merge branch 'wvp-28181-2.0'

2022-11-29 13:16:20 +08:00

web/gb28181

优化使用来源ip作为流ip

2022-11-10 09:40:01 +08:00

VManageBootstrap.java

为User-Agent添加必要的版本信息

2022-09-09 23:19:19 +08:00