Lawrence
2020-12-17 ed1fe4b9388cfa9c1cf691f840afceddce8c7bfd
与主线同步,修复zlm在docker时代理错误
1个文件已修改
11 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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()
        );
        // 发送请求