Merge branch 'dev_lxw' of http://whychdw@118.89.139.230:10101/r/~whyclxw/se...

霍东伟

2019-06-20 9a6c4d5e66648d913794dc55c769197873d6a56d

Merge branch 'dev_lxw' of http://whychdw@118.89.139.230:10101/r/~whyclxw/sensor.git into dev_lxw

 sensor/WebRoot/WEB-INF/web.xml

@@ -28,14 +28,14 @@
    <servlet-name>ExportTable.servlet</servlet-name>

    <url-pattern>/ExportTable.servlet</url-pattern>

  </servlet-mapping>

  <filter>

  <!-- <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-mapping> -->

  <filter>

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

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