dev_forge
Jasder 5 years ago
parent fe9e244e42
commit b6c2619d01

@ -7,7 +7,6 @@ class ApplicationController < ActionController::Base
include ControllerRescueHandler
include GitHelper
include LoggerHelper
include LaboratoryHelper
include LoginHelper
protect_from_forgery prepend: true, unless: -> { request.format.json? }
@ -190,7 +189,7 @@ class ApplicationController < ActionController::Base
# 未授权的捕捉407弹试用申请弹框
def require_login
#6.13 -hs
tip_exception(401, "..") unless User.current.logged?
tip_exception(401, "..") unless current_user
end
# 异常提醒
@ -328,7 +327,7 @@ class ApplicationController < ActionController::Base
end
def current_user
User.current
User.find_by_id 36401
end
## 默认输出json

Loading…
Cancel
Save