From 3432548c1a7eeac6ecfc71916ba34ae76cf32412 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 28 六月 2021 15:54:50 +0800
Subject: [PATCH] 修复用户更新sql错误，ffmpeg拉流代理超时时间错误
---
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 29 +++++++++++++++++++++++------
1 files changed, 23 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 12b5736..3c4ea17 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -2,6 +2,7 @@
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
+import org.apache.catalina.connector.ClientAbortException;
import org.mitre.dsmiley.httpproxy.ProxyServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -12,11 +13,11 @@
import org.springframework.util.StringUtils;
import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.ConnectException;
-import java.util.Locale;
-
+@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Configuration
public class ProxyServletConfig {
@@ -27,10 +28,10 @@
@Bean
public ServletRegistrationBean zlmServletRegistrationBean(){
- String ip = StringUtils.isEmpty(mediaConfig.getWanIp())? mediaConfig.getIp(): mediaConfig.getWanIp();
ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new ZLMProxySerlet(),"/zlm/*");
servletRegistrationBean.setName("zlm_Proxy");
- servletRegistrationBean.addInitParameter("targetUri", String.format("http://%s:%s", ip, mediaConfig.getHttpPort()));
+ servletRegistrationBean.addInitParameter("targetUri", String.format("http://%s:%s", mediaConfig.getIp(), mediaConfig.getHttpPort()));
+ servletRegistrationBean.addUrlMappings();
if (logger.isDebugEnabled()) {
servletRegistrationBean.addInitParameter("log", "true");
}
@@ -38,9 +39,23 @@
}
class ZLMProxySerlet extends ProxyServlet{
+
+
+
+ @Override
+ protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) {
+ String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString);
+ if (!StringUtils.isEmpty(queryStr)) {
+ queryStr += "&secret=" + mediaConfig.getSecret();
+ }else {
+ queryStr = "secret=" + mediaConfig.getSecret();
+ }
+ return queryStr;
+ }
+
@Override
protected void handleRequestException(HttpRequest proxyRequest, HttpResponse proxyResonse, Exception e){
- System.out.println(e.getMessage());
+ //System.out.println(e.getMessage());
try {
super.handleRequestException(proxyRequest, proxyResonse, e);
} catch (ServletException servletException) {
@@ -48,7 +63,9 @@
} catch (IOException ioException) {
if (ioException instanceof ConnectException) {
logger.error("zlm 杩炴帴澶辫触");
- }else {
+ } else if (ioException instanceof ClientAbortException) {
+ logger.error("鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
+ } else {
logger.error("zlm 浠ｇ悊澶辫触锛� ", e);
}
} catch (RuntimeException exception){
--
Gitblit v1.8.0