登录的时候正则规范

app/controllers/application_controller.rb

@@ -48,7 +48,6 @@ class ApplicationController < ActionController::Base
 	def  check_mail_and_phone_valid login, type
 		unless login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/ || login =~ /^1\d{10}$/ ||
 					 login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])$/
-end
 			tip_exception(-2, "请输入正确的手机号或邮箱")
 		end
 		# 考虑到安全参数问题，多一次查询，去掉Union