Merge remote-tracking branch 'origin/master'

沈斌

2017-10-27 d0a7ad5e3a1c147a70a0e792c3eafa3b7613fff7

 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>