From 9d19f6b9d6b361d8b93671a553973289b40d9d33 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 22 一月 2021 09:52:11 +0800
Subject: [PATCH] Merge pull request #46 from lawrencehj/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java
index f76cdd9..9daef23 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java
@@ -2,6 +2,7 @@
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,6 +30,9 @@
@Autowired
private IVideoManagerStorager storager;
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
@Value("${media.port}")
private int mediaHttpPort;
@@ -36,10 +40,10 @@
@RequestMapping(value = "/**/**/**", produces = "application/json;charset=UTF-8")
public Object proxy(HttpServletRequest request, HttpServletResponse response){
- if (storager.getMediaInfo() == null) {
+ if (redisCatchStorage.getMediaInfo() == null) {
return "鏈帴鍏ユ祦濯掍綋";
}
- MediaServerConfig mediaInfo = storager.getMediaInfo();
+ MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
String requestURI = String.format("http://%s:%s%s?%s&%s",
mediaInfo.getLocalIP(),
mediaHttpPort,
--
Gitblit v1.8.0