Merge remote-tracking branch 'origin/develop' into develop

app/controllers/concerns/login_helper.rb

@@ -47,12 +47,16 @@ module LoginHelper
       User.current.delete_session_token(session[:tk])
       self.logged_user = nil
     end
+    # 云上实验室退出清理当前session
+    laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1))
+    default_yun_session = "#{laboratory.try(:identifier).split('.').first}_user_id"
+    # end
     session[:"#{default_yun_session}"] = nil
   end
 
   # Sets the logged in user
   def logged_user=(user)
-    reset_session
+    # reset_session
     if user && user.is_a?(User)
       User.current = user
       start_user_session(user)