controller添加异常处理
Merge branch 'master' of https://github.com/melin/super-diamond