移出zhangtao的代码到zhangtao branch