Merge branch 'develop' into dev_aliyun

app/controllers/accounts_controller.rb

@@ -60,7 +60,8 @@ class AccountsController < ApplicationController
         ua = UserAgent.find_by_ip(ip)
         ua.update_column(:agent_type, UserAgent::USER_REGISTER) if ua
         successful_authentication(@user)
-        session[:user_id] = @user.id
+        # session[:user_id] = @user.id
+        session[:"#{default_yun_session}"] = @user.id
         normal_status("注册成功")
       end
     rescue Exception => e
@@ -94,7 +95,7 @@ class AccountsController < ApplicationController
     successful_authentication(@user)
     login_control.clear # 重置每日密码错误次数
 
-    session[:user_id] = @user.id
+    # session[:user_id] = @user.id
   end
 
   # 忘记密码
@@ -158,7 +159,7 @@ class AccountsController < ApplicationController
 
   def logout
     UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip)
-    session[:user_id] = nil
+    session[:"#{default_yun_session}"] = nil
     logout_user
     render :json => {status: 1, message: "退出成功!"}
   end

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

app/controllers/concerns/login_helper.rb

@@ -47,7 +47,7 @@ module LoginHelper
       User.current.delete_session_token(session[:tk])
       self.logged_user = nil
     end
-    session[:user_id] = nil
+    session[:"#{default_yun_session}"] = nil
   end
 
   # Sets the logged in user
@@ -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

app/controllers/oauth/base_controller.rb

@@ -12,7 +12,8 @@ class Oauth::BaseController < ActionController::Base
   private
 
   def session_user_id
-    session[:user_id]
+    # session[:user_id]
+    session[:"#{default_yun_session}"]
   end
 
   def current_user

app/controllers/weapps/registers_controller.rb

@@ -48,7 +48,8 @@ class Weapps::RegistersController < Weapps::BaseController
       )
     end
     successful_authentication(@user)
-    session[:user_id] = @user.id
+    # session[:user_id] = @user.id
+    session[:"#{default_yun_session}"] = @user.id
 
     # render_ok(user_id: @user.id)
   end