diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 28a1b5b6e..3ad85d507 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -94,7 +94,7 @@ class AccountsController < ApplicationController
     successful_authentication(@user)
     login_control.clear # 重置每日密码错误次数
 
-    session[:user_id] = @user.id
+    # session[:user_id] = @user.id
   end
 
   # 忘记密码
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c6aca5ae5..4c61fb1df 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -299,9 +299,11 @@ class ApplicationController < ActionController::Base
 	# 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]
+		uid_logger("0000000000000user setup start: session[:user_id] is #{session[:"#{default_yun_session}"]}")
+		current_domain_session = session[:"#{default_yun_session}"]
+		if current_domain_session
 			# existing session
-			(User.active.find(session[:user_id]) rescue nil)
+			(User.active.find(current_domain_session) rescue nil)
 		elsif autologin_user = try_to_autologin
 			autologin_user
 		elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
@@ -313,10 +315,10 @@ class ApplicationController < ActionController::Base
 	def try_to_autologin
 		if cookies[autologin_cookie_name]
 			# auto-login feature starts a new session
-			user = User.try_to_autologin(cookies[autologin_cookie_name])
-			if user
-				start_user_session(user)
-			end
+			user = nil
+			Rails.logger.info("111111111111111111#{default_yun_session}, session is #{session[:"#{default_yun_session}"]} ")
+			user = User.try_to_autologin(cookies[autologin_cookie_name]) if session[:"#{default_yun_session}"]
+			start_user_session(user) if user
 			user
 		end
 	end
diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index 8497799e3..605d0faf4 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -73,8 +73,8 @@ module LoginHelper
     # #   session[:"#{request.subdomain}_user_id"] = user.id
     # # end
 
-    session[:user_id] = user.id
-    # session[:"#{default_yun_session}"] = user.id
+    # session[:user_id] = user.id
+    session[:"#{default_yun_session}"] = user.id
     session[:ctime] = Time.now.utc.to_i
     session[:atime] = Time.now.utc.to_i
   end