From 12c04d02e57a334445ffd6d0827be8bf41fa9003 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Tue, 11 Aug 2020 15:30:12 +0800
Subject: [PATCH] Change

---
 app/controllers/concerns/login_helper.rb | 4 ++--
 app/controllers/users_controller.rb      | 3 +--
 app/models/user.rb                       | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index 8d60728e..d554705b 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -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,
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6ae73206..eb2fe7e8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -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
diff --git a/app/models/user.rb b/app/models/user.rb
index a1466577..05acf0af 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"
+    EduSetting.get('autologin_cookie_name') || "autologin_forge_military"
   end
 
   def set_laboratory