Merge remote-tracking branch 'origin/mater-1.6.0' into mater-1.6.0

admin

2019-08-26 caafa321a29b1224b3fd97c0ff62dcc304483948

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