From 28be9898d37a1687273c32adecf859a3749638e4 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 15 Apr 2020 18:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=80=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb            | 1 +
 app/controllers/concerns/login_helper.rb          | 7 +------
 app/services/gitea/pull_request/create_service.rb | 1 +
 config/application.rb                             | 3 ---
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 4ae3ad129..a426364b4 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -263,6 +263,7 @@ class AccountsController < ApplicationController
   # end
 
   def logout
+    Rails.logger.info("########___logout_current_user____________########{current_user.try(:id)}")
     UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip)
     logout_user
     render :json => {status: 1, message: "退出成功!"}
diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index df7591d03..94ef1c04a 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -44,21 +44,16 @@ module LoginHelper
   end
 
   def logout_user
-    Rails.logger.info("####################_1111_User.current_id______######{User.current.try(:id)}###___#{User.current.logged?}")
+    Rails.logger.info("####################__User.current_id______######{current_user.try(:id)}###___#{current_user&.logged?}")
 
     if User.current.logged?
-      Rails.logger.info("####################__2222_______######")
       if autologin = cookies.delete(autologin_cookie_name)
-        Rails.logger.info("####################__33333______######")
 
         User.current.delete_autologin_token(autologin)
       end
-      Rails.logger.info("####################__4444444______######")
-
       User.current.delete_session_token(session[:tk])
       self.logged_user = nil
     end
-    Rails.logger.info("####################__55555______######")
 
     # 云上实验室退出清理当前session
     laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1))
diff --git a/app/services/gitea/pull_request/create_service.rb b/app/services/gitea/pull_request/create_service.rb
index 3d5b6d998..21e63a553 100644
--- a/app/services/gitea/pull_request/create_service.rb
+++ b/app/services/gitea/pull_request/create_service.rb
@@ -18,6 +18,7 @@ class Gitea::PullRequest::CreateService < Gitea::ClientService
   end
 
   def call
+    Rails.logger.info("######_____pr_url______#########{url}")
     post(url, request_params)
   end
 
diff --git a/config/application.rb b/config/application.rb
index 19276b5fd..f7d05dcd4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -33,9 +33,6 @@ module Educoderplus
       provider :cas, url: 'https://urp.tfswufe.edu.cn/cas'
     end
 
-    # config.middleware.use ActionDispatch::Cookies
-    # config.middleware.use ActionDispatch::Session::CookieStore
-
     config.middleware.insert_before 0, Rack::Cors do
       allow do
         origins '*'