Merge branch 'fix/forum_logout' into 'develop'

Merge of fix/[论坛管理]修复论坛不能正确注销的问题 to develop

See merge request o2oa/o2oa!1299

o2web/source/x_component_Forum/TopNode.js

@@ -346,11 +346,25 @@ MWF.xApplication.Forum.TopNode = new Class({
         });
     },
     logout: function(){
-        MWF.Actions.get("x_organization_assemble_authentication").logout( function(){
+
+        MWF.Actions.get("x_organization_assemble_authentication").logout(function () {
+            if (this.socket) {
+                this.socket.close();
+                this.socket = null;
+            }
+            Cookie.dispose("x-token");
+            if (layout.session && layout.session.user) layout.session.user.token = "";
+
             layout.desktop.session.user.distinguishedName = "anonymous";
             this.app.clearContent();
             this.app.loadApplicationContent();
             this.openLoginForm();
-        }.bind(this))
+
+            // if( callback ){
+            //     callback()
+            // }else{
+            //      window.location.reload();
+            // }
+        }.bind(this));
     }
 });

o2web/source/x_desktop/js/forum.js

@@ -16,6 +16,10 @@ o2.addReady(function(){
 
         MWF.require("MWF.xDesktop.Layout", function(){
             MWF.require("MWF.xDesktop.Authentication", null, false);
+            MWF.require("MWF.xDesktop.Common", null, false);
+            MWF.require("MWF.xDesktop.Access", null, false);
+            MWF.require("MWF.xAction.RestActions", null, false);
+            MWF.require("MWF.xDesktop.Actions.RestActions", null, false);
             MWF.xDesktop.requireApp("Common", "", null, false);
             (function(){
                 layout.requireApp = function(appNames, callback, clazzName){