Merge branch 'dev_lijun' of http://whychdw@118.89.139.230:10101/r/~whyclj/w...

whychdw

2020-04-27 b65db6cf6f7265957fe4ddc3407a349ef345aabc

Merge branch 'dev_lijun' of http://whychdw@118.89.139.230:10101/r/~whyclj/webSocketTest.git into dev_lijun

 webSockTest/src/com/fgkj/Filters/CrossDomainLimitFilter.java

@@ -28,7 +28,7 @@
        response.setCharacterEncoding("UTF-8");
        response.setContentType("text/html;charset=utf-8");
        //检测跨域访问的请求
        System.out.println("##########################################");
        //System.out.println("##########################################");
        //非跨域请求
        isAlowCrossDomain(response);
        chain.doFilter(request, response);
@@ -38,11 +38,11 @@
    }

    public void init(FilterConfig arg0) throws ServletException {
        System.out.println("##########################################");
        //System.out.println("##########################################");
    }

    public void destroy() {
        System.out.println("##########################################");
        //System.out.println("##########################################");
    }
    
    /**