Browse Source

fixed 注册登录类型

tags/v4.0.0^2
xiaoxiaoqiong 4 years ago
parent
commit
2ca77732c8
2 changed files with 8 additions and 1 deletions
  1. +6
    -0
      app/forms/base_form.rb
  2. +2
    -1
      app/forms/register/form.rb

+ 6
- 0
app/forms/base_form.rb View File

@@ -50,4 +50,10 @@ class BaseForm
def strip(str)
str.to_s.strip.presence
end

# 1 手机类型;0 邮箱类型
# 注意新版的login是自动名生成的
def phone_mail_type value
value =~ /^1\d{10}$/ ? 1 : 0
end
end

+ 2
- 1
app/forms/register/form.rb View File

@@ -10,7 +10,8 @@ module Register
def check!
Rails.logger.info "Register::Form params: code: #{code}; login: #{login}; namespace: #{namespace}; password: #{password}; type: #{type}"
db_verifi_code =
type = phone_mail_type(strip(login))
db_verifi_code =
if type == 1
check_phone(login)
VerificationCode.where(phone: login, code: code, code_type: 1).last


Loading…
Cancel
Save