提交setting
Merge pull request #1 from gefangshuai/master

接收setting