|
|
@@ -35,11 +35,20 @@
|
|
|
<tx:annotation-driven transaction-manager="transactionManager"
|
|
|
proxy-target-class="true" />
|
|
|
<!-- 对token拦截验证 (为方便测试,测试环境给注释掉) -->
|
|
|
+<<<<<<< HEAD
|
|
|
<mvc:interceptors>
|
|
|
<mvc:interceptor>
|
|
|
+=======
|
|
|
+ <mvc:interceptors>
|
|
|
+ <mvc:interceptor>
|
|
|
+>>>>>>> branch 'master' of ssh://git@dev.33.cn/maamin1/sqLogisticsProject.git
|
|
|
<mvc:mapping path="/**" />
|
|
|
<mvc:exclude-mapping path="/login"/>
|
|
|
<bean class="com.fuzamei.interceptor.TokenInterceptor" />
|
|
|
</mvc:interceptor>
|
|
|
+<<<<<<< HEAD
|
|
|
</mvc:interceptors>
|
|
|
+=======
|
|
|
+ </mvc:interceptors>
|
|
|
+>>>>>>> branch 'master' of ssh://git@dev.33.cn/maamin1/sqLogisticsProject.git
|
|
|
</beans>
|
