Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/controllers/application_controller.rb

@@ -291,10 +291,14 @@ class ApplicationController < ActionController::Base
 	# Returns the current user or nil if no user is logged in
 	# and starts a session if needed
 	def find_current_user
-		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
-		if session[:user_id]
+		re_subdomain = "#{request.subdomain.split('.').first}_user_id"
+
+		Rails.logger.info("find current_user: subdomain is #{re_subdomain} and user session is #{session[:user_id]} -- #{session[:"#{re_subdomain}"]}")
+		Rails.logger.info("-----------------------------")
+		Rails.logger.info("domain session is:  #{session[:"#{request.subdomain.split('.').first}_user_id"]}")
+		if session[:"#{re_subdomain}"]
 			# existing session
-			(User.active.find(session[:user_id]) rescue nil)
+			(User.active.find(session[:"#{re_subdomain}"]) rescue nil)
 		elsif autologin_user = try_to_autologin
 			autologin_user
 		elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?

app/controllers/concerns/login_helper.rb

@@ -62,7 +62,21 @@ module LoginHelper
   end
 
   def start_user_session(user)
-    session[:user_id] = user.id
+    re_subdomain = "#{request.subdomain.split('.').first}_user_id"
+
+    session[:"#{re_subdomain}"] = nil
+    session[:user_id] = nil
+    # session[:"#{re_subdomain}"] = user.id
+    Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{re_subdomain}"]}")
+    Rails.logger.info("user_id session is: 3333332222111#{session[:user_id]}")
+
+    # if current_laboratory.main_site?
+    #   session[:user_id] = user.id
+    # else
+    #   session[:"#{request.subdomain}_user_id"] = user.id
+    # end
+
+    # session[:user_id] = user.id
     session[:ctime] = Time.now.utc.to_i
     session[:atime] = Time.now.utc.to_i
   end