comment user.current
This commit is contained in:
parent
81685f88cd
commit
d9a0b34cb8
|
@ -95,8 +95,8 @@ class ApplicationController < ActionController::Base
|
||||||
elsif type.to_i == 3 && user_exist
|
elsif type.to_i == 3 && user_exist
|
||||||
tip_exception(-2, "该手机号码或邮箱已绑定")
|
tip_exception(-2, "该手机号码或邮箱已绑定")
|
||||||
end
|
end
|
||||||
render_ok
|
render_okr
|
||||||
end
|
# end
|
||||||
|
|
||||||
# 发送及记录激活码
|
# 发送及记录激活码
|
||||||
# 发送验证码:type 1:注册手机验证码 2:找回密码手机验证码 3:找回密码邮箱验证码 4:绑定手机 5:绑定邮箱
|
# 发送验证码:type 1:注册手机验证码 2:找回密码手机验证码 3:找回密码邮箱验证码 4:绑定手机 5:绑定邮箱
|
||||||
|
@ -367,7 +367,7 @@ class ApplicationController < ActionController::Base
|
||||||
# RSS key authentication does not start a session
|
# RSS key authentication does not start a session
|
||||||
User.find_by_rss_key(params[:key])
|
User.find_by_rss_key(params[:key])
|
||||||
end
|
end
|
||||||
User.current = User.find(2) # need to remove this statement before running in production
|
# User.current = User.find(2) # need to remove this statement before running in production
|
||||||
end
|
end
|
||||||
|
|
||||||
def user_trace_log
|
def user_trace_log
|
||||||
|
|
Loading…
Reference in New Issue