From 07a8ef9e256c70a3a5b15782add81dcad1e2ffc2 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 14 六月 2024 00:03:57 +0800
Subject: [PATCH] SIP只有一个监听时，直接返回
---
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 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 d398f12..3948fdb 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -1,11 +1,11 @@
package com.genersoft.iot.vmp.conf;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
+import com.genersoft.iot.vmp.media.service.IMediaServerService;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
-import org.junit.jupiter.api.Order;
+import org.springframework.core.annotation.Order;
import org.mitre.dsmiley.httpproxy.ProxyServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -18,6 +18,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.ConnectException;
@@ -53,7 +54,7 @@
@Override
protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) {
String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString);
- MediaServerItem mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI());
+ MediaServer mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI());
if (mediaInfo != null) {
if (!ObjectUtils.isEmpty(queryStr)) {
queryStr += "&secret=" + mediaInfo.getSecret();
@@ -62,6 +63,18 @@
}
}
return queryStr;
+ }
+
+
+ @Override
+ protected HttpResponse doExecute(HttpServletRequest servletRequest, HttpServletResponse servletResponse,
+ HttpRequest proxyRequest) throws IOException {
+ HttpResponse response = super.doExecute(servletRequest, servletResponse, proxyRequest);
+ response.removeHeaders("Access-Control-Allow-Origin");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ response.removeHeaders("Access-Control-Allow-Credentials");
+
+ return response;
}
/**
@@ -90,7 +103,7 @@
@Override
protected String getTargetUri(HttpServletRequest servletRequest) {
String requestURI = servletRequest.getRequestURI();
- MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ MediaServer mediaInfo = getMediaInfoByUri(requestURI);
String uri = null;
if (mediaInfo != null) {
@@ -108,7 +121,7 @@
@Override
protected HttpHost getTargetHost(HttpServletRequest servletRequest) {
String requestURI = servletRequest.getRequestURI();
- MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ MediaServer mediaInfo = getMediaInfoByUri(requestURI);
HttpHost host;
if (mediaInfo != null) {
host = new HttpHost(mediaInfo.getIp(), mediaInfo.getHttpPort());
@@ -122,7 +135,7 @@
/**
* 鏍规嵁uri鑾峰彇娴佸獟浣撲俊鎭�
*/
- MediaServerItem getMediaInfoByUri(String uri){
+ MediaServer getMediaInfoByUri(String uri){
String[] split = uri.split("/");
String mediaServerId = split[2];
if ("default".equalsIgnoreCase(mediaServerId)) {
@@ -138,7 +151,7 @@
@Override
protected String rewriteUrlFromRequest(HttpServletRequest servletRequest) {
String requestURI = servletRequest.getRequestURI();
- MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ MediaServer mediaInfo = getMediaInfoByUri(requestURI);
String url = super.rewriteUrlFromRequest(servletRequest);
if (mediaInfo == null) {
logger.error("[ZLM鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
@@ -168,14 +181,29 @@
@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.getStreamIp(), mediaInfo.getHttpPort());
+ MediaServer mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI());
+ 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;
+ }
+
+
+ @Override
+ protected HttpResponse doExecute(HttpServletRequest servletRequest, HttpServletResponse servletResponse,
+ HttpRequest proxyRequest) throws IOException {
+ HttpResponse response = super.doExecute(servletRequest, servletResponse, proxyRequest);
+ String origin = servletRequest.getHeader("origin");
+ response.setHeader("Access-Control-Allow-Origin",origin);
+ response.setHeader("Access-Control-Allow-Credentials","true");
+
+ return response;
}
/**
@@ -190,6 +218,12 @@
} catch (IOException ioException) {
if (ioException instanceof ConnectException) {
logger.error("褰曞儚鏈嶅姟 杩炴帴澶辫触");
+// }else if (ioException instanceof ClientAbortException) {
+// /**
+// * TODO 浣跨敤杩欎釜浠ｇ悊搴撳疄鐜颁唬鐞嗗湪閬囧埌浠ｇ悊瑙嗛鏂囦欢鏃讹紝濡傛灉鏄�206缁撴灉锛屼細閬囧埌鎶ラ敊铔嬪競鐩墠鍔熻兘姝ｅ父锛�
+// * TODO 鏆傛椂鍘婚櫎寮傚父澶勭悊銆傚悗缁娇鐢ㄥ叾浠栦唬鐞嗘鏋朵慨鏀规祴璇�
+// */
+
}else {
logger.error("褰曞儚鏈嶅姟 浠ｇ悊澶辫触锛� ", e);
}
@@ -204,7 +238,7 @@
@Override
protected String getTargetUri(HttpServletRequest servletRequest) {
String requestURI = servletRequest.getRequestURI();
- MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ MediaServer mediaInfo = getMediaInfoByUri(requestURI);
String uri = null;
if (mediaInfo != null) {
@@ -222,7 +256,7 @@
@Override
protected HttpHost getTargetHost(HttpServletRequest servletRequest) {
String requestURI = servletRequest.getRequestURI();
- MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ MediaServer mediaInfo = getMediaInfoByUri(requestURI);
HttpHost host;
if (mediaInfo != null) {
host = new HttpHost(mediaInfo.getIp(), mediaInfo.getRecordAssistPort());
@@ -236,7 +270,7 @@
/**
* 鏍规嵁uri鑾峰彇娴佸獟浣撲俊鎭�
*/
- MediaServerItem getMediaInfoByUri(String uri){
+ MediaServer getMediaInfoByUri(String uri){
String[] split = uri.split("/");
String mediaServerId = split[2];
if ("default".equalsIgnoreCase(mediaServerId)) {
@@ -253,7 +287,7 @@
@Override
protected String rewriteUrlFromRequest(HttpServletRequest servletRequest) {
String requestURI = servletRequest.getRequestURI();
- MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ MediaServer mediaInfo = getMediaInfoByUri(requestURI);
String url = super.rewriteUrlFromRequest(servletRequest);
if (mediaInfo == null) {
logger.error("[褰曞儚鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
--
Gitblit v1.8.0