Merge pull request #1 from gefangshuai/master

接收setting
马士强提交
。。
11
Merge pull request #3 from gefangshuai/master

667
Merge pull request #3 from mashiqiang/master

222