From 998a6828d9c535a17b3ffabbce5a5cdb24f477df Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 11 Aug 2020 15:34:50 +0800 Subject: [PATCH] change --- app/controllers/application_controller.rb | 2 +- app/models/user.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 68f0b2a4..bc52d2d0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -372,7 +372,7 @@ class ApplicationController < ActionController::Base # auto-login feature starts a new session user = nil Rails.logger.info("111111111111111111#{default_yun_session}, session is #{session[:"#{default_yun_session}"]} ") - user = User.try_to_autologin(cookies[autologin_cookie_name]) + user = User.try_to_autologin(cookies[autologin_cookie_name], autologin_cookie_name) # start_user_session(user) if user # TODO 解决sso退出不同步的问题 user end diff --git a/app/models/user.rb b/app/models/user.rb index 05acf0af..9e26f764 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -509,8 +509,8 @@ class User < ApplicationRecord end # Returns the user who matches the given autologin +key+ or nil - def self.try_to_autologin(key) - user = Token.find_active_user(autologin_name, key) + def self.try_to_autologin(key,type) + user = Token.find_active_user(type, key) user.update(last_login_on: Time.now) if user user end