From ed1fe4b9388cfa9c1cf691f840afceddce8c7bfd Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期四, 17 十二月 2020 15:42:29 +0800
Subject: [PATCH] 与主线同步，修复zlm在docker时代理错误
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 4b2cabd..f76cdd9 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
@@ -1,10 +1,12 @@
package com.genersoft.iot.vmp.media.zlm;
import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.conf.MediaServerConfig;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
import org.springframework.http.HttpStatus;
@@ -27,6 +29,8 @@
@Autowired
private IVideoManagerStorager storager;
+ @Value("${media.port}")
+ private int mediaHttpPort;
@ResponseBody
@RequestMapping(value = "/**/**/**", produces = "application/json;charset=UTF-8")
@@ -35,11 +39,12 @@
if (storager.getMediaInfo() == null) {
return "鏈帴鍏ユ祦濯掍綋";
}
+ MediaServerConfig mediaInfo = storager.getMediaInfo();
String requestURI = String.format("http://%s:%s%s?%s&%s",
- storager.getMediaInfo().getLocalIP(),
- storager.getMediaInfo().getHttpPort(),
+ mediaInfo.getLocalIP(),
+ mediaHttpPort,
request.getRequestURI().replace("/zlm",""),
- storager.getMediaInfo().getHookAdminParams(),
+ mediaInfo.getHookAdminParams(),
request.getQueryString()
);
// 鍙戦�佽姹�
--
Gitblit v1.8.0