From d6ef3d8aa35e761adaa37108b9bc91fd42608190 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 11 Aug 2020 15:23:49 +0800 Subject: [PATCH] Change --- app/controllers/concerns/login_helper.rb | 2 +- app/controllers/users_controller.rb | 3 ++- app/models/user.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb index e9bf4bb4..8d60728e 100644 --- a/app/controllers/concerns/login_helper.rb +++ b/app/controllers/concerns/login_helper.rb @@ -6,7 +6,7 @@ module LoginHelper end def autologin_cookie_name - edu_setting('autologin_cookie_name').presence || 'autologin_forge_military' + edu_setting('autologin_cookie_name').presence || 'autologin' end def set_autologin_cookie(user) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ac60f4d1..6ae73206 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -140,8 +140,9 @@ 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, 'autologin') + token = Token.get_or_create_permanent_login_token(@user, params[:type]) token.update_column(:value, params[:token]) render_ok end diff --git a/app/models/user.rb b/app/models/user.rb index 05acf0af..a1466577 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -675,7 +675,7 @@ class User < ApplicationRecord end def autologin_name - EduSetting.get('autologin_cookie_name') || "autologin_forge_military" + EduSetting.get('autologin_cookie_name') || "autologin" end def set_laboratory