diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cb31067cb..aaf8ecabf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -23,10 +23,6 @@ class ApplicationController < ActionController::Base # 所有请求必须合法签名 def check_sign - uid_logger("educoder_session is #{cookies[:_educoder_session]}") - uid_logger("autologin trustie is #{cookies[:autologin_trustie]}") - uid_logger("check sign start: session[:user_id] is #{session[:user_id]}") - uid_logger("check sign start: default_yun_session is #{default_yun_session}, session[:current_user_id] is #{session[:"#{default_yun_session}"]}") if !Rails.env.development? Rails.logger.info("66666 #{params}") # suffix = request.url.split(".").last.split("?").first diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb index 00623041e..53fbfe323 100644 --- a/app/controllers/colleges_controller.rb +++ b/app/controllers/colleges_controller.rb @@ -136,6 +136,12 @@ class CollegesController < ApplicationController private + # def require_login + # return if User.current.logged? + # + # redirect_to "/login?back_url=#{CGI::escape(request.fullpath)}" + # end + def check_college_present! return if current_college.present? diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb index ede7ff071..b85b17a22 100644 --- a/app/controllers/concerns/login_helper.rb +++ b/app/controllers/concerns/login_helper.rb @@ -16,7 +16,7 @@ module LoginHelper :expires => 1.month.from_now, :path => '/', :secure => false, - :httponly => true + :httponly => false } if edu_setting('cookie_domain').present? cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 75a6012b0..bccc76c81 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -8,6 +8,17 @@ class MainController < ApplicationController end def index + domain_session = params[:_educoder_session] + if domain_session + uid_logger("main start domain_session is #{domain_session}") + if cookies[:_educoder_session] != domain_session + cookies[:_educoder_session] = nil + cookies[:_educoder_session] = domain_session + end + + + uid_logger("main start is #{cookies[:_educoder_session]}") + end render file: 'public/react/build/index.html', :layout => false end end \ No newline at end of file diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 06ba35f6e..def30285a 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -4,5 +4,5 @@ # Rails.application.config.session_store :active_record_store # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cache_store, :expire_after => 24.hours, key: '_educoder_session', domain: :all +Rails.application.config.session_store :cache_store, :expire_after => 24.hours, :httponly => false, :secure => false, key: '_educoder_session', domain: :all diff --git a/public/react/src/modules/page/main/CodeEvaluateView.js b/public/react/src/modules/page/main/CodeEvaluateView.js index fef5bd83e..e68bfa43a 100644 --- a/public/react/src/modules/page/main/CodeEvaluateView.js +++ b/public/react/src/modules/page/main/CodeEvaluateView.js @@ -225,10 +225,11 @@ class CodeEvaluateView extends Component { { item.input ?
-
+
测试输入: -
"))}} >