Merge branch 'feature/uniapp-support' into 'develop'

覆盖token

See merge request o2oa/o2oa!3006

o2web/source/x_desktop/js/base_loader.js

@@ -95,11 +95,34 @@ o2.addReady(function () {
             }
         };
 
+        // 是否ip
+        var _isIp = function(ip) {
+            var reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+            return reg.test(ip);
+        };
+        
+
         //修改支持x-token
         var uri = new URI(window.location.href);
         var options = uri.get("data");
         if (options["x-token"]) {
-            Cookie.write("x-token", options["x-token"]);
+            // 删除
+            Cookie.dispose("x-token");
+            // 写入
+            var host = window.location.host; // 域名 
+            var domain = null;
+            if (_isIp(host)) {
+                domain = host;
+            }else {
+                if (host.indexOf(".") > 0) {
+                    domain = host.substring(host.indexOf(".")); // 上级域名 如 .o2oa.net
+                }
+            }
+            if (domain) {
+                Cookie.write("x-token", options["x-token"], {domain: domain, path:"/"});
+            }else {
+                Cookie.write("x-token", options["x-token"]);
+            }
         }
 
         layout.sessionPromise = new Promise(function(resolve, reject){

o2web/source/x_desktop/js/cmsDocMobile.js

@@ -1,10 +1,31 @@
 layout.addReady(function () {
     //修改支持x-token
     (function(layout){
+        // 是否ip
+        var _isIp = function(ip) {
+            var reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+            return reg.test(ip);
+        };
         var uri = new URI(window.location.href);
         var options = uri.get("data");
         if (options["x-token"]) {
-            Cookie.write("x-token", options["x-token"]);
+            // 删除
+            Cookie.dispose("x-token");
+            // 写入
+            var host = window.location.host; // 域名 
+            var domain = null;
+            if (_isIp(host)) {
+                domain = host;
+            }else {
+                if (host.indexOf(".") > 0) {
+                    domain = host.substring(host.indexOf(".")); // 上级域名 如 .o2oa.net
+                }
+            }
+            if (domain) {
+                Cookie.write("x-token", options["x-token"], {domain: domain, path:"/"});
+            }else {
+                Cookie.write("x-token", options["x-token"]);
+            }
         }
         var _load = function () {
             debugger;

o2web/source/x_desktop/js/cmsDocMobile_bak.js

@@ -1,9 +1,30 @@
 o2.addReady(function () {
+    // 是否ip
+    var _isIp = function(ip) {
+        var reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+        return reg.test(ip);
+    };
     //修改支持x-token
     var uri = new URI(window.location.href);
     var options = uri.get("data");
     if (options["x-token"]) {
-        Cookie.write("x-token", options["x-token"]);
+        // 删除
+        Cookie.dispose("x-token");
+        // 写入
+        var host = window.location.host; // 域名 
+        var domain = null;
+        if (_isIp(host)) {
+            domain = host;
+        }else {
+            if (host.indexOf(".") > 0) {
+                domain = host.substring(host.indexOf(".")); // 上级域名 如 .o2oa.net
+            }
+        }
+        if (domain) {
+            Cookie.write("x-token", options["x-token"], {domain: domain, path:"/"});
+        }else {
+            Cookie.write("x-token", options["x-token"]);
+        }
     }
     layout.load = function () {
         this.options = uri.get("data");

o2web/source/x_desktop/js/forumDocMobile.js

@@ -10,11 +10,32 @@ o2.addReady(function () {
     o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], { "sequence": true }, function () {
         //MWF.defaultPath = "../x_desktop"+MWF.defaultPath;
 
+        // 是否ip
+        var _isIp = function(ip) {
+            var reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+            return reg.test(ip);
+        };
         //修改支持x-token
         var uri = new URI(window.location.href);
         var options = uri.get("data");
         if (options["x-token"]) {
-            Cookie.write("x-token", options["x-token"]);
+            // 删除
+            Cookie.dispose("x-token");
+            // 写入
+            var host = window.location.host; // 域名 
+            var domain = null;
+            if (_isIp(host)) {
+                domain = host;
+            }else {
+                if (host.indexOf(".") > 0) {
+                    domain = host.substring(host.indexOf(".")); // 上级域名 如 .o2oa.net
+                }
+            }
+            if (domain) {
+                Cookie.write("x-token", options["x-token"], {domain: domain, path:"/"});
+            }else {
+                Cookie.write("x-token", options["x-token"]);
+            }
         }
 
         MWF.loadLP("zh-cn");

o2web/source/x_desktop/js/qywxStartProcess.js

@@ -361,11 +361,32 @@ o2.addReady(function () {
             })(layout);
         };
 
+        // 是否ip
+        var _isIp = function(ip) {
+            var reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+            return reg.test(ip);
+        };
         //修改支持x-token
         var uri = new URI(window.location.href);
         var options = uri.get("data");
         if (options["x-token"]) {
-            Cookie.write("x-token", options["x-token"]);
+            // 删除
+            Cookie.dispose("x-token");
+            // 写入
+            var host = window.location.host; // 域名 
+            var domain = null;
+            if (_isIp(host)) {
+                domain = host;
+            }else {
+                if (host.indexOf(".") > 0) {
+                    domain = host.substring(host.indexOf(".")); // 上级域名 如 .o2oa.net
+                }
+            }
+            if (domain) {
+                Cookie.write("x-token", options["x-token"], {domain: domain, path:"/"});
+            }else {
+                Cookie.write("x-token", options["x-token"]);
+            }
         }
 
         //先判断用户是否登录