Merge branches 'dev_aliyun', 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
commit
a8c55e8b28
@ -0,0 +1,51 @@
|
||||
class Weapps::VerificationCodesController < Weapps::BaseController
|
||||
before_action :require_wechat_login!
|
||||
|
||||
def create
|
||||
params[:type] == 'register' ? check_can_register : check_can_reset_password
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def check_can_register
|
||||
login = params[:login].to_s.strip
|
||||
if login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/
|
||||
user = User.find_by(mail: login)
|
||||
return render_error('该邮箱已注册') if user.present?
|
||||
elsif login =~ /^1\d{10}$/
|
||||
user = User.find_by(phone: params[:login])
|
||||
return render_error('该手机号已注册') if user.present?
|
||||
else
|
||||
return render_error('请输入正确的邮箱或手机号')
|
||||
end
|
||||
|
||||
code = %W(0 1 2 3 4 5 6 7 8 9)
|
||||
verification_code = code.sample(6).join
|
||||
send_type = login =~ /^1\d{10}$/ ? 1 : 8
|
||||
# 记录验证码
|
||||
check_verification_code(verification_code, send_type, login)
|
||||
|
||||
render_ok
|
||||
end
|
||||
|
||||
def check_can_reset_password
|
||||
login = params[:login].to_s.strip
|
||||
if login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/
|
||||
user = User.find_by(mail: login)
|
||||
return render_error('该邮箱尚未注册') if user.blank?
|
||||
elsif login =~ /^1\d{10}$/
|
||||
user = User.find_by(phone: login)
|
||||
return render_error('该手机号尚未注册') if user.blank?
|
||||
else
|
||||
return render_error('请输入正确的邮箱或手机号')
|
||||
end
|
||||
|
||||
code = %W(0 1 2 3 4 5 6 7 8 9)
|
||||
verification_code = code.sample(6).join
|
||||
send_type = login =~ /^1\d{10}$/ ? 2 : 3
|
||||
# 记录验证码
|
||||
check_verification_code(verification_code, send_type, login)
|
||||
|
||||
render_ok
|
||||
end
|
||||
end
|
||||
@ -1,10 +0,0 @@
|
||||
class AddColumnToStageSections < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
def change
|
||||
add_column :competition_stage_sections, :mission_count, :integer, default: 0
|
||||
add_column :competition_stage_sections, :score_source, :integer, default: 0
|
||||
|
||||
add_column :competition_entries, :shixun_identifier, :string
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,8 @@
|
||||
class AddColumnToStageSections < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
add_column :competition_stage_sections, :mission_count, :integer, default: 0
|
||||
add_column :competition_stage_sections, :score_source, :integer, default: 0
|
||||
|
||||
add_column :competition_entries, :shixun_identifier, :string
|
||||
end
|
||||
end
|
||||
Loading…
Reference in new issue