Merge remote-tracking branch 'origin/master'

沈斌

2017-10-27 a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424

 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"/>

    <!--