调整整体架构
Merge branch 'master' of https://github.com/lovenyf/NYF