修复通道刷新

648540858

2023-06-20 21a96ad20fd75e55d03c00af8df8adb039f0c77a

 src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java

@@ -5,6 +5,7 @@
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.springframework.core.annotation.Order;
import org.mitre.dsmiley.httpproxy.ProxyServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -25,6 +26,7 @@
 */
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Configuration
@Order(1)
public class ProxyServletConfig {

    private final static Logger logger = LoggerFactory.getLogger(ProxyServletConfig.class);
@@ -167,13 +169,14 @@
        protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) {
            String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString);
            MediaServerItem mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI());
            String remoteHost = String.format("http://%s:%s", mediaInfo.getIp(), mediaInfo.getHttpPort());
            if (mediaInfo != null) {
                if (!ObjectUtils.isEmpty(queryStr)) {
                    queryStr += "&remoteHost=" + remoteHost;
                }else {
                    queryStr = "remoteHost=" + remoteHost;
                }
            if (mediaInfo == null) {
                return null;
            }
            String remoteHost = String.format("http://%s:%s", mediaInfo.getStreamIp(), mediaInfo.getRecordAssistPort());
            if (!ObjectUtils.isEmpty(queryStr)) {
                queryStr += "&remoteHost=" + remoteHost;
            }else {
                queryStr = "remoteHost=" + remoteHost;
            }
            return queryStr;
        }
@@ -190,6 +193,12 @@
            } catch (IOException ioException) {
                if (ioException instanceof ConnectException) {
                    logger.error("录像服务 连接失败");
//                }else if (ioException instanceof ClientAbortException) {
//                    /**
//                     * TODO 使用这个代理库实现代理在遇到代理视频文件时，如果是206结果，会遇到报错蛋市目前功能正常，
//                     * TODO 暂时去除异常处理。后续使用其他代理框架修改测试
//                     */

                }else {
                    logger.error("录像服务 代理失败： ", e);
                }