Merge remote-tracking branch 'origin/master'

fengxiang

2017-12-22 3e2436955a5daf512098dc879c470ee88ce003eb

 src/main/resources/application.yml

@@ -45,7 +45,7 @@


  redis:
    host: 101.37.22.173
    host: 47.96.19.115
    port: 6379
    password: redis_pass
    database: 0