Browse Source

Change

pull/278/head
sylor_huang@126.com 5 years ago
parent
commit
12c04d02e5
3 changed files with 4 additions and 5 deletions
  1. +2
    -2
      app/controllers/concerns/login_helper.rb
  2. +1
    -2
      app/controllers/users_controller.rb
  3. +1
    -1
      app/models/user.rb

+ 2
- 2
app/controllers/concerns/login_helper.rb View File

@@ -6,12 +6,12 @@ module LoginHelper
end

def autologin_cookie_name
edu_setting('autologin_cookie_name').presence || 'autologin'
edu_setting('autologin_cookie_name').presence || 'autologin_forge_military'
end

def set_autologin_cookie(user)
Rails.logger.info("set_cookie_user_id is=======> #{user.id}")
token = Token.get_or_create_permanent_login_token(user, "autologin")
token = Token.get_or_create_permanent_login_token(user, autologin_cookie_name)
cookie_options = {
:value => token.value,
:expires => 1.month.from_now,


+ 1
- 2
app/controllers/users_controller.rb View File

@@ -140,9 +140,8 @@ class UsersController < ApplicationController
# 其他平台登录后,必须将token同步到forge平台,实现sso登录功能
def sync_token
return render_error('未找相关用户!') unless @user
return render_error('缺少参数!') unless params[:type]
token = Token.get_or_create_permanent_login_token(@user, params[:type])
token = Token.get_or_create_permanent_login_token(@user)
token.update_column(:value, params[:token])
render_ok
end


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

@@ -675,7 +675,7 @@ class User < ApplicationRecord
end

def autologin_name
EduSetting.get('autologin_cookie_name') || "autologin"
EduSetting.get('autologin_cookie_name') || "autologin_forge_military"
end

def set_laboratory


Loading…
Cancel
Save