|
|
|
@ -43,7 +43,7 @@ class ApplicationController < ActionController::Base
|
|
|
|
|
# params[:type] 1: 注册;2:忘记密码
|
|
|
|
|
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}$/
|
|
|
|
|
tip_exception("请输入正确的手机号或邮箱")
|
|
|
|
|
tip_exception(-2, "请输入正确的手机号或邮箱")
|
|
|
|
|
end
|
|
|
|
|
# 考虑到安全参数问题,多一次查询,去掉Union
|
|
|
|
|
user = User.where(phone: login).first || User.where(mail: login).first
|
|
|
|
|