回退到之前的版本，client的修改有bug
Merge branch 'master' of https://github.com/mengning/stream