From 381b3d15caa30e99c75f58a366b3b75cbbf01450 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 07 十二月 2021 11:40:17 +0800
Subject: [PATCH] 修复未结束的推流无法下载
---
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 212 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
index 3c4ea17..a6facd5 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -1,12 +1,16 @@
package com.genersoft.iot.vmp.conf;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
+import org.apache.catalina.connector.ClientAbortException;
+import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
-import org.apache.catalina.connector.ClientAbortException;
import org.mitre.dsmiley.httpproxy.ProxyServlet;
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.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -14,9 +18,13 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.ConnectException;
+/**
+ * @author lin
+ */
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Configuration
public class ProxyServletConfig {
@@ -24,13 +32,16 @@
private final static Logger logger = LoggerFactory.getLogger(ProxyServletConfig.class);
@Autowired
- private MediaConfig mediaConfig;
+ private IMediaServerService mediaServerService;
+
+ @Value("${server.port}")
+ private int serverPort;
@Bean
public ServletRegistrationBean zlmServletRegistrationBean(){
- ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new ZLMProxySerlet(),"/zlm/*");
+ ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new ZlmProxyServlet(),"/zlm/*");
servletRegistrationBean.setName("zlm_Proxy");
- servletRegistrationBean.addInitParameter("targetUri", String.format("http://%s:%s", mediaConfig.getIp(), mediaConfig.getHttpPort()));
+ servletRegistrationBean.addInitParameter("targetUri", "http://127.0.0.1:6080");
servletRegistrationBean.addUrlMappings();
if (logger.isDebugEnabled()) {
servletRegistrationBean.addInitParameter("log", "true");
@@ -38,24 +49,26 @@
return servletRegistrationBean;
}
- class ZLMProxySerlet extends ProxyServlet{
-
-
-
+ class ZlmProxyServlet extends ProxyServlet{
@Override
protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) {
String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString);
- if (!StringUtils.isEmpty(queryStr)) {
- queryStr += "&secret=" + mediaConfig.getSecret();
- }else {
- queryStr = "secret=" + mediaConfig.getSecret();
+ MediaServerItem mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI());
+ if (mediaInfo != null) {
+ if (!StringUtils.isEmpty(queryStr)) {
+ queryStr += "&secret=" + mediaInfo.getSecret();
+ }else {
+ queryStr = "secret=" + mediaInfo.getSecret();
+ }
}
return queryStr;
}
+ /**
+ * 寮傚父澶勭悊
+ */
@Override
protected void handleRequestException(HttpRequest proxyRequest, HttpResponse proxyResonse, Exception e){
- //System.out.println(e.getMessage());
try {
super.handleRequestException(proxyRequest, proxyResonse, e);
} catch (ServletException servletException) {
@@ -64,7 +77,7 @@
if (ioException instanceof ConnectException) {
logger.error("zlm 杩炴帴澶辫触");
} else if (ioException instanceof ClientAbortException) {
- logger.error("鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
+ logger.error("zlm: 鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
} else {
logger.error("zlm 浠ｇ悊澶辫触锛� ", e);
}
@@ -72,6 +85,191 @@
logger.error("zlm 浠ｇ悊澶辫触锛� ", e);
}
}
+
+ /**
+ * 瀵逛簬涓烘寜鐓ф牸寮忚姹傜殑鍙互鐩存帴杩斿洖404
+ */
+ @Override
+ protected String getTargetUri(HttpServletRequest servletRequest) {
+ String requestURI = servletRequest.getRequestURI();
+ MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+
+ String uri = null;
+ if (mediaInfo != null) {
+// String realRequestURI = requestURI.substring(requestURI.indexOf(mediaInfo.getId())+ mediaInfo.getId().length());
+ uri = String.format("http://%s:%s", mediaInfo.getIp(), mediaInfo.getHttpPort());
+ }else {
+ uri = "http://127.0.0.1:" + serverPort +"/index/hook/null"; // 鍙槸涓�涓兘杩斿洖404鐨勮姹傝�屽凡锛� 鍏朵粬鐨勪篃鍙互
+ }
+ return uri;
+ }
+
+ /**
+ * 鍔ㄦ�佹浛鎹㈣姹傜洰鏍�
+ */
+ @Override
+ protected HttpHost getTargetHost(HttpServletRequest servletRequest) {
+ String requestURI = servletRequest.getRequestURI();
+ MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ HttpHost host;
+ if (mediaInfo != null) {
+ host = new HttpHost(mediaInfo.getIp(), mediaInfo.getHttpPort());
+ }else {
+ host = new HttpHost("127.0.0.1", serverPort);
+ }
+ return host;
+
+ }
+
+ /**
+ * 鏍规嵁uri鑾峰彇娴佸獟浣撲俊鎭�
+ */
+ MediaServerItem getMediaInfoByUri(String uri){
+ String[] split = uri.split("/");
+ String mediaServerId = split[2];
+ if ("default".equals(mediaServerId)) {
+ return mediaServerService.getDefaultMediaServer();
+ }else {
+ return mediaServerService.getOne(mediaServerId);
+ }
+ }
+
+ /**
+ * 鍘绘帀url涓殑鏍囧織淇℃伅
+ */
+ @Override
+ protected String rewriteUrlFromRequest(HttpServletRequest servletRequest) {
+ String requestURI = servletRequest.getRequestURI();
+ MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ String url = super.rewriteUrlFromRequest(servletRequest);
+ if (mediaInfo == null) {
+ logger.error("[ZLM鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
+ return url;
+ }
+ if (!StringUtils.isEmpty(mediaInfo.getId())) {
+ url = url.replace(mediaInfo.getId() + "/", "");
+ }
+ return url.replace("default/", "");
+ }
+ }
+
+ @Bean
+ public ServletRegistrationBean recordServletRegistrationBean(){
+ ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new RecordProxyServlet(),"/record_proxy/*");
+ servletRegistrationBean.setName("record_proxy");
+ servletRegistrationBean.addInitParameter("targetUri", "http://127.0.0.1:18081");
+ servletRegistrationBean.addUrlMappings();
+ if (logger.isDebugEnabled()) {
+ servletRegistrationBean.addInitParameter("log", "true");
+ }
+ return servletRegistrationBean;
+ }
+
+ class RecordProxyServlet extends ProxyServlet{
+
+ @Override
+ 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 (!StringUtils.isEmpty(queryStr)) {
+ queryStr += "&remoteHost=" + remoteHost;
+ }else {
+ queryStr = "remoteHost=" + remoteHost;
+ }
+ }
+ return queryStr;
+ }
+
+ /**
+ * 寮傚父澶勭悊
+ */
+ @Override
+ protected void handleRequestException(HttpRequest proxyRequest, HttpResponse proxyResponse, Exception e){
+ try {
+ super.handleRequestException(proxyRequest, proxyResponse, e);
+ } catch (ServletException servletException) {
+ logger.error("褰曞儚鏈嶅姟 浠ｇ悊澶辫触锛� ", e);
+ } catch (IOException ioException) {
+ if (ioException instanceof ConnectException) {
+ logger.error("褰曞儚鏈嶅姟 杩炴帴澶辫触");
+ } else if (ioException instanceof ClientAbortException) {
+ logger.error("褰曞儚鏈嶅姟:鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
+ } else {
+ logger.error("褰曞儚鏈嶅姟 浠ｇ悊澶辫触锛� ", e);
+ }
+ } catch (RuntimeException exception){
+ logger.error("褰曞儚鏈嶅姟 浠ｇ悊澶辫触锛� ", e);
+ }
+ }
+
+ /**
+ * 瀵逛簬涓烘寜鐓ф牸寮忚姹傜殑鍙互鐩存帴杩斿洖404
+ */
+ @Override
+ protected String getTargetUri(HttpServletRequest servletRequest) {
+ String requestURI = servletRequest.getRequestURI();
+ MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+
+ String uri = null;
+ if (mediaInfo != null) {
+// String realRequestURI = requestURI.substring(requestURI.indexOf(mediaInfo.getId())+ mediaInfo.getId().length());
+ uri = String.format("http://%s:%s", mediaInfo.getIp(), mediaInfo.getRecordAssistPort());
+ }else {
+ uri = "http://127.0.0.1:" + serverPort +"/index/hook/null"; // 鍙槸涓�涓兘杩斿洖404鐨勮姹傝�屽凡锛� 鍏朵粬鐨勪篃鍙互
+ }
+ return uri;
+ }
+
+ /**
+ * 鍔ㄦ�佹浛鎹㈣姹傜洰鏍�
+ */
+ @Override
+ protected HttpHost getTargetHost(HttpServletRequest servletRequest) {
+ String requestURI = servletRequest.getRequestURI();
+ MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ HttpHost host;
+ if (mediaInfo != null) {
+ host = new HttpHost(mediaInfo.getIp(), mediaInfo.getRecordAssistPort());
+ }else {
+ host = new HttpHost("127.0.0.1", serverPort);
+ }
+ return host;
+
+ }
+
+ /**
+ * 鏍规嵁uri鑾峰彇娴佸獟浣撲俊鎭�
+ */
+ MediaServerItem getMediaInfoByUri(String uri){
+ String[] split = uri.split("/");
+ String mediaServerId = split[2];
+ if ("default".equals(mediaServerId)) {
+ return mediaServerService.getDefaultMediaServer();
+ }else {
+ return mediaServerService.getOne(mediaServerId);
+ }
+
+ }
+
+ /**
+ * 鍘绘帀url涓殑鏍囧織淇℃伅
+ */
+ @Override
+ protected String rewriteUrlFromRequest(HttpServletRequest servletRequest) {
+ String requestURI = servletRequest.getRequestURI();
+ MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ String url = super.rewriteUrlFromRequest(servletRequest);
+ if (mediaInfo == null) {
+ logger.error("[褰曞儚鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
+ return url;
+ }
+ if (!StringUtils.isEmpty(mediaInfo.getId())) {
+ url = url.replace(mediaInfo.getId() + "/", "");
+ }
+ return url.replace("default/", "");
+ }
}
}
--
Gitblit v1.8.0