From c5a05c15df6c01602f259a49ff470fa996579b0b Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期五, 26 三月 2021 19:58:46 +0800
Subject: [PATCH] 启动时清除先前注册上级平台的缓存
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index e7cfdb2..e65fae0 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -4,8 +4,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.conf.MediaServerConfig;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import okhttp3.*;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+//import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +15,6 @@
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
@@ -27,14 +24,20 @@
private final static Logger logger = LoggerFactory.getLogger(ZLMRunner.class);
+ // @Autowired
+ // private IVideoManagerStorager storager;
+
@Autowired
- private IVideoManagerStorager storager;
+ private IRedisCatchStorage redisCatchStorage;
@Value("${media.ip}")
private String mediaIp;
@Value("${media.wanIp}")
private String mediaWanIp;
+
+ @Value("${media.hookIp}")
+ private String mediaHookIp;
@Value("${media.port}")
private int mediaPort;
@@ -51,8 +54,14 @@
@Value("${server.port}")
private String serverPort;
+ @Value("${media.autoConfig}")
+ private boolean autoConfig;
+
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
+ private ZLMMediaListManager zlmMediaListManager;
@Override
public void run(String... strings) throws Exception {
@@ -61,15 +70,13 @@
MediaServerConfig mediaServerConfig = getMediaServerConfig();
if (mediaServerConfig != null) {
logger.info("zlm鎺ュ叆鎴愬姛...");
- logger.info("璁剧疆zlm...");
- saveZLMConfig();
+ if (autoConfig) saveZLMConfig();
mediaServerConfig = getMediaServerConfig();
- storager.updateMediaInfo(mediaServerConfig);
-
+ redisCatchStorage.updateMediaInfo(mediaServerConfig);
+ // 鏇存柊娴佸垪琛�
+ zlmMediaListManager.updateMediaList();
}
}
-
-
public MediaServerConfig getMediaServerConfig() {
JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig();
@@ -94,12 +101,12 @@
}
private void saveZLMConfig() {
- String hookIP = sipIP;
- if (mediaIp.equals(sipIP)) {
- hookIP = "127.0.0.1";
+ logger.info("璁剧疆zlm...");
+ if (StringUtils.isEmpty(mediaHookIp)) {
+ mediaHookIp = sipIP;
}
- String hookPrex = String.format("http://%s:%s/index/hook", hookIP, serverPort);
+ String hookPrex = String.format("http://%s:%s/index/hook", mediaHookIp, serverPort);
Map<String, Object> param = new HashMap<>();
param.put("api.secret",mediaSecret); // -profile:v Baseline
param.put("ffmpeg.cmd","%s -fflags nobuffer -rtsp_transport tcp -i %s -c:a aac -strict -2 -ar 44100 -ab 48k -c:v libx264 -f flv %s");
@@ -128,4 +135,5 @@
logger.info("璁剧疆zlm澶辫触: " + responseJSON.getString("msg"));
}
}
+
}
--
Gitblit v1.8.0