From 275f53ab5098d3df9004b75c4968efd67b950e9a Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 6 Nov 2019 15:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=81=E5=AE=9A=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb      | 2 +-
 app/libs/limit_forbid_control/user_login.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index f515d386d..88dfba5dc 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -78,7 +78,7 @@ class AccountsController < ApplicationController
     return normal_status(-2, "违反平台使用规范，账号已被锁定") if @user.locked?
 
     login_control = LimitForbidControl::UserLogin.new(@user)
-    return normal_status(-2, "登录密码出错已达上限，将锁定密码1小时") if login_control.forbid?
+    return normal_status(-2, "登录密码出错已达上限，将锁定密码#{login_control.forbid_expires}分钟") if login_control.forbid?
 
     password_ok = @user.check_password?(params[:password].to_s)
     unless password_ok
diff --git a/app/libs/limit_forbid_control/user_login.rb b/app/libs/limit_forbid_control/user_login.rb
index 882556eb1..5588e9406 100644
--- a/app/libs/limit_forbid_control/user_login.rb
+++ b/app/libs/limit_forbid_control/user_login.rb
@@ -12,7 +12,7 @@ class LimitForbidControl::UserLogin < LimitForbidControl::Base
 
   def forbid_expires
     num = EduSetting.get('daily_error_password_forbid_time').presence.to_i
-    num.zero? ? 1.hours : num.to_i.hours
+    num.zero? ? 1.hours : num.to_i.minutes
   end
 
   def cumulative_expires