edit on aliyun
slove confit
Merge pull request #2 from gldamao/origin/branch1

edit on aliyun