From 620d2eeb5168735c8415778ef92bbf579c90f6e5 Mon Sep 17 00:00:00 2001 From: xiaoxiaoqiong Date: Tue, 28 Jun 2022 10:09:26 +0800 Subject: [PATCH] =?UTF-8?q?auth=20token=20=E6=8E=A5=E5=85=A5=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index eba648482..d1119914a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -170,8 +170,10 @@ class ApplicationController < ActionController::Base # 未授权的捕捉407，弹试用申请弹框 def require_login #6.13 -hs - tip_exception(401, "请登录后再操作") unless request.headers["Authorization"] && valid_doorkeeper_token? - User.current = User.find_by(id: @doorkeeper_token.resource_owner_id) if @doorkeeper_token.present? + if request.headers["Authorization"].present? + tip_exception(401, "请登录后再操作!") unless valid_doorkeeper_token? + User.current = User.find_by(id: @doorkeeper_token.resource_owner_id) if @doorkeeper_token.present? + end tip_exception(401, "请登录后再操作") unless User.current.logged? end @@ -267,11 +269,11 @@ class ApplicationController < ActionController::Base end end - if !User.current.logged? && Rails.env.development? - user = User.find 1 - User.current = user - start_user_session(user) - end + # if !User.current.logged? && Rails.env.development? + # user = User.find 1 + # User.current = user + # start_user_session(user) + # end # 测试版前端需求