From f8bc5cdcec51c6714c82db6b8173aeaac2059624 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 3 Sep 2025 15:05:04 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E6=96=B9=E5=BC=8F=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/accounts_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index d28545508..46284867b 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -232,8 +232,8 @@ class AccountsController < ApplicationController # 用户登录 def login - password = decrypt(login_params[:password]) rescue User.new.check_password?([:password].to_s) - #Users::LoginForm.new(login_params.merge!({password: password})).validate! + password = decrypt(login_params[:password]) rescue login_params[:password].to_s + # Users::LoginForm.new(login_params.merge!({password: password})).validate! @user = User.try_to_login(params[:login], password) return normal_status(-2, "错误的账号或密码") if @user.blank? @@ -243,7 +243,7 @@ class AccountsController < ApplicationController login_control = LimitForbidControl::UserLogin.new(@user) return normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码") if login_control.forbid? - password_ok = @user.check_password?(params[:password].to_s) + password_ok = @user.check_password?(password.to_s) unless password_ok if login_control.remain_times-1 == 0 normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码")