Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 01329695ebf6eea6576d76825181b2f3833297e8

 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