修复websocket端口

o2web/source/o2_core/o2/xDesktop/Common.js

@@ -550,7 +550,7 @@ MWF.xDesktop.getServiceAddressConfigObject = function(center, callback, error){
                 var serviceAddressList = json.data;
                 if (layout.config.proxyApplicationEnable){
                     Object.keys(serviceAddressList).forEach(function(k){
-                        serviceAddressList[k].port = window.location.port;
+                        if (k!=="x_message_assemble_communicate") serviceAddressList[k].port = window.location.port;
                     })
                 }
                 if (callback) callback(serviceAddressList, center);

o2web/source/x_desktop/js/base_loader.js

@@ -317,7 +317,7 @@ if (!layout.isReady) {
                 if (o2.typeOf(config.center)==="array"){
                     config.center.forEach(function(c){
                         c.port = window.location.port;
-                    })
+                    });
                 }else{
                     config.port = window.location.port;
                 }

o2web/source/x_desktop/js/sso.js

@@ -72,7 +72,7 @@ function getServiceAddressConfigObject(callback, center){
         var serviceAddressList = json.data;
         if (layout.config.proxyApplicationEnable){
             Object.keys(serviceAddressList).forEach(function(k){
-                serviceAddressList[k].port = window.location.port;
+                if (k!=="x_message_assemble_communicate") serviceAddressList[k].port = window.location.port;
             });
         }
         window.layout.serviceAddressList = serviceAddressList;

o2web/source/x_desktop/js/x.js

-/**
- * Created by TOMMY on 2015/11/14.
- */
 layout.addReady(function(){
     (function(layout){
         layout.inBrowser = false;
@@ -50,66 +47,3 @@ layout.addReady(function(){
         }
     })(layout);
 });
-
-/*
-
-
-layout = (window["layout"]) ? window["layout"] : {};
-var locate = window.location;
-layout.protocol = locate.protocol;
-layout.session = layout.session || {};
-layout["debugger"] = o2.session.isDebugger;
-
-
-
-o2.addReady(function(){
-    o2.loadLP(o2.language);
-    var loadingNode = $("browser_loading");
-
-    o2.require(["o2.widget.Common","o2.xDesktop.Common"], function(){
-        o2.require([
-            "o2.xDesktop.UserData",
-            "o2.xDesktop.Actions.RestActions",
-            "o2.xAction.RestActions",
-            "o2.xDesktop.Authentication",
-            "o2.widget.UUID",
-            ["Common", ""]
-        ], function(){
-            MWF.xDesktop.loadService(function(){
-                document.title = layout.config.title || layout.config.systemTitle || layout.config.footer || layout.config.systemName;
-
-
-                debugger;
-                MWF.xDesktop.checkLogin(function(){
-
-                    var layoutClass = "Layout";
-                    //var layoutClass = "Homepage";
-                    MWF.require("MWF.xDesktop."+layoutClass, function(){
-                        layout.desktop = new MWF.xDesktop[layoutClass]("layout", {
-                            "onLoad": function(){
-                                if (loadingNode){
-                                    new Fx.Tween(loadingNode).start("opacity", 0).chain(function(){
-                                        loadingNode.destroy();
-                                        loadingNode = null;
-                                    });
-                                }
-                            },
-                            "onLogin": function(){
-                                if (loadingNode){
-                                    new Fx.Tween(loadingNode).start("opacity", 0).chain(function(){
-                                        loadingNode.destroy();
-                                    });
-                                }
-                            }
-                        });
-                    });
-
-                });
-            });
-        });
-    });
-    o2.load("../o2_lib/mootools/plugin/mBox-all.js");
-});
-
-
-*/