Merge pull request #4 from wangzhaojiang/master

update
更新user类接口
Merge pull request #18 from dazzle111/master

merge
Merge pull request #19 from Jensyn/master

Merge pull request #5 from wangzhaojiang/master
Merge pull request #6 from wangzhaojiang/master

同步代码