From e932a9b824b93a4a0365e11f1e02775b10c0b045 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 01 三月 2024 10:55:49 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 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 a6facd5..a7416a8 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -2,10 +2,10 @@
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.springframework.core.annotation.Order;
import org.mitre.dsmiley.httpproxy.ProxyServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -27,6 +27,7 @@
*/
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Configuration
+@Order(1)
public class ProxyServletConfig {
private final static Logger logger = LoggerFactory.getLogger(ProxyServletConfig.class);
@@ -55,13 +56,25 @@
String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString);
MediaServerItem mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI());
if (mediaInfo != null) {
- if (!StringUtils.isEmpty(queryStr)) {
+ if (!ObjectUtils.isEmpty(queryStr)) {
queryStr += "&secret=" + mediaInfo.getSecret();
}else {
queryStr = "secret=" + mediaInfo.getSecret();
}
}
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;
}
/**
@@ -76,9 +89,7 @@
} catch (IOException ioException) {
if (ioException instanceof ConnectException) {
logger.error("zlm 杩炴帴澶辫触");
- } else if (ioException instanceof ClientAbortException) {
- logger.error("zlm: 鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
- } else {
+ } else {
logger.error("zlm 浠ｇ悊澶辫触锛� ", e);
}
} catch (RuntimeException exception){
@@ -127,7 +138,7 @@
MediaServerItem getMediaInfoByUri(String uri){
String[] split = uri.split("/");
String mediaServerId = split[2];
- if ("default".equals(mediaServerId)) {
+ if ("default".equalsIgnoreCase(mediaServerId)) {
return mediaServerService.getDefaultMediaServer();
}else {
return mediaServerService.getOne(mediaServerId);
@@ -146,7 +157,7 @@
logger.error("[ZLM鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
return url;
}
- if (!StringUtils.isEmpty(mediaInfo.getId())) {
+ if (!ObjectUtils.isEmpty(mediaInfo.getId())) {
url = url.replace(mediaInfo.getId() + "/", "");
}
return url.replace("default/", "");
@@ -171,15 +182,28 @@
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;
- }
+ 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;
}
/**
@@ -194,9 +218,13 @@
} catch (IOException ioException) {
if (ioException instanceof ConnectException) {
logger.error("褰曞儚鏈嶅姟 杩炴帴澶辫触");
- } else if (ioException instanceof ClientAbortException) {
- logger.error("褰曞儚鏈嶅姟:鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
- } else {
+// }else if (ioException instanceof ClientAbortException) {
+// /**
+// * TODO 浣跨敤杩欎釜浠ｇ悊搴撳疄鐜颁唬鐞嗗湪閬囧埌浠ｇ悊瑙嗛鏂囦欢鏃讹紝濡傛灉鏄�206缁撴灉锛屼細閬囧埌鎶ラ敊铔嬪競鐩墠鍔熻兘姝ｅ父锛�
+// * TODO 鏆傛椂鍘婚櫎寮傚父澶勭悊銆傚悗缁娇鐢ㄥ叾浠栦唬鐞嗘鏋朵慨鏀规祴璇�
+// */
+
+ }else {
logger.error("褰曞儚鏈嶅姟 浠ｇ悊澶辫触锛� ", e);
}
} catch (RuntimeException exception){
@@ -245,7 +273,7 @@
MediaServerItem getMediaInfoByUri(String uri){
String[] split = uri.split("/");
String mediaServerId = split[2];
- if ("default".equals(mediaServerId)) {
+ if ("default".equalsIgnoreCase(mediaServerId)) {
return mediaServerService.getDefaultMediaServer();
}else {
return mediaServerService.getOne(mediaServerId);
@@ -265,7 +293,7 @@
logger.error("[褰曞儚鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
return url;
}
- if (!StringUtils.isEmpty(mediaInfo.getId())) {
+ if (!ObjectUtils.isEmpty(mediaInfo.getId())) {
url = url.replace(mediaInfo.getId() + "/", "");
}
return url.replace("default/", "");
--
Gitblit v1.8.0