sso^2
cxt 5 years ago
parent 5a5c0d5cce
commit f91fcc9751

@ -17,10 +17,11 @@ class Weapps::SessionsController < Weapps::BaseController
# session[:wechat_user_extra].delete(:nickName) # session[:wechat_user_extra].delete(:nickName)
# 绑定微信号 # 绑定微信号
open_user = OpenUsers::Wechat.find_by(uid: session_unionid) # open_user = OpenUsers::Wechat.find_by(uid: session_unionid)
if open_user.present? && open_user.user_id.nil? # if open_user.present? && open_user.user_id.nil?
open_user.update!(user_id: user.id) # open_user.update!(user_id: user.id)
elsif user.wechat_open_user.blank? # els
if user.wechat_open_user.blank?
OpenUsers::Wechat.create!(user: user, uid: session_unionid) OpenUsers::Wechat.create!(user: user, uid: session_unionid)
end end

@ -7,7 +7,8 @@ class Weapps::UnbindAccountsController < Weapps::BaseController
def destroy def destroy
open_user = OpenUsers::Wechat.find_by!(user_id: current_user.id) open_user = OpenUsers::Wechat.find_by!(user_id: current_user.id)
open_user.update!(user_id: nil) session[:unionid] = open_user.uid
open_user.destroy!
UserAction.create(action_id: current_user.id, action_type: "UnbindWechat", user_id: current_user.id, :ip => request.remote_ip) UserAction.create(action_id: current_user.id, action_type: "UnbindWechat", user_id: current_user.id, :ip => request.remote_ip)
logout_user logout_user
render_ok render_ok

@ -1 +1 @@
json.user_account @user.phone.present? ? @user.phone : @user.mail json.user_account @user.phone.present? ? @user.phone : (@user.mail.present? ? @user.mail : @user.login)

Loading…
Cancel
Save