648540858 29191373aa Merge branch 'wvp-28181-2.0' into wvp-pro-record ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	web_src/src/components/control.vue

2022-03-01 22:07:01 +08:00

..

common

添加服务器信息获取能力。

2022-02-04 21:46:48 +08:00

conf

Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0

2022-03-01 17:48:21 +08:00

gb28181

Merge branch 'wvp-28181-2.0' into wvp-pro-record

2022-03-01 22:07:01 +08:00

media/zlm

Merge branch 'wvp-28181-2.0' into wvp-pro-record

2022-03-01 22:07:01 +08:00

service

Merge branch 'wvp-28181-2.0' into wvp-pro-record

2022-03-01 22:07:01 +08:00

storager

Merge branch 'wvp-28181-2.0' into wvp-pro-record

2022-03-01 22:07:01 +08:00

utils

规范数据库，解决bug

2022-02-25 20:33:02 +08:00

vmanager

Merge branch 'wvp-28181-2.0' into wvp-pro-record

2022-03-01 22:07:01 +08:00

web/gb28181

修复兼容接口查询通道列表查询

2021-12-28 09:33:25 +08:00

VManageBootstrap.java

日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式

2022-02-25 09:23:46 +08:00