yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change

This commit is contained in:
sylor_huang@126.com 2020-08-11 16:21:43 +08:00
parent 055b7dbac5
commit 57d1a1474e
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/controllers/accounts_controller.rb
View File

@ -256,23 +256,23 @@ class AccountsController < ApplicationController
# UserDayCertification.create(user_id: user.id, status: 1) # UserDayCertification.create(user_id: user.id, status: 1)
end end
# def set_autologin_cookie(user) def set_autologin_cookie(user)
# token = Token.get_or_create_permanent_login_token(user, "autologin_forge_military") 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,
# :path => '/', :path => '/',
# :secure => false, :secure => false,
# :httponly => true :httponly => true
# } }
# if edu_setting('cookie_domain').present? if edu_setting('cookie_domain').present?
# cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
# end end
# cookies[autologin_cookie_name] = cookie_options cookies[autologin_cookie_name] = cookie_options
# cookies.signed[:user_id] ||= user.id cookies.signed[:user_id] ||= user.id
# logger.info("cookies is #{cookies} ======> #{cookies.signed[:user_id]} =====> #{cookies[autologin_cookie_name]}") logger.info("cookies is #{cookies} ======> #{cookies.signed[:user_id]} =====> #{cookies[autologin_cookie_name]}")
# end end
def logout def logout
Rails.logger.info("########___logout_current_user____________########{current_user.try(:id)}") Rails.logger.info("########___logout_current_user____________########{current_user.try(:id)}")

2
app/controllers/users_controller.rb
View File

@ -140,10 +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
token = Token.get_or_create_permanent_login_token(@user, autologin_cookie_name) token = Token.get_or_create_permanent_login_token(@user, autologin_cookie_name)
token.update_column(:value, params[:token]) token.update_column(:value, params[:token])
session[:"#{default_yun_session}"] = @user.id
render_ok render_ok
end end

1
app/models/token.rb
View File

@ -26,7 +26,6 @@ class Token < ActiveRecord::Base
end end
def self.get_or_create_permanent_login_token(user, type) def self.get_or_create_permanent_login_token(user, type)
Rails.logger.info("======login_token=====user_id:#{user.id}===type:#{type}")
token = Token.get_token_from_user(user, type) token = Token.get_token_from_user(user, type)
unless token unless token
token = Token.create(:user => user, :action => type) token = Token.create(:user => user, :action => type)