Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

清理过期的推流鉴权信息

pull/673/head
648540858 2022-11-17 18:21:45 +08:00
parent 6b8ecd1f9d
commit 5f7c53823a
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
View File

@ -221,6 +221,12 @@ public class StreamPushServiceImpl implements IStreamPushService {
streamInfoPushItemMap.put(onStreamChangedHookParam.getApp() + onStreamChangedHookParam.getStream(), onStreamChangedHookParam); streamInfoPushItemMap.put(onStreamChangedHookParam.getApp() + onStreamChangedHookParam.getStream(), onStreamChangedHookParam);
} }
} }
// 获取所有推流鉴权信息，清理过期的
List<StreamAuthorityInfo> allStreamAuthorityInfo = redisCatchStorage.getAllStreamAuthorityInfo();
Map<String, StreamAuthorityInfo> streamAuthorityInfoInfoMap = new HashMap<>();
for (StreamAuthorityInfo streamAuthorityInfo : allStreamAuthorityInfo) {
streamAuthorityInfoInfoMap.put(streamAuthorityInfo.getApp() + streamAuthorityInfo.getStream(), streamAuthorityInfo);
}
zlmresTfulUtils.getMediaList(mediaServerItem, (mediaList ->{ zlmresTfulUtils.getMediaList(mediaServerItem, (mediaList ->{
if (mediaList == null) { if (mediaList == null) {
return; return;
@ -239,6 +245,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
for (StreamPushItem streamPushItem : streamPushItems) { for (StreamPushItem streamPushItem : streamPushItems) {
pushItemMap.remove(streamPushItem.getApp() + streamPushItem.getStream()); pushItemMap.remove(streamPushItem.getApp() + streamPushItem.getStream());
streamInfoPushItemMap.remove(streamPushItem.getApp() + streamPushItem.getStream()); streamInfoPushItemMap.remove(streamPushItem.getApp() + streamPushItem.getStream());
streamAuthorityInfoInfoMap.remove(streamPushItem.getApp() + streamPushItem.getStream());
} }
} }
List<StreamPushItem> offlinePushItems = new ArrayList<>(pushItemMap.values()); List<StreamPushItem> offlinePushItems = new ArrayList<>(pushItemMap.values());
@ -274,6 +281,14 @@ public class StreamPushServiceImpl implements IStreamPushService {
redisCatchStorage.removeStream(mediaServerItem.getId(), "PUSH", offlineOnStreamChangedHookParam.getApp(), offlineOnStreamChangedHookParam.getStream()); redisCatchStorage.removeStream(mediaServerItem.getId(), "PUSH", offlineOnStreamChangedHookParam.getApp(), offlineOnStreamChangedHookParam.getStream());
} }
} }
Collection<StreamAuthorityInfo> streamAuthorityInfos = streamAuthorityInfoInfoMap.values();
if (streamAuthorityInfos.size() > 0) {
for (StreamAuthorityInfo streamAuthorityInfo : streamAuthorityInfos) {
// 移除redis内流的信息
redisCatchStorage.removeStreamAuthorityInfo(streamAuthorityInfo.getApp(), streamAuthorityInfo.getStream());
}
}
})); }));
} }

2
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
View File

@ -233,6 +233,8 @@ public interface IRedisCatchStorage {
*/ */
StreamAuthorityInfo getStreamAuthorityInfo(String app, String stream); StreamAuthorityInfo getStreamAuthorityInfo(String app, String stream);
List<StreamAuthorityInfo> getAllStreamAuthorityInfo();
/** /**
* 发送redis消息 查询所有推流设备的状态 * 发送redis消息 查询所有推流设备的状态
*/ */

12
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
View File

@ -714,6 +714,18 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
} }
@Override
public List<StreamAuthorityInfo> getAllStreamAuthorityInfo() {
String scanKey = VideoManagerConstants.MEDIA_STREAM_AUTHORITY + userSetting.getServerId() + "_*_*" ;
List<StreamAuthorityInfo> result = new ArrayList<>();
List<Object> keys = RedisUtil.scan(scanKey);
for (Object o : keys) {
String key = (String) o;
result.add((StreamAuthorityInfo) RedisUtil.get(key));
}
return result;
}
@Override @Override
public OnStreamChangedHookParam getStreamInfo(String app, String streamId, String mediaServerId) { public OnStreamChangedHookParam getStreamInfo(String app, String streamId, String mediaServerId) {