Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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

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?
 

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'))

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

app/models/challenge.rb

@@ -28,7 +28,7 @@ class Challenge < ApplicationRecord
 
   scope :fields_for_list, -> { select([:id, :subject, :st, :score, :position, :shixun_id]) }
 
-  validates :task_pass, length: { maximum: 10000, too_long: "不能超过10000个字符" }
+  validates :task_pass, length: { maximum: 35000, too_long: "不能超过35000个字符" }
 
 
   after_commit :create_diff_record

app/models/challenge_choose.rb

@@ -4,6 +4,6 @@ class ChallengeChoose < ApplicationRecord
   has_many :challenge_tags, :dependent => :destroy
   has_many :challenge_questions, dependent: :destroy
 
-  validates :subject, length: { maximum: 1000, too_long: "不能超过1000个字符" }
+  validates :subject, length: { maximum: 25000, too_long: "不能超过25000个字符" }
 
 end

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
 

public/react/src/modules/page/main/CodeEvaluateView.js

@@ -225,10 +225,11 @@ class CodeEvaluateView extends Component {
                             <React.Fragment>
                             	{ item.input ?
                                 <div className="pl20 pb5 -task-testline">
-                                    <div className="clearfix df inputTitle">
+                                    <div className="clearfix df inputTitle" style={{lineHeight: 1.5}}>
                                         <span className="fl fb color-grey">测试输入：</span>
 
-                                        <div className="fl color-blue input" style={{flex:1}} 
+                                        <div className="fl color-blue input" style={{flex:1,overflow: 'hidden',textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap', marginRight: '15px'}} 
 											// dangerouslySetInnerHTML={{__html: (item.input.replace(/\r\n/g,"</br>"))}}
 
 										>