From d0a7ad5e3a1c147a70a0e792c3eafa3b7613fff7 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 15:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/application.xml b/src/main/resources/application.xml
index 8905828..0439a87 100644
--- a/src/main/resources/application.xml
+++ b/src/main/resources/application.xml
@@ -46,7 +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