648540858 12fa3b4c8d Merge branch 'wvp-28181-2.0' ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

2022-11-23 09:57:17 +08:00

..

common

合并主线

2022-11-18 21:52:02 +08:00

conf

Merge branch 'wvp-28181-2.0'

2022-11-23 09:57:17 +08:00

gb28181

Merge branch 'wvp-28181-2.0'

2022-11-23 09:57:17 +08:00

media/zlm

Merge branch 'wvp-28181-2.0'

2022-11-23 09:57:17 +08:00

service

Merge branch 'wvp-28181-2.0'

2022-11-23 09:57:17 +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-23 09:57:17 +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