XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化拉流代理

Browse Source
This commit is contained in:
panlinlin
2021-04-22 10:56:13 +08:00
parent 6289438e62
commit 118e42884e
8 changed files with 114 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
View File

@@ -43,7 +43,9 @@ public class ZLMRESTfulUtils {
builder.add("secret",mediaSecret);
if (param != null && param.keySet().size() > 0) {
for (String key : param.keySet()){
builder.add(key, param.get(key).toString());
if (param.get(key) != null) {
builder.add(key, param.get(key).toString());
}
}
}

7
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
View File

@@ -170,7 +170,12 @@ public class ZLMRunner implements CommandLineRunner {
List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnable(true);
for (StreamProxyItem streamProxyDto : streamProxyListForEnable) {
logger.info("恢复流代理，" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
streamProxyService.addStreamProxyToZlm(streamProxyDto);
JSONObject jsonObject = streamProxyService.addStreamProxyToZlm(streamProxyDto);
if (jsonObject == null) {
// 设置为未启用
logger.info("恢复流代理失败，请检查流地址后重新启用" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
streamProxyService.stop(streamProxyDto.getApp(), streamProxyDto.getStream());
}
}
}
}