From 7c849abf29dd848ee04c61f0074ae1d84705a9cf Mon Sep 17 00:00:00 2001
From: Awen <39176130+yu1183688986@users.noreply.github.com>
Date: 星期五, 30 四月 2021 10:42:59 +0800
Subject: [PATCH] 修复集合遍历删除元素的java.util.ConcurrentModificationException 异常问题
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 14719cc..7fa0a47 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -6,7 +6,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
@@ -53,23 +53,20 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+ @Autowired
+ private ZLMServerManger zlmServerManger;
+
@Autowired
private ZLMMediaListManager zlmMediaListManager;
@Autowired
private ZLMHttpHookSubscribe subscribe;
- @Value("${media.autoApplyPlay}")
+ @Value("${userSettings.autoApplyPlay}")
private boolean autoApplyPlay;
- @Value("${media.ip}")
- private String mediaIp;
-
- @Value("${media.wanIp}")
- private String mediaWanIp;
-
- @Value("${media.port}")
- private int mediaPort;
+ @Autowired
+ private MediaConfig mediaConfig;
/**
* 娴侀噺缁熻浜嬩欢锛屾挱鏀惧櫒鎴栨帹娴佸櫒鏂紑鏃跺苟涓旇�楃敤娴侀噺瓒呰繃鐗瑰畾闃堝�兼椂浼氳Е鍙戞浜嬩欢锛岄槇鍊奸�氳繃閰嶇疆鏂囦欢general.flowThreshold閰嶇疆锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
@@ -251,10 +248,9 @@
JSONArray tracks = json.getJSONArray("tracks");
boolean regist = json.getBoolean("regist");
if (tracks != null) {
- System.out.println("on_stream_changed->>" + schema);
+ logger.info("[stream: " + streamId + "] on_stream_changed->>" + schema);
}
if ("rtmp".equals(schema)){
-
if ("rtp".equals(app) && !regist ) {
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
if (streamInfo!=null){
@@ -389,12 +385,8 @@
subscribe.response(json);
}
}
-
- MediaServerConfig mediaServerConfig = JSON.toJavaObject(json, MediaServerConfig.class);
- mediaServerConfig.setWanIp(StringUtils.isEmpty(mediaWanIp)? mediaIp: mediaWanIp);
- mediaServerConfig.setLocalIP(mediaIp);
- redisCatchStorage.updateMediaInfo(mediaServerConfig);
-
+ ZLMServerConfig ZLMServerConfig = JSON.toJavaObject(json, ZLMServerConfig.class);
+ zlmServerManger.updateServerCatch(ZLMServerConfig);
// 閲嶆柊鍙戣捣浠ｇ悊
JSONObject ret = new JSONObject();
--
Gitblit v1.8.0