From cf8a22f50b81fa30abaa518bdce660cd65deabea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 15 一月 2021 15:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 4a4f1f0..282699f 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,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import okhttp3.*;
import org.slf4j.Logger;
@@ -29,6 +30,9 @@
@Autowired
private IVideoManagerStorager storager;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
@Value("${media.ip}")
private String mediaIp;
@@ -69,7 +73,7 @@
logger.info("zlm鎺ュ叆鎴愬姛...");
if (autoConfig) saveZLMConfig();
mediaServerConfig = getMediaServerConfig();
- storager.updateMediaInfo(mediaServerConfig);
+ redisCatchStorage.updateMediaInfo(mediaServerConfig);
}
}
@@ -99,9 +103,6 @@
logger.info("璁剧疆zlm...");
if (StringUtils.isEmpty(mediaHookIp)) {
mediaHookIp = sipIP;
- }
- if (mediaIp.equals(mediaHookIp)) {
- mediaHookIp = "127.0.0.1";
}
String hookPrex = String.format("http://%s:%s/index/hook", mediaHookIp, serverPort);
--
Gitblit v1.8.0