From 2a1f979651340fbf9b530ab2d2f9e5857cbeeb1a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 十二月 2021 17:37:29 +0800
Subject: [PATCH] 简化zlm节点接入逻辑
---
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 dd99d02..93b975e 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -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;
@@ -126,7 +127,11 @@
MediaServerItem getMediaInfoByUri(String uri){
String[] split = uri.split("/");
String mediaServerId = split[2];
- return mediaServerService.getOne(mediaServerId);
+ if ("default".equals(mediaServerId)) {
+ return mediaServerService.getDefaultMediaServer();
+ }else {
+ return mediaServerService.getOne(mediaServerId);
+ }
}
/**
@@ -140,13 +145,13 @@
if (mediaInfo == null) {
return url;
}
- return url.replace(mediaInfo.getId() + "/", "");
+ return url.replace(mediaInfo.getId() + "/", "").replace("default/", "");
}
}
@Bean
public ServletRegistrationBean recordServletRegistrationBean(){
- ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new RecordProxySerlet(),"/record_proxy/*");
+ ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new RecordProxyServlet(),"/record_proxy/*");
servletRegistrationBean.setName("record_proxy");
servletRegistrationBean.addInitParameter("targetUri", "http://127.0.0.1:18081");
servletRegistrationBean.addUrlMappings();
@@ -156,8 +161,22 @@
return servletRegistrationBean;
}
- class RecordProxySerlet extends ProxyServlet{
+ 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;
+ }
/**
* 寮傚父澶勭悊
@@ -222,7 +241,12 @@
MediaServerItem getMediaInfoByUri(String uri){
String[] split = uri.split("/");
String mediaServerId = split[2];
- return mediaServerService.getOne(mediaServerId);
+ if ("default".equals(mediaServerId)) {
+ return mediaServerService.getDefaultMediaServer();
+ }else {
+ return mediaServerService.getOne(mediaServerId);
+ }
+
}
/**
@@ -236,7 +260,7 @@
if (mediaInfo == null) {
return url;
}
- return url.replace(mediaInfo.getId() + "/", "");
+ return url.replace(mediaInfo.getId() + "/", "").replace("default/", "");
}
}
--
Gitblit v1.8.0