From faec027b63bb19d061098724754895ae801ad493 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 30 Oct 2017 14:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/application.xml b/src/main/resources/application.xml
index fb6c70f..8655f73 100644
--- a/src/main/resources/application.xml
+++ b/src/main/resources/application.xml
@@ -46,9 +46,8 @@
<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