jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 2b49d3f7c4d6a55347b5ff9731b7a548618549c9

Authored by zhangrui
1 parent dece08c8a8
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge branch 'master' of D:\Code\regional-platform with conflicts.

Showing 1 changed file with 2 additions and 2 deletions

platform-operate-api/src/main/webapp/WEB-INF/web.xml View file @ 2b49d3f
... ... @@ -13,7 +13,7 @@
13 13 version="2.5"
14 14 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
15 15  
16   - <!--
  16 +
17 17 <filter>
18 18 <filter-name>CorsFilter</filter-name>
19 19 <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
... ... @@ -47,7 +47,7 @@
47 47 <url-pattern>/*</url-pattern>
48 48 </filter-mapping>
49 49  
50   - -->
  50 +
51 51 <servlet-mapping>
52 52 <servlet-name>default</servlet-name>
53 53 <url-pattern>*.xml</url-pattern>