refactor models
merge upstream
Merge pull request #3 from shanzi/master

重构数据model