diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 46284867b..5785a7136 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -337,6 +337,8 @@ class AccountsController < ApplicationController session[:"#{default_yun_session}"] = user.id UserOnline.login(user.id) Rails.logger.info("#########_____session_default_yun_session__________###############{default_yun_session}") + # 清除登录错误次数 + user.reset_login_times! # 注册完成后有一天的试用申请(先去掉) # UserDayCertification.create(user_id: user.id, status: 1) end diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb index 6f1e6c895..3c7d8f2d3 100644 --- a/app/controllers/concerns/login_helper.rb +++ b/app/controllers/concerns/login_helper.rb @@ -47,6 +47,8 @@ module LoginHelper UserAction.create(action_id: user&.id, action_type: 'Login', user_id: user&.id, ip: request.remote_ip) user.update_column(:last_login_on, Time.now) + # 清除登录错误次数 + user.reset_login_times! # 注册完成后有一天的试用申请(先去掉) # UserDayCertification.create(user_id: user.id, status: 1) end diff --git a/app/views/users/_user_small.json.jbuilder b/app/views/users/_user_small.json.jbuilder index d645aaf05..446cbe94e 100644 --- a/app/views/users/_user_small.json.jbuilder +++ b/app/views/users/_user_small.json.jbuilder @@ -2,7 +2,7 @@ json.array! users do |user| json.username user.full_name json.login user.login - json.phone user.phone + # json.phone user.phone json.user_id user.id json.mail user.mail # json.phone user.phone.present? ? "#{user.phone[0..2]}****#{user.phone[-4..-1]}" : ""