648540858 6b3732b8c4 Merge branch '2.6.8' into wvp-28181-2.0 ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
#	src/main/resources/all-application.yml
#	web_src/package-lock.json

2023-06-19 20:19:31 +08:00

..

bean

添加获取截图接口

2023-05-29 23:28:06 +08:00

impl

Merge branch '2.6.8' into wvp-28181-2.0

2023-06-19 20:19:31 +08:00

redisMsg

支持redis消息强制关闭流

2023-06-07 20:58:35 +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

修复web端管理节点负载不显示国标收流 #871

2023-05-30 10:54:09 +08:00

ILogService.java

添加日志存储与查询功能

2021-08-07 14:05:42 +08:00

IMediaServerService.java

优化国标点播下级平台，ssrc更新的时因为旧的端口释放慢导致点播失败的问题，使用新的接口直接更新ssrc

2023-05-04 15:36:04 +08:00

IMediaService.java

升级Fastjson到Fastjson2

2022-11-05 20:49:56 +08:00

IPlatformChannelService.java

国标级联->选择通道支持移除目前下所有以及全部添加到目录下

2022-11-22 12:55:29 +08:00

IPlatformService.java

优化设备注册，支持到期续订，优化国标级联到期续订。

2023-03-28 14:09:41 +08:00

IPlayService.java

添加获取截图接口

2023-05-29 23:28:06 +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