|
|
|
@ -38,7 +38,7 @@ class AccountsController < ApplicationController
|
|
|
|
|
return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
return normal_status(-1, "8~16位密码,支持字母数字和符号") if !params[:password] =~ CustomRegexp::PASSWORD
|
|
|
|
|
return normal_status(-1, "8~16位密码,支持字母数字和符号") unless params[:password] =~ CustomRegexp::PASSWORD
|
|
|
|
|
|
|
|
|
|
code = generate_identifier User, 8, pre
|
|
|
|
|
login = pre + code
|
|
|
|
@ -116,7 +116,7 @@ class AccountsController < ApplicationController
|
|
|
|
|
end
|
|
|
|
|
return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
|
|
|
|
|
return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
|
|
|
|
|
return normal_status(-1, "8~16位密码,支持字母数字和符号") if !params[:new_password] =~ CustomRegexp::PASSWORD
|
|
|
|
|
return normal_status(-1, "8~16位密码,支持字母数字和符号") unless params[:new_password] =~ CustomRegexp::PASSWORD
|
|
|
|
|
|
|
|
|
|
user.password, user.password_confirmation = params[:new_password], params[:new_password_confirmation]
|
|
|
|
|
ActiveRecord::Base.transaction do
|
|
|
|
|