Bläddra i källkod

Merge branch 'develop' of http://39.106.8.246:3003/persagy/booking into develop

lgy 6 år sedan
förälder
incheckning
e2c3112a2d
4 ändrade filer med 13 tillägg och 0 borttagningar
  1. 5 0
      pom.xml
  2. 8 0
      src/main/webapp/WEB-INF/web.xml
  3. BIN
      src/main/webapp/images/view1.jpg
  4. BIN
      src/main/webapp/images/view2.jpg

+ 5 - 0
pom.xml

@@ -226,6 +226,11 @@
       <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlets</artifactId>
+      <version>9.4.8.v20171121</version>
+    </dependency>
 
 
     <!--导入JSTL标签库-->

+ 8 - 0
src/main/webapp/WEB-INF/web.xml

@@ -71,5 +71,13 @@
     <filter-name>shiroFilter</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>-->
+  <filter>
+    <filter-name>cross-origin</filter-name>
+    <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>cross-origin</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
 
 </web-app>

BIN
src/main/webapp/images/view1.jpg


BIN
src/main/webapp/images/view2.jpg