Merge pull request #636 from youyong205/master

refactor cat consumer