From 3d6db7478d79b824f93708f936c598cc622221f2 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 20 六月 2022 15:10:31 +0800
Subject: [PATCH] fix设备状态查询接口
---
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 153 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 142 insertions(+), 11 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 c543e6e..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,6 +1,6 @@
package com.genersoft.iot.vmp.conf;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
+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;
@@ -18,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 {
@@ -35,7 +39,7 @@
@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", "http://127.0.0.1:6080");
servletRegistrationBean.addUrlMappings();
@@ -45,11 +49,11 @@
return servletRegistrationBean;
}
- class ZLMProxySerlet extends ProxyServlet{
+ class ZlmProxyServlet extends ProxyServlet{
@Override
protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) {
String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString);
- IMediaServerItem mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI());
+ MediaServerItem mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI());
if (mediaInfo != null) {
if (!StringUtils.isEmpty(queryStr)) {
queryStr += "&secret=" + mediaInfo.getSecret();
@@ -73,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);
}
@@ -88,7 +92,7 @@
@Override
protected String getTargetUri(HttpServletRequest servletRequest) {
String requestURI = servletRequest.getRequestURI();
- IMediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
String uri = null;
if (mediaInfo != null) {
@@ -106,7 +110,7 @@
@Override
protected HttpHost getTargetHost(HttpServletRequest servletRequest) {
String requestURI = servletRequest.getRequestURI();
- IMediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
HttpHost host;
if (mediaInfo != null) {
host = new HttpHost(mediaInfo.getIp(), mediaInfo.getHttpPort());
@@ -120,10 +124,14 @@
/**
* 鏍规嵁uri鑾峰彇娴佸獟浣撲俊鎭�
*/
- IMediaServerItem getMediaInfoByUri(String uri){
+ 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);
+ }
}
/**
@@ -132,12 +140,135 @@
@Override
protected String rewriteUrlFromRequest(HttpServletRequest servletRequest) {
String requestURI = servletRequest.getRequestURI();
- IMediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
String url = super.rewriteUrlFromRequest(servletRequest);
if (mediaInfo == null) {
+ logger.error("[ZLM鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
return url;
}
- return url.replace(mediaInfo.getId() + "/", "");
+ 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