| @@ -6,12 +6,12 @@ module LoginHelper | |||||
| end | end | ||||
| def autologin_cookie_name | def autologin_cookie_name | ||||
| edu_setting('autologin_cookie_name').presence || 'autologin' | |||||
| edu_setting('autologin_cookie_name').presence || 'autologin_forge_military' | |||||
| end | end | ||||
| def set_autologin_cookie(user) | def set_autologin_cookie(user) | ||||
| Rails.logger.info("set_cookie_user_id is=======> #{user.id}") | 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 = { | cookie_options = { | ||||
| :value => token.value, | :value => token.value, | ||||
| :expires => 1.month.from_now, | :expires => 1.month.from_now, | ||||
| @@ -140,9 +140,8 @@ class UsersController < ApplicationController | |||||
| # 其他平台登录后,必须将token同步到forge平台,实现sso登录功能 | # 其他平台登录后,必须将token同步到forge平台,实现sso登录功能 | ||||
| def sync_token | def sync_token | ||||
| return render_error('未找相关用户!') unless @user | 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]) | token.update_column(:value, params[:token]) | ||||
| render_ok | render_ok | ||||
| end | end | ||||
| @@ -675,7 +675,7 @@ class User < ApplicationRecord | |||||
| end | end | ||||
| def autologin_name | def autologin_name | ||||
| EduSetting.get('autologin_cookie_name') || "autologin" | |||||
| EduSetting.get('autologin_cookie_name') || "autologin_forge_military" | |||||
| end | end | ||||
| def set_laboratory | def set_laboratory | ||||