From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 01 二月 2021 10:16:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/main/webapp/WEB-INF/spring-mvc.xml | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/spring-mvc.xml b/src/main/webapp/WEB-INF/spring-mvc.xml index 223f060..f4d9967 100644 --- a/src/main/webapp/WEB-INF/spring-mvc.xml +++ b/src/main/webapp/WEB-INF/spring-mvc.xml @@ -11,12 +11,13 @@ http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd - http://www.springframework.org/schema/task + http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd"> <context:component-scan base-package="com.nanometer.smartlab.api"/> + <context:component-scan base-package="com.nanometer.smartlab.controller"/> <!-- 静态资源(js、image等)的访问 --> <mvc:default-servlet-handler/> @@ -51,6 +52,6 @@ </bean> <mvc:cors> - <mvc:mapping path="/**" allowed-origins="*" allow-credentials="true" max-age="1800" allowed-methods="GET,POST,OPTIONS"/> + <mvc:mapping path="/**" allowed-origins="*" allow-credentials="true" max-age="1800" allowed-methods="GET,POST"/> </mvc:cors> -</beans> \ No newline at end of file +</beans> -- Gitblit v1.9.2