From a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 10:27:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/application.xml |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/application.xml b/src/main/resources/application.xml
index 4eca950..0439a87 100644
--- a/src/main/resources/application.xml
+++ b/src/main/resources/application.xml
@@ -37,8 +37,6 @@
         <property name="suffix" value=".jsp" />
     </bean>
 
-
-
     <!--
     &lt;!&ndash; ��������� &ndash;&gt;
     <bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
@@ -48,9 +46,10 @@
         <property name="queueCapacity" value="1000000"/>
     </bean>-->
 
-
+    <import resource="redis.xml"/>
     <import resource="database.xml"/>
     <import resource="rabbitmq.xml"/>
-    <import resource="quartz.xml"/>
-
+    <!-- 
+     <import resource="quartz.xml"/>
+     -->
 </beans>
\ No newline at end of file

--
Gitblit v1.8.0