64850858
2021-07-14 e48ef997c03b49c8090970f5fbb29ce80b0ac6df
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -2,8 +2,7 @@
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.catalina.connector.ClientAbortException;
import org.mitre.dsmiley.httpproxy.ProxyServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,16 +13,11 @@
import org.springframework.util.StringUtils;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.ConnectException;
import java.util.Locale;
import java.util.Map;
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Configuration
public class ProxyServletConfig {
@@ -51,18 +45,17 @@
        @Override
        protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) {
            String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString);
            if (queryStr != null) {
                queryStr += "&";
            if (!StringUtils.isEmpty(queryStr)) {
                queryStr += "&secret=" + mediaConfig.getSecret();
            }else {
                queryStr = "?";
                queryStr = "secret=" + mediaConfig.getSecret();
            }
            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) {
@@ -70,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){