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

merge aliyun

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/main_controller.rb

@@ -8,6 +8,10 @@ class MainController < ApplicationController
   end
 
   def index
+    domain_session = params[:_educoder_session]
+    if domain_session
+      cookies[:_educoder_session] = domain_session
+    end
     render file: 'public/react/build/index.html', :layout => false
   end
 end