From 193e1a24a19b6bd97330a9a5cd3ea172d85d20ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 23 三月 2023 20:52:05 +0800
Subject: [PATCH] 优化对assist接口的代理
---
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 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 93b975e..d398f12 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.junit.jupiter.api.Order;
import org.mitre.dsmiley.httpproxy.ProxyServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,11 +14,10 @@
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;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.ConnectException;
@@ -27,6 +26,7 @@
*/
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Configuration
+@Order(1)
public class ProxyServletConfig {
private final static Logger logger = LoggerFactory.getLogger(ProxyServletConfig.class);
@@ -55,7 +55,7 @@
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();
@@ -76,9 +76,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 +125,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);
@@ -143,9 +141,13 @@
MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
String url = super.rewriteUrlFromRequest(servletRequest);
if (mediaInfo == null) {
+ logger.error("[ZLM鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
return url;
}
- return url.replace(mediaInfo.getId() + "/", "").replace("default/", "");
+ if (!ObjectUtils.isEmpty(mediaInfo.getId())) {
+ url = url.replace(mediaInfo.getId() + "/", "");
+ }
+ return url.replace("default/", "");
}
}
@@ -167,13 +169,11 @@
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;
- }
+ String remoteHost = String.format("http://%s:%s", mediaInfo.getStreamIp(), mediaInfo.getHttpPort());
+ if (!ObjectUtils.isEmpty(queryStr)) {
+ queryStr += "&remoteHost=" + remoteHost;
+ }else {
+ queryStr = "remoteHost=" + remoteHost;
}
return queryStr;
}
@@ -190,9 +190,7 @@
} catch (IOException ioException) {
if (ioException instanceof ConnectException) {
logger.error("褰曞儚鏈嶅姟 杩炴帴澶辫触");
- } else if (ioException instanceof ClientAbortException) {
- logger.error("褰曞儚鏈嶅姟:鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
- } else {
+ }else {
logger.error("褰曞儚鏈嶅姟 浠ｇ悊澶辫触锛� ", e);
}
} catch (RuntimeException exception){
@@ -241,7 +239,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);
@@ -258,9 +256,13 @@
MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
String url = super.rewriteUrlFromRequest(servletRequest);
if (mediaInfo == null) {
+ logger.error("[褰曞儚鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
return url;
}
- return url.replace(mediaInfo.getId() + "/", "").replace("default/", "");
+ if (!ObjectUtils.isEmpty(mediaInfo.getId())) {
+ url = url.replace(mediaInfo.getId() + "/", "");
+ }
+ return url.replace("default/", "");
}
}
--
Gitblit v1.8.0