优化代码结构，fix递归bug
Merge branch 'master' of https://github.com/xiaojue/jbcms