Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

whyclj

2018-12-29 1e2369de8e321bdf7d9ee692aa55d65d8ac560b8

 gx_tieta/WebRoot/WEB-INF/web.xml

@@ -29,6 +29,14 @@
    <url-pattern>/ExportTable.servlet</url-pattern>

  </servlet-mapping>

  <filter>

     <filter-name>CrossDomainLimitFilter</filter-name>

     <filter-class>com.fgkj.Filters.CrossDomainLimitFilter</filter-class>

  </filter>

  <filter-mapping>

     <filter-name>CrossDomainLimitFilter</filter-name>

     <url-pattern>/*</url-pattern>

  </filter-mapping>

  <filter>

    <filter-name>struts2</filter-name>

    <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>

  </filter>

@@ -51,6 +59,7 @@
  <filter-mapping>

    <filter-name>LoginFilter</filter-name>

    <url-pattern>*.jsp</url-pattern>

    <url-pattern>*.html</url-pattern>

  </filter-mapping>

  <filter>

    <filter-name>HotlinkFilter</filter-name>