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
..
bean	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
impl	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
redisMsg	优化国标级联的端口保持	2023-06-21 14:03:31 +08:00
IDeviceAlarmService.java	添加用户操作	2021-08-05 07:25:12 +08:00
IDeviceChannelService.java	优化部分sql实现	2023-05-15 15:29:39 +08:00
IDeviceService.java	优化部分sql实现	2023-05-15 15:29:39 +08:00
IGbStreamService.java	国标级联->选择通道支持移除目前下所有以及全部添加到目录下	2022-11-22 12:55:29 +08:00
IInviteStreamService.java	优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895	2023-06-22 22:35:35 +08:00
ILogService.java	添加日志存储与查询功能	2021-08-07 14:05:42 +08:00
IMediaServerService.java	合并主线	2023-05-25 17:28:57 +08:00
IMediaService.java	Merge branch 'wvp-28181-2.0'	2022-11-18 18:39:44 +08:00
IPlatformChannelService.java	国标级联->选择通道支持移除目前下所有以及全部添加到目录下	2022-11-22 12:55:29 +08:00
IPlatformService.java	合并开源主线	2023-04-04 09:09:07 +08:00
IPlayService.java	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
IRoleService.java	添加角色相关的接口，用户信息添加角色信息	2021-08-10 15:42:15 +08:00
IStreamProxyService.java	Merge branch '2.6.8' into wvp-28181-2.0	2023-06-07 20:21:10 +08:00
IStreamPushService.java	优化部分sql实现	2023-05-15 15:29:39 +08:00
IUserService.java	1.修复新增用户没有pushkey的问题	2022-07-19 18:13:19 +08:00