更新tomcat假死的bug加注册页面返回错误的bug
Merge remote-tracking branch 'origin/master'