Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yj

2020-03-04 b416c2ffd263ca9d191fc1109bd72d10f8c5176d

1
2
3
4
5
appId =1255749512 
secretId =AKIDTlpgJhLjOozvd6QI2XnpfGbgV4NQJk25 
secretKey =xhCSUHo55oHUQ6XicFcmfIgspX0EEzWo 
bucketName =ec 
region=ap-guangzhou