Browse Source

change

pull/278/head
sylor_huang@126.com 5 years ago
parent
commit
998a6828d9
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      app/controllers/application_controller.rb
  2. +2
    -2
      app/models/user.rb

+ 1
- 1
app/controllers/application_controller.rb View File

@@ -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


+ 2
- 2
app/models/user.rb View File

@@ -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


Loading…
Cancel
Save