Merge branch 'fix/path' into 'develop'

Merge of fix/path to develop 修复路径转发bug

See merge request o2oa/o2oa!663

o2web/source/o2_core/o2.js

@@ -273,10 +273,19 @@
             }
         }
 
-        if (!window.layout) window.layout = {};
-        if (!window.layout.config) o2.JSON.get("../x_desktop/res/config/config.json", function(config){
-            window.layout.config = config;
-        }, null, false);
+        // if (!window.layout) window.layout = {};
+        // if (!window.layout.config){
+        //     new Request.JSON({
+        //         url: "../x_desktop/res/config/config.json",
+        //         secure: false,
+        //         method: "get",
+        //         noCache: true,
+        //         async: false,
+        //         onSuccess: function(responseJSON, responseText){
+        //             window.layout.config = responseJSON;
+        //         }.bind(this),
+        //     }).send();
+        // }
 
         if (window.layout && layout.config && layout.config.urlMapping){
             for (var k in layout.config.urlMapping){

o2web/source/x_desktop/sso.html

@@ -71,6 +71,8 @@
 
         o2.addReady(function(){
             o2.JSON.get("res/config/config.json", function(config){
+                if (!window.layout) window.layout = {};
+                window.layout.config = config;
                 getServiceAddress(config, function(address){
                     var uri = new URI(window.location.toString());
                     var xtoken = uri.getData("xtoken");
@@ -79,7 +81,7 @@
                     if (xtoken){
                         var res = new Request.JSON({
                             //url: "http://hbxa01.bf.ctc.com:20080/x_organization_assemble_authentication/jaxrs/sso",
-                            url: address+"/jaxrs/sso",
+                            url: o2.filterUrl(address+"/jaxrs/sso"),
                             secure: false,
                             method: "POST",
                             noCache: true,