Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-09-11 88350873ee7632924cb135a450fef9f4d05c5306

 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;

@@ -62,6 +63,18 @@
                }
            }
            return queryStr;
        }


        @Override
        protected HttpResponse doExecute(HttpServletRequest servletRequest, HttpServletResponse servletResponse,
                                         HttpRequest proxyRequest) throws IOException {
            HttpResponse response = super.doExecute(servletRequest, servletResponse, proxyRequest);
            response.removeHeaders("Access-Control-Allow-Origin");
            response.setHeader("Access-Control-Allow-Credentials","true");
            response.removeHeaders("Access-Control-Allow-Credentials");

            return response;
        }

        /**
@@ -181,6 +194,18 @@
            return queryStr;
        }


        @Override
        protected HttpResponse doExecute(HttpServletRequest servletRequest, HttpServletResponse servletResponse,
                                         HttpRequest proxyRequest) throws IOException {
            HttpResponse response = super.doExecute(servletRequest, servletResponse, proxyRequest);
            String origin = servletRequest.getHeader("origin");
            response.setHeader("Access-Control-Allow-Origin",origin);
            response.setHeader("Access-Control-Allow-Credentials","true");

            return response;
        }

        /**
         * 异常处理
         */