floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pre_trustie_server' into trustie_server

This commit is contained in:
xiaoxiaoqiong 2021-12-29 15:01:59 +08:00
parent 2021cbbd5b 5a43239ad9
commit 25e4a817f6
2 changed files with 396 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View File

@ -251,7 +251,7 @@ class AccountsController < ApplicationController
def set_autologin_cookie(user) def set_autologin_cookie(user)
token = Token.get_or_create_permanent_login_token(user, "autologin") token = Token.get_or_create_permanent_login_token(user, "autologin")
sync_user_token_to_trustie(user.login, token.value) # sync_user_token_to_trustie(user.login, token.value)
cookie_options = { cookie_options = {
:value => token.value, :value => token.value,

24
app/controllers/application_controller.rb
View File

@ -272,18 +272,18 @@ class ApplicationController < ActionController::Base
# 测试版前端需求 # 测试版前端需求
logger.info("subdomain:#{request.subdomain}") logger.info("subdomain:#{request.subdomain}")
# if request.subdomain != "www" if request.subdomain != "www"
# if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除 if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
# User.current = User.find 81403 User.current = User.find 81403
# elsif params[:debug] == 'student' elsif params[:debug] == 'student'
# User.current = User.find 8686 User.current = User.find 8686
# elsif params[:debug] == 'admin' elsif params[:debug] == 'admin'
# logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....." logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
# user = User.find 36480 user = User.find 36480
# User.current = user User.current = user
# cookies.signed[:user_id] = user.id cookies.signed[:user_id] = user.id
# end end
# end end
# User.current = User.find 81403 # User.current = User.find 81403
end end