Merge remote-tracking branch 'origin/master'

fengxiang

2018-01-26 e125b445697a6b8c2b5cc5c57f31249c5088c1c9

 src/main/resources/application.yml

@@ -36,6 +36,7 @@
    # 合并多个DruidDataSource的监控数据
    useGlobalDataSourceStat: true


  rabbitmq:
    host: 116.62.12.115
    port: 5672