648540858 14174ff400 Merge branch 'wvp-28181-2.0' into wvp-pro-record ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java		2022-03-03 16:28:32 +08:00
..
common	国标录像支持多端同时播放	2022-03-03 15:57:28 +08:00
conf	优化国标级联的目录订阅	2022-03-02 11:48:20 +08:00
gb28181	Merge branch 'wvp-28181-2.0' into wvp-pro-record	2022-03-03 16:28:32 +08:00
media/zlm	Merge branch 'wvp-28181-2.0' into wvp-pro-record	2022-03-03 16:28:32 +08:00
service	Merge branch 'wvp-28181-2.0' into wvp-pro-record	2022-03-03 16:28:32 +08:00
storager	Merge branch 'wvp-28181-2.0' into wvp-pro-record	2022-03-03 16:28:32 +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-03 16:28:32 +08:00
web/gb28181	国标录像支持多端同时播放	2022-03-03 15:57:28 +08:00
VManageBootstrap.java	日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式	2022-02-25 09:23:46 +08:00