648540858 5a7a7a12bd Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # src/main/resources/all-application.yml # web_src/config/index.js # web_src/src/components/dialog/devicePlayer.vue		2023-06-27 16:46:26 +08:00
..
common	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
conf	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
gb28181	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
jt1078	1、新增视频回放、视频回放控制Template	2023-04-28 14:39:50 +08:00
media/zlm	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
service	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
storager	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
utils	添加获取截图接口	2023-05-29 23:28:06 +08:00
vmanager	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
web/gb28181	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
VManageBootstrap.java	去除druid数据库连接池，使用spring支持的hikari	2023-03-29 09:44:45 +08:00