Browse Source

Merge branch 'fix/firefox_x-token' into 'develop'

Merge of fix/firefox_x-token to develop 修复问题:响应头中x-token获取不到,无法更新下次请求头的x-token信息

See merge request o2oa/o2oa!217
胡起 5 năm trước cách đây
mục cha
commit
74553845fc

+ 7 - 6
o2web/source/o2_core/o2/o2.core.js

@@ -305,12 +305,13 @@
             onSuccess: function(responseJSON, responseText){
             onSuccess: function(responseJSON, responseText){
                 // var xToken = this.getHeader("authorization");
                 // var xToken = this.getHeader("authorization");
                 // if (!xToken) xToken = this.getHeader("x-token");
                 // if (!xToken) xToken = this.getHeader("x-token");
-                // if (xToken){
-                //     if (layout){
-                //         if (!layout.session) layout.session = {};
-                //         layout.session.token = xToken;
-                //     }
-                // }
+                var xToken = this.getHeader("x-token");
+                if (xToken){
+                    if (layout){
+                        if (!layout.session) layout.session = {};
+                        layout.session.token = xToken;
+                    }
+                }
                 o2.runCallback(callback, "success", [responseJSON]);
                 o2.runCallback(callback, "success", [responseJSON]);
             },
             },
             onFailure: function(xhr){
             onFailure: function(xhr){