|
|
|
@@ -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 |
|
|
|
|
|
|
|
|
|
|
|
# 测试版前端需求 |
|
|
|
|