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 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/application.xml b/src/main/resources/application.xml
index fb6c70f..0439a87 100644
--- a/src/main/resources/application.xml
+++ b/src/main/resources/application.xml
@@ -46,6 +46,7 @@
         <property name="queueCapacity" value="1000000"/>
     </bean>-->
 
+    <import resource="redis.xml"/>
     <import resource="database.xml"/>
     <import resource="rabbitmq.xml"/>
     <!-- 

--
Gitblit v1.8.0