配置文件调整
Merge branch 'master' of github.com:jiangbianwanghai/haoma