Merge remote-tracking branch 'origin/master'

沈斌

2017-11-15 ad42a81e625f1e7a982a94994d7d5f3314c71fbd

 src/main/resources/spring/application.xml

@@ -21,6 +21,7 @@
                <value>classpath:log4j/log4j.properties</value>

                <value>classpath:redis/redis-config.properties</value>

                <value>classpath:mongodb/mongodb-config.properties</value>

                <value>classpath:rabbitmq/rabbit-config.properties</value>

            </list>

        </property>

    </bean>