|
|
|
@@ -95,8 +95,8 @@ class ApplicationController < ActionController::Base |
|
|
|
elsif type.to_i == 3 && user_exist |
|
|
|
tip_exception(-2, "该手机号码或邮箱已绑定") |
|
|
|
end |
|
|
|
render_ok |
|
|
|
end |
|
|
|
render_okr |
|
|
|
# end |
|
|
|
|
|
|
|
# 发送及记录激活码 |
|
|
|
# 发送验证码:type 1:注册手机验证码 2:找回密码手机验证码 3:找回密码邮箱验证码 4:绑定手机 5:绑定邮箱 |
|
|
|
@@ -367,7 +367,7 @@ class ApplicationController < ActionController::Base |
|
|
|
# RSS key authentication does not start a session |
|
|
|
User.find_by_rss_key(params[:key]) |
|
|
|
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 |
|
|
|
|
|
|
|
def user_trace_log |
|
|
|
|