Merge pull request #370 from youyong205/master

refactor
cdn code refactor
Merge pull request #371 from zengwei0771/master

cdn code refactor
Merge branch 'master' of github.com:dianping/cat