648540858 aa6bce35c7 Merge branch 'wvp-28181-2.0' ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java

2022-09-05 09:44:24 +08:00

..

bean

优化国标录像的异常判断

2022-08-23 11:00:46 +08:00

impl

Merge branch 'wvp-28181-2.0'

2022-09-05 09:44:24 +08:00

IDeviceAlarmService.java

添加用户操作

2021-08-05 07:25:12 +08:00

IDeviceChannelService.java

优化国标级联目录订阅通知以及目录查询回复

2022-07-17 23:17:36 +08:00

IDeviceService.java

优化国标树型展示

2022-07-03 07:40:54 +08:00

IGbStreamService.java

根据redis消息更新推流列表

2022-08-18 16:17:23 +08:00

ILogService.java

添加日志存储与查询功能

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

IMediaServerService.java

Merge branch 'wvp-28181-2.0'

2022-08-22 16:53:16 +08:00

IMediaService.java

合并主线

2022-07-12 16:54:58 +08:00

IPlatformChannelService.java

优化国标级联目录订阅通知以及目录查询回复

2022-07-17 23:17:36 +08:00

IPlatformService.java

去除对redis key过期事件的使用；重构国标级联的注册保活

2022-08-31 11:29:13 +08:00

IPlayService.java

Merge branch 'wvp-28181-2.0'

2022-09-01 14:50:28 +08:00

IRecordInfoServer.java

添加云端录像功能

2021-06-01 17:05:07 +08:00

IRoleService.java

添加角色相关的接口，用户信息添加角色信息

2021-08-10 15:42:15 +08:00

IStreamProxyService.java

支持全局异常和统一返回结果，未完待续

2022-08-22 16:17:28 +08:00

IStreamPushService.java

根据redis消息更新推流列表

2022-08-18 16:17:23 +08:00

IUserService.java

1.修复新增用户没有pushkey的问题

2022-07-19 18:13:19 +08:00