Merge branch 'mater-1.6.0' into div

admin

2019-08-22 d80640689e6949780811f4f8d1c8c972dbd4aa0b

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