Merge branch 'hotfix/fix_oauth_RestAcrion' into 'master'

Merge of hotfix/fix_oauth_RestAcrion to master

See merge request o2oa/o2oa!88

o2web/source/x_desktop/js/base_simple.js

@@ -201,6 +201,7 @@ o2.addReady(function () {
             o2.require("o2.widget.Common", null, false);
             o2.require("o2.xDesktop.Authentication", function () {
                 layout.authentication = new o2.xDesktop.Authentication({
+                    "style": "flat",
                     "onLogin": _load.bind(layout)
                 });
                 layout.authentication.loadLogin(document.body);

o2web/source/x_desktop/js/base_simple_anonymous.js

@@ -0,0 +1,381 @@
+layout = window.layout || {};
+layout.desktop = layout;
+var locate = window.location;
+layout.protocol = locate.protocol;
+layout.inBrowser = true;
+layout.session = layout.session || {};
+layout.debugger = (locate.href.toString().indexOf("debugger") !== -1);
+layout.anonymous = (locate.href.toString().indexOf("anonymous") !== -1);
+o2.xApplication = o2.xApplication || {};
+
+o2.xDesktop = o2.xDesktop || {};
+o2.xDesktop.requireApp = function (module, clazz, callback, async) {
+    o2.requireApp(module, clazz, callback, async);
+};
+o2.addReady(function () {
+    var loadingNode = $("loaddingArea");
+    var loadeds = 0;
+    var loadCount = 16;
+    var size = document.body.getSize();
+    var _closeLoadingNode = function () {
+        if (loadingNode) {
+            loadingNode.destroy();
+            loadingNode = null;
+        }
+
+    };
+    var _loadProgressBar = function (complete) {
+        if (loadingNode) {
+            if (complete) {
+                loadingNode.setStyles({ "width": "" + size.x + "px" });
+                //loadingNode.set('morph', {duration: 100}).morph({"width": ""+size.x+"px"});
+                window.setTimeout(_closeLoadingNode, 500);
+            } else {
+                loadeds++;
+                var p = (loadeds / loadCount) * size.x;
+                loadingNode.setStyles({ "width": "" + p + "px" });
+                //loadingNode.set('morph', {duration: 100}).morph({"width": ""+p+"px"});
+                if (loadeds >= loadCount) window.setTimeout(_closeLoadingNode, 500);
+            }
+        }
+    };
+
+    //异步载入必要模块
+    layout.config = null;
+    var configLoaded = false;
+    var lpLoaded = false;
+    var commonLoaded = false;
+    var lp = o2.session.path + "/lp/" + o2.language + ".js";
+    o2.load(lp, function () {
+        lpLoaded = true;
+        if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
+    });
+    var modules = ["o2.xDesktop.Common", "o2.xDesktop.Actions.RestActions", "o2.xAction.RestActions"];
+    o2.require(modules, {
+        "onSuccess": function () {
+            commonLoaded = true;
+            if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
+        }
+    });
+    o2.getJSON("/x_desktop/res/config/config.json", function (config) {
+        layout.config = config;
+        configLoaded = true
+        if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
+    });
+
+    var _getDistribute = function (callback) {
+        if (layout.config.app_protocol === "auto") {
+            layout.config.app_protocol = window.location.protocol;
+        }
+        o2.xDesktop.getServiceAddress(layout.config, function (service, center) {
+            layout.serviceAddressList = service;
+            layout.centerServer = center;
+            if (callback) callback();
+        }.bind(this));
+    };
+
+    var _load = function () {
+        var _loadApp = function (json) {
+            //用户已经登录
+            // layout.user = json.data;
+            // layout.session = {};
+            // layout.session.user = json.data;
+            (function (layout) {
+                var _loadResource = function (callback) {
+                    var isLoadedA = false;
+                    var isLoadedB = false;
+                    //var isLoadedC = false;
+
+                    var modules = [
+                        "o2.xDesktop.Dialog",
+                        "o2.xDesktop.UserData",
+                        "o2.xDesktop.Access",
+                        "o2.widget.UUID",
+                        "o2.xDesktop.Menu",
+                        "o2.xDesktop.Authentication",
+                        // "o2.xDesktop.shortcut",
+                        "o2.widget.PinYin",
+                        "o2.xDesktop.Access"
+                        // "o2.xDesktop.MessageMobile"
+                    ];
+                    //o2.xDesktop.requireApp("Common", "", null, false);
+                    var _check = function () { if (isLoadedA && isLoadedB) if (callback) callback(); };
+
+                    o2.load(["/o2_lib/mootools/plugin/mBox.min.js"], function () { isLoadedA = true; _check(); });
+                    o2.require("o2.widget.Common", function () {
+                        o2.require(modules, {
+                            "onSuccess": function () {
+                                o2.requireApp("Common", "", function () { isLoadedB = true; _check(); })
+                            }
+                        });
+                    });
+                };
+
+                var _loadContent = function () {
+                    //_loadResource(function () {
+                        while (layout.readys && layout.readys.length) {
+                            layout.readys.shift().apply(window);
+                        }
+
+                    //});
+                };
+
+                _loadContent();
+            })(layout);
+        };
+        // var json = {
+        //     user: "anonymous",
+        //         session: {
+        //     user: {
+        //         name: "anonymous",
+        //             roleList: []
+        //     }
+        // }
+        _loadApp({});
+    };
+});
+
+(function (layout) {
+    layout.readys = [];
+    layout.addReady = function () {
+        for (var i = 0; i < arguments.length; i++) {
+            if (o2.typeOf(arguments[i]) === "function") layout.readys.push(arguments[i]);
+        }
+    };
+    var _requireApp = function (appNames, callback, clazzName) {
+        var appPath = appNames.split(".");
+        var baseObject = o2.xApplication;
+        appPath.each(function (path, i) {
+            if (i < (appPath.length - 1)) {
+                baseObject[path] = baseObject[path] || {};
+            } else {
+                baseObject[path] = baseObject[path] || { "options": Object.clone(o2.xApplication.Common.options) };
+            }
+            baseObject = baseObject[path];
+        }.bind(this));
+        if (!baseObject.options) baseObject.options = Object.clone(o2.xApplication.Common.options);
+
+        var _lpLoaded = false;
+        o2.xDesktop.requireApp(appNames, "lp." + o2.language, {
+            "failure": function () {
+                o2.xDesktop.requireApp(appNames, "lp.zh-cn", null, false);
+            }.bind(this)
+        }, false);
+
+        o2.xDesktop.requireApp(appNames, clazzName, function () {
+            if (callback) callback(baseObject);
+        });
+    };
+    var _createNewApplication = function (e, appNamespace, appName, options, statusObj) {
+        debugger;
+        var app = new appNamespace["Main"](this, options);
+        app.desktop = layout;
+        app.inBrowser = true;
+        app.status = statusObj;
+
+        app.load(true);
+
+        var appId = appName;
+        if (options.appId) {
+            appId = options.appId;
+        } else {
+            if (appNamespace.options.multitask) appId = appId + "-" + (new o2.widget.UUID());
+        }
+        app.appId = appId;
+        layout.app = app;
+        layout.desktop.currentApp = app;
+
+        var mask = document.getElementById("appContentMask");
+        if (mask) mask.destroy();
+    };
+
+    var _openWorkAndroid = function (options) {
+        if (window.o2android && window.o2android.openO2Work) {
+            if (options.workId) {
+                window.o2android.openO2Work(options.workId, "", options.title || "");
+            } else if (options.workCompletedId) {
+                window.o2android.openO2Work("", options.workCompletedId, options.title || "");
+            }
+            return true;
+        }
+        return false;
+    };
+    var _openWorkIOS = function (options) {
+        if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Work) {
+            if (options.workId) {
+                window.webkit.messageHandlers.openO2Work.postMessage({
+                    "work": options.workId,
+                    "workCompleted": "",
+                    "title": options.title || ""
+                });
+            } else if (options.workCompletedId) {
+                window.webkit.messageHandlers.openO2Work.postMessage({
+                    "work": "",
+                    "workCompleted": options.workCompletedId,
+                    "title": options.title || ""
+                });
+            }
+            return true;
+        }
+        return false;
+    };
+    var _openWorkHTML = function (options) {
+        var uri = new URI(window.location.href);
+        var redirectlink = uri.getData("redirectlink");
+        if (!redirectlink) {
+            redirectlink = encodeURIComponent(locate.pathname + locate.search);
+        } else {
+            redirectlink = encodeURIComponent(redirectlink);
+        }
+        if (options.workId) {
+            window.location = "workmobilewithaction.html?workid=" + options.workId + ((layout.debugger) ? "&debugger" : "") + "&redirectlink=" + redirectlink;
+        } else if (options.workCompletedId) {
+            window.location = "workmobilewithaction.html?workcompletedid=" + options.workCompletedId + ((layout.debugger) ? "&debugger" : "") + "&redirectlink=" + redirectlink;
+        }
+    };
+    var _openWork = function (options) {
+        if (!_openWorkAndroid(options)) if (!_openWorkIOS(options)) _openWorkHTML(options);
+    };
+    var _openDocument = function (appNames, options, statusObj) {
+        var title = typeOf(options) === "object" ? (options.docTitle || options.title) : "";
+        title = title || "";
+        var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
+        if (window.o2android && window.o2android.openO2CmsDocument) {
+            window.o2android.openO2CmsDocument(options.documentId, title);
+        } else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2CmsDocument) {
+            window.webkit.messageHandlers.openO2CmsDocument.postMessage({ "docId": options.documentId, "docTitle": title });
+        } else {
+            window.location = "appMobile.html?" + par + ((layout.debugger) ? "&debugger" : "");
+        }
+    };
+    var _openCms = function (appNames, options, statusObj) {
+        var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
+        if (window.o2android && window.o2android.openO2CmsApplication) {
+            window.o2android.openO2CmsApplication(options.columnId, options.title || "");
+        } else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2CmsApplication) {
+            window.webkit.messageHandlers.openO2CmsApplication.postMessage(options.columnId);
+        } else {
+            window.location = "appMobile.html?" + par + ((layout.debugger) ? "&debugger" : "");
+        }
+    };
+    var _openMeeting = function (appNames, options, statusObj) {
+        var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
+        if (window.o2android && window.o2android.openO2Meeting) {
+            window.o2android.openO2Meeting("");
+        } else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Meeting) {
+            window.webkit.messageHandlers.openO2Meeting.postMessage("");
+        } else {
+            window.location = "appMobile.html?" + par + ((layout.debugger) ? "&debugger" : "");
+        }
+    };
+
+    var _openCalendar = function (appNames, options, statusObj) {
+        var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
+        if (window.o2android && window.o2android.openO2Calendar) {
+            window.o2android.openO2Calendar("");
+        } else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Calendar) {
+            window.webkit.messageHandlers.openO2Calendar.postMessage("");
+        } else {
+            window.location = "appMobile.html?" + par + ((layout.debugger) ? "&debugger" : "");
+        }
+    };
+    var _openTaskCenter = function (appNames, options, statusObj) {
+        var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
+        var tab = ((options && options.navi) ? options.navi : "task").toLowerCase();
+        if (tab === "done") tab = "taskCompleted";
+        if (tab === "readed") tab = "readCompleted";
+
+        if (window.o2android && window.o2android.openO2WorkSpace) {
+            window.o2android.openO2WorkSpace(tab);
+        } else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2WorkSpace) {
+            window.webkit.messageHandlers.openO2WorkSpace.postMessage(tab);
+        } else {
+            window.location = "appMobile.html?" + par + ((layout.debugger) ? "&debugger" : "");
+        }
+    };
+
+    var _openApplicationMobile = function (appNames, options, statusObj) {
+        switch (appNames) {
+            case "process.Work":
+                _openWork(options);
+                break;
+            case "cms.Document":
+                _openDocument(appNames, options, statusObj);
+                break;
+            case "cms.Module":
+                _openCms(appNames, options, statusObj);
+                break;
+            case "Meeting":
+                _openMeeting(appNames, options, statusObj);
+                break;
+            case "Calendar":
+                _openCalendar(appNames, options, statusObj);
+                break;
+            case "process.TaskCenter":
+                _openTaskCenter(appNames, options, statusObj);
+                break;
+            default:
+                var uri = new URI(window.location.href);
+                var optionsStr = uri.getData("option");
+                var statusStr = uri.getData("status");
+                window.location = "appMobile.html?app=" + appNames + "&option=" + (optionsStr || "") + "&status=" + (statusStr || "") + ((layout.debugger) ? "&debugger" : "");
+        }
+    };
+
+    layout.openApplication = function (e, appNames, options, statusObj) {
+        if (layout.app) {
+            if (layout.mobile) {
+                _openApplicationMobile(appNames, options, statusObj);
+            } else {
+                var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
+
+                debugger;
+                if (layout.app.$openWithSelf) {
+                    return window.location = "app.html?" + par + ((layout.debugger) ? "&debugger" : "");
+                } else {
+                    return window.open("app.html?" + par + ((layout.debugger) ? "&debugger" : ""), par);
+                }
+            }
+        } else {
+            var appPath = appNames.split(".");
+            var appName = appPath[appPath.length - 1];
+
+            _requireApp(appNames, function (appNamespace) {
+                _createNewApplication(e, appNamespace, appName, options, statusObj);
+            }.bind(this));
+        }
+    };
+
+    layout.refreshApp = function (app) {
+        var status = app.recordStatus();
+
+        var uri = new URI(window.location.href);
+        var appNames = uri.getData("app");
+        var optionsStr = uri.getData("option");
+        var statusStr = uri.getData("status");
+        if (status) statusStr = JSON.encode(status);
+
+        var port = uri.get("port");
+        window.location = uri.get("scheme") + "://" + uri.get("host") + ((port) ? ":" + port + "/" : "") + uri.get("directory ") + "?app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent(statusStr) + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "") + ((layout.debugger) ? "&debugger" : "");
+    };
+
+    layout.load = function (appNames, options, statusObj) {
+        // layout.message = new o2.xDesktop.MessageMobile();
+        // layout.message.load();
+
+        layout.apps = [];
+        layout.node = $("layout");
+        var appName = appNames, m_status = statusObj, option = options;
+
+        var topWindow = window.opener;
+        if (topWindow) {
+            try {
+                if (!appName) appName = topWindow.layout.desktop.openBrowserApp;
+                if (!m_status) m_status = topWindow.layout.desktop.openBrowserStatus;
+                if (!option) option = topWindow.layout.desktop.openBrowserOption;
+            } catch (e) { }
+        }
+        layout.openApplication(null, appName, option || {}, m_status);
+    }
+
+})(layout);

o2web/source/x_desktop/oauth.html

@@ -14,155 +14,288 @@
     <script src="../o2_core/o2.min.js"></script>
     <script src="../o2_core/compatible.min.js"></script>
     <script src="../o2_lib/Decimal.js"></script>
+    <script src="js/base_simple_anonymous.js"></script>
     <script>
 
-        o2.addReady(function () {
-            layout = window.layout || {};
-            layout.desktop = layout;
-            o2.xDesktop = o2.xDesktop || {};
-
-            var locate = window.location;
-            var protocol = locate.protocol;
-            var href = locate.href;
-
-            var uri = new URI(href);
-            var oauth = uri.getData("oauth");
-            var redirect = uri.getData("redirect");
-            var code = uri.getData("code");
-            var method = uri.getData("method");
-
-            layout.load = function () {
-                if (code) {
-                    layout.loginOauth();
-                } else if (oauth) {
-                    layout.loadOauth();
-                }
-
-            };
-            layout.loginOauth = function () {
-                var r = protocol + "//" + location.host + location.pathname;
-                r = r + "?oauth=" + oauth;
-                if (redirect) r = r + "&redirect=" + redirect;
-
-                var action = MWF.Actions.get("x_organization_assemble_authentication");
-                //企业微信单点登录
-                if (layout.isQywx()) {
-                    action["loginOauthQywxServer"](code, function () {
-                        if (redirect) {
-                            window.location = redirect;
-                        } else {
-                            window.location = "/";
-                        }
-                    }.bind(this));
-                } else if (layout.isDingding()) {
-                    action["loginOauthDingdingServer"](code, function () {
-                        if (redirect) {
-                            window.location = redirect;
-                        } else {
-                            window.location = "/";
-                        }
-                    }.bind(this));
-                } else {
-
-                    var logMethod = method || "loginOauthServer";
-                    action[logMethod](oauth, code, encodeURIComponent(r), function () {
-                        if (method === "oauthBind") {
-                            alert("用户绑定已成功！");
-                            window.close();
-                        } else {
+        layout.addReady(function(){
+            (function(layout){
+                var uri = new URI(window.location.href);
+                var locate = window.location;
+                var protocol = locate.protocol;
+                var href = locate.href;
+
+                //var uri = new URI(href);
+                var oauth = uri.getData("oauth");
+                var redirect = uri.getData("redirect");
+                var code = uri.getData("code");
+                var method = uri.getData("method");
+
+                var _load = function(){
+                    if (code) {
+                        layout.loginOauth();
+                    } else if (oauth) {
+                        layout.loadOauth();
+                    }
+                };
+
+                layout.loginOauth = function () {
+                    var r = protocol + "//" + location.host + location.pathname;
+                    r = r + "?oauth=" + oauth;
+                    if (redirect) r = r + "&redirect=" + redirect;
+
+                    var action = MWF.Actions.get("x_organization_assemble_authentication");
+                    //企业微信单点登录
+                    if (layout.isQywx()) {
+                        action["loginOauthQywxServer"](code, function () {
+                            if (redirect) {
+                                window.location = redirect;
+                            } else {
+                                window.location = "/";
+                            }
+                        }.bind(this));
+                    } else if (layout.isDingding()) {
+                        action["loginOauthDingdingServer"](code, function () {
                             if (redirect) {
                                 window.location = redirect;
                             } else {
                                 window.location = "/";
                             }
-                        }
-
-                    }.bind(this));
-                }
-
-            };
-            layout.loadOauth = function () {
-                var action = MWF.Actions.get("x_organization_assemble_authentication");
-                //企业微信单点登录
-                if (layout.isQywx()) {
-                    action.qywxOauthServer(function (json) {
-                        var qywxConfig = json.data || {};
-                        var url = "https://open.work.weixin.qq.com/wwopen/sso/qrConnect?state=STATE";
-                        var corpId = qywxConfig.corpId;
-                        if (corpId) {
-                            url += "&appid=" + corpId;
-                        }
-                        var agentId = qywxConfig.agentId;
-                        if (agentId) {
-                            url += "&agentid=" + agentId;
-                        }
-                        var r = protocol + "//" + location.host + location.pathname;
-                        r = r + "?oauth=" + oauth + "&qywx=true";
-                        url += "&redirect_uri=" + encodeURIComponent(r);
-
-                        window.location = url;
-                    }.bind(this));
-                } else if (layout.isDingding()) { //钉钉单点登录
-                    action.dingdingOauthServer(function (json) {
-                        var dingdingConfig = json.data || {};
-                        var url = "https://oapi.dingtalk.com/connect/qrconnect?response_type=code&scope=snsapi_login&state=STATE";
-                        var appId = dingdingConfig.scanLoginAppId;
-                        if (appId) {
-                            url += "&appid=" + appId;
-                        }
-                        var r = protocol + "//" + location.host + location.pathname;
-                        r = r + "?oauth=" + oauth + "&dingding=true";
-                        url += "&redirect_uri=" + encodeURIComponent(r);
-                        window.location = url;
-                    }.bind(this));
-                } else {
-                    action.getOauthServer(oauth, function (json) {
-                        var url = json.data.authAddress;
-                        var p = json.data.authParameter;
-                        var r = protocol + "//" + location.host + location.pathname;
-                        r = r + "?oauth=" + oauth;
-                        if (method) r = r + "&method=" + method;
-                        if (redirect) r = r + "&redirect=" + redirect;
-                        p = (p) ? p + "&redirect_uri=" + encodeURIComponent(r) : "&redirect_uri=" + encodeURIComponent(r);
-                        url = (url.indexOf("?" === -1)) ? url + "?" + p : url + "&" + p;
-                        window.location = url;
-                    }.bind(this));
-                }
-            };
-            layout.isQywx = function () {
-                var qywx = uri.getData("qywx");
-                if (qywx) {
-                    return true;
-                } else {
-                    return false;
-                }
-            };
-            layout.isDingding = function () {
-                var dingding = uri.getData("dingding");
-                if (dingding) {
-                    return true;
-                } else {
-                    return false;
-                }
-            };
-
-            MWF.loadLP("zh-cn");
-            MWF.require("MWF.xDesktop.Common", null, false);
-            MWF.require("MWF.xAction.RestActions", null, false);
-
-            o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], { "sequence": true }, function () {
-                o2.JSON.get("res/config/config.json", function (config) {
-                    layout.config = config;
-                    MWF.xDesktop.getServiceAddress(config, function (service, center) {
-                        layout.serviceAddressList = service;
-                        layout.centerServer = center;
-                        layout.load();
-                    }.bind(this));
-                }.bind(this));
-            });
-            //});
+                        }.bind(this));
+                    } else {
+
+                        var logMethod = method || "loginOauthServer";
+                        action[logMethod](oauth, code, encodeURIComponent(r), function () {
+                            if (method === "oauthBind") {
+                                alert("用户绑定已成功！");
+                                window.close();
+                            } else {
+                                if (redirect) {
+                                    window.location = redirect;
+                                } else {
+                                    window.location = "/";
+                                }
+                            }
+
+                        }.bind(this));
+                    }
+
+                };
+                layout.loadOauth = function () {
+                    var action = MWF.Actions.get("x_organization_assemble_authentication");
+                    //企业微信单点登录
+                    if (layout.isQywx()) {
+                        action.qywxOauthServer(function (json) {
+                            var qywxConfig = json.data || {};
+                            var url = "https://open.work.weixin.qq.com/wwopen/sso/qrConnect?state=STATE";
+                            var corpId = qywxConfig.corpId;
+                            if (corpId) {
+                                url += "&appid=" + corpId;
+                            }
+                            var agentId = qywxConfig.agentId;
+                            if (agentId) {
+                                url += "&agentid=" + agentId;
+                            }
+                            var r = protocol + "//" + location.host + location.pathname;
+                            r = r + "?oauth=" + oauth + "&qywx=true";
+                            url += "&redirect_uri=" + encodeURIComponent(r);
+
+                            window.location = url;
+                        }.bind(this));
+                    } else if (layout.isDingding()) { //钉钉单点登录
+                        action.dingdingOauthServer(function (json) {
+                            var dingdingConfig = json.data || {};
+                            var url = "https://oapi.dingtalk.com/connect/qrconnect?response_type=code&scope=snsapi_login&state=STATE";
+                            var appId = dingdingConfig.scanLoginAppId;
+                            if (appId) {
+                                url += "&appid=" + appId;
+                            }
+                            var r = protocol + "//" + location.host + location.pathname;
+                            r = r + "?oauth=" + oauth + "&dingding=true";
+                            url += "&redirect_uri=" + encodeURIComponent(r);
+                            window.location = url;
+                        }.bind(this));
+                    } else {
+                        action.getOauthServer(oauth, function (json) {
+                            var url = json.data.authAddress;
+                            var p = json.data.authParameter;
+                            var r = protocol + "//" + location.host + location.pathname;
+                            r = r + "?oauth=" + oauth;
+                            if (method) r = r + "&method=" + method;
+                            if (redirect) r = r + "&redirect=" + redirect;
+                            p = (p) ? p + "&redirect_uri=" + encodeURIComponent(r) : "&redirect_uri=" + encodeURIComponent(r);
+                            url = (url.indexOf("?" === -1)) ? url + "?" + p : url + "&" + p;
+                            window.location = url;
+                        }.bind(this));
+                    }
+                };
+                layout.isQywx = function () {
+                    var qywx = uri.getData("qywx");
+                    if (qywx) {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                };
+                layout.isDingding = function () {
+                    var dingding = uri.getData("dingding");
+                    if (dingding) {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                };
+
+                _load();
+            })(layout);
         });
 
+        // o2.addReady(function () {
+        //     layout = window.layout || {};
+        //     layout.desktop = layout;
+        //     o2.xDesktop = o2.xDesktop || {};
+        //
+        //     var locate = window.location;
+        //     var protocol = locate.protocol;
+        //     var href = locate.href;
+        //
+        //     var uri = new URI(href);
+        //     var oauth = uri.getData("oauth");
+        //     var redirect = uri.getData("redirect");
+        //     var code = uri.getData("code");
+        //     var method = uri.getData("method");
+        //
+        //     layout.load = function () {
+        //         if (code) {
+        //             layout.loginOauth();
+        //         } else if (oauth) {
+        //             layout.loadOauth();
+        //         }
+        //
+        //     };
+        //     layout.loginOauth = function () {
+        //         var r = protocol + "//" + location.host + location.pathname;
+        //         r = r + "?oauth=" + oauth;
+        //         if (redirect) r = r + "&redirect=" + redirect;
+        //
+        //         var action = MWF.Actions.get("x_organization_assemble_authentication");
+        //         //企业微信单点登录
+        //         if (layout.isQywx()) {
+        //             action["loginOauthQywxServer"](code, function () {
+        //                 if (redirect) {
+        //                     window.location = redirect;
+        //                 } else {
+        //                     window.location = "/";
+        //                 }
+        //             }.bind(this));
+        //         } else if (layout.isDingding()) {
+        //             action["loginOauthDingdingServer"](code, function () {
+        //                 if (redirect) {
+        //                     window.location = redirect;
+        //                 } else {
+        //                     window.location = "/";
+        //                 }
+        //             }.bind(this));
+        //         } else {
+        //
+        //             var logMethod = method || "loginOauthServer";
+        //             action[logMethod](oauth, code, encodeURIComponent(r), function () {
+        //                 if (method === "oauthBind") {
+        //                     alert("用户绑定已成功！");
+        //                     window.close();
+        //                 } else {
+        //                     if (redirect) {
+        //                         window.location = redirect;
+        //                     } else {
+        //                         window.location = "/";
+        //                     }
+        //                 }
+        //
+        //             }.bind(this));
+        //         }
+        //
+        //     };
+        //     layout.loadOauth = function () {
+        //         var action = MWF.Actions.get("x_organization_assemble_authentication");
+        //         //企业微信单点登录
+        //         if (layout.isQywx()) {
+        //             action.qywxOauthServer(function (json) {
+        //                 var qywxConfig = json.data || {};
+        //                 var url = "https://open.work.weixin.qq.com/wwopen/sso/qrConnect?state=STATE";
+        //                 var corpId = qywxConfig.corpId;
+        //                 if (corpId) {
+        //                     url += "&appid=" + corpId;
+        //                 }
+        //                 var agentId = qywxConfig.agentId;
+        //                 if (agentId) {
+        //                     url += "&agentid=" + agentId;
+        //                 }
+        //                 var r = protocol + "//" + location.host + location.pathname;
+        //                 r = r + "?oauth=" + oauth + "&qywx=true";
+        //                 url += "&redirect_uri=" + encodeURIComponent(r);
+        //
+        //                 window.location = url;
+        //             }.bind(this));
+        //         } else if (layout.isDingding()) { //钉钉单点登录
+        //             action.dingdingOauthServer(function (json) {
+        //                 var dingdingConfig = json.data || {};
+        //                 var url = "https://oapi.dingtalk.com/connect/qrconnect?response_type=code&scope=snsapi_login&state=STATE";
+        //                 var appId = dingdingConfig.scanLoginAppId;
+        //                 if (appId) {
+        //                     url += "&appid=" + appId;
+        //                 }
+        //                 var r = protocol + "//" + location.host + location.pathname;
+        //                 r = r + "?oauth=" + oauth + "&dingding=true";
+        //                 url += "&redirect_uri=" + encodeURIComponent(r);
+        //                 window.location = url;
+        //             }.bind(this));
+        //         } else {
+        //             action.getOauthServer(oauth, function (json) {
+        //                 var url = json.data.authAddress;
+        //                 var p = json.data.authParameter;
+        //                 var r = protocol + "//" + location.host + location.pathname;
+        //                 r = r + "?oauth=" + oauth;
+        //                 if (method) r = r + "&method=" + method;
+        //                 if (redirect) r = r + "&redirect=" + redirect;
+        //                 p = (p) ? p + "&redirect_uri=" + encodeURIComponent(r) : "&redirect_uri=" + encodeURIComponent(r);
+        //                 url = (url.indexOf("?" === -1)) ? url + "?" + p : url + "&" + p;
+        //                 window.location = url;
+        //             }.bind(this));
+        //         }
+        //     };
+        //     layout.isQywx = function () {
+        //         var qywx = uri.getData("qywx");
+        //         if (qywx) {
+        //             return true;
+        //         } else {
+        //             return false;
+        //         }
+        //     };
+        //     layout.isDingding = function () {
+        //         var dingding = uri.getData("dingding");
+        //         if (dingding) {
+        //             return true;
+        //         } else {
+        //             return false;
+        //         }
+        //     };
+        //
+        //     MWF.loadLP("zh-cn");
+        //     MWF.require("MWF.xDesktop.Common", null, false);
+        //     MWF.require("MWF.xAction.RestActions", null, false);
+        //
+        //     o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], { "sequence": true }, function () {
+        //         o2.JSON.get("res/config/config.json", function (config) {
+        //             layout.config = config;
+        //             MWF.xDesktop.getServiceAddress(config, function (service, center) {
+        //                 layout.serviceAddressList = service;
+        //                 layout.centerServer = center;
+        //                 layout.load();
+        //             }.bind(this));
+        //         }.bind(this));
+        //     });
+        //     //});
+        // });
+
     </script>
     <script src="../o2_lib/mootools/mootools-1.6.0.min.js"></script>
 </head>