合并胡华星的代码新增了modules/categories & /modules/search