增加出错处理
调整引用
Merge branch 'master' of https://github.com/kefengzhang/puduhe

Conflicts:
	tools/src/main/java/com/puduhe/action/ToolsAcion.java