Merge pull request #310 from youyong205/master

fix bug
fix bugs and refactor AlertConfig
Merge pull request #311 from leonindy/master

fix bugs and refactor AlertConfig
Merge branch 'master' of github.com:dianping/cat
modify the code