|
|
|
@ -22,21 +22,21 @@ class AccountsController < ApplicationController
|
|
|
|
|
pre = 'p'
|
|
|
|
|
email = nil
|
|
|
|
|
phone = params[:login]
|
|
|
|
|
verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 1).last
|
|
|
|
|
#verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 1).last
|
|
|
|
|
else
|
|
|
|
|
uid_logger("start register by email: type is #{type}")
|
|
|
|
|
pre = 'm'
|
|
|
|
|
email = params[:login]
|
|
|
|
|
phone = nil
|
|
|
|
|
verifi_code = VerificationCode.where(email: email, code: code, code_type: 8).last
|
|
|
|
|
#verifi_code = VerificationCode.where(email: email, code: code, code_type: 8).last
|
|
|
|
|
end
|
|
|
|
|
uid_logger("start register: verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
|
|
|
|
|
#uid_logger("start register: verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
|
|
|
|
|
# check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
|
|
|
|
|
# todo 上线前请删除万能验证码"513231"
|
|
|
|
|
unless code == "513231" && request.subdomain == "pre-newweb"
|
|
|
|
|
return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
|
|
|
|
|
return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
|
|
|
|
|
end
|
|
|
|
|
#unless code == "513231" && request.subdomain == "pre-newweb"
|
|
|
|
|
# return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
|
|
|
|
|
# return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
|
|
|
|
|
#end
|
|
|
|
|
|
|
|
|
|
code = generate_identifier User, 8, pre
|
|
|
|
|
login = pre + code
|
|
|
|
|