Browse Source

删除cookie失败问题

李顺 3 years ago
parent
commit
a2ca522a41

+ 12 - 4
src/controlPanel/js/login.js

@@ -95,10 +95,18 @@ function load() {
         var exp = new Date();
         let token = getCookies("token");
         exp.setTime(exp.getTime() - 1);
-        Cookies.remove(hex_sha1("token"));
-        Cookies.remove(hex_sha1("username"));
-        Cookies.remove(hex_sha1("systemmodeid"));
-        Cookies.remove(hex_sha1("systemid"));
+        Cookies.remove(hex_sha1("token"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("username"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("systemmodeid"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("systemid"),{
+            path: COOKIE_PATH
+        });
         window.location.href = SYS_ADDR + "/login/";
     }
 

+ 9 - 3
src/login/js/login.js

@@ -135,9 +135,15 @@ function load() {
                 path: SYS_ADDR
             });
         } else {
-            Cookies.remove(hex_sha1("remember"));
-            Cookies.remove(hex_sha1("username"));
-            Cookies.remove(hex_sha1("psw"));
+            Cookies.remove(hex_sha1("remember"),{
+                path: COOKIE_PATH
+            });
+            Cookies.remove(hex_sha1("username"),{
+                path: COOKIE_PATH
+            });
+            Cookies.remove(hex_sha1("psw"),{
+                path: COOKIE_PATH
+            });
         }
 
         if (result.code == 1) {

+ 9 - 3
src/loginWithMSG/js/login.js

@@ -202,9 +202,15 @@ function load() {
                 path: SYS_ADDR
             });
         } else {
-            Cookies.remove(hex_sha1("remember"));
-            Cookies.remove(hex_sha1("username"));
-            Cookies.remove(hex_sha1("psw"));
+            Cookies.remove(hex_sha1("remember"),{
+                path: COOKIE_PATH
+            });
+            Cookies.remove(hex_sha1("username"),{
+                path: COOKIE_PATH
+            });
+            Cookies.remove(hex_sha1("psw"),{
+                path: COOKIE_PATH
+            });
         }
 
         if (result.code == 1) {

+ 4 - 1
src/main.ts

@@ -1,4 +1,5 @@
 var configFile = "configure.js";
+var COOKIE_PATH = location.pathname;
 require({}, [configFile], (AppX) => {
     //加载配置文件
     loadApp(AppX);
@@ -107,7 +108,9 @@ function loadApp(AppX: AppX) {
                             require(AppX.dojoConfig, ['core/LoadManager.class'], function (LoadManager) {
                                 (new LoadManager).load(AppX.appConfig.homePageStartWidgets);
                             });
-                            Cookies.remove(hex_sha1("enterBigScreen"));
+                            Cookies.remove(hex_sha1("enterBigScreen"),{
+                                path: COOKIE_PATH
+                            });
                         }else {
                             require(AppX.dojoConfig, ['core/LoadManager.class'], function (LoadManager) {
                                 (new LoadManager).load(AppX.appConfig.loadOnStartWidgets);

+ 21 - 7
src/projectSelectPanel/js/login.js

@@ -78,10 +78,18 @@ function load() {
         var exp = new Date();
         let token = getCookies("token");
         exp.setTime(exp.getTime() - 1);
-        Cookies.remove(hex_sha1("token"));
-        Cookies.remove(hex_sha1("username"));
-        Cookies.remove(hex_sha1("systemmodeid"));
-        Cookies.remove(hex_sha1("systemid"));
+        Cookies.remove(hex_sha1("token"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("username"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("systemmodeid"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("systemid"),{
+            path: COOKIE_PATH
+        });
         window.location.href = SYS_ADDR + "/login/";
     }
 
@@ -271,9 +279,15 @@ function load() {
     }
     function enterBigScreen(){
         //清除cookies
-        Cookies.remove(hex_sha1("enterBigScreen"));
-        Cookies.remove(hex_sha1("bigScreenPrjId"));
-        Cookies.remove(hex_sha1("bigScreenPrjName"));
+        Cookies.remove(hex_sha1("enterBigScreen"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("bigScreenPrjId"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("bigScreenPrjName"),{
+            path: COOKIE_PATH
+        });
         $(".enterBigScreen").off('click').on('click', function () {
             //设置cookies
             Cookies.set(hex_sha1("enterBigScreen"), Secret_Key("true", 'encryption'), {

+ 12 - 4
src/widgets/Header/Widget.ts

@@ -378,10 +378,18 @@ class Header extends BaseWidget {
         $(window).unbind('unload');
         var exp = new Date();
         exp.setTime(exp.getTime() - 1);
-        Cookies.remove(hex_sha1("token"));
-        Cookies.remove(hex_sha1("username"));
-        Cookies.remove(hex_sha1("systemmodeid"));
-        Cookies.remove(hex_sha1("systemid"));
+        Cookies.remove(hex_sha1("token"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("username"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("systemmodeid"),{
+            path: COOKIE_PATH
+        });
+        Cookies.remove(hex_sha1("systemid"),{
+            path: COOKIE_PATH
+        });
         window.location.href = window.location.href.replace(/\/+$/, "/login/");
     }
 

+ 13 - 4
src/widgets/ListenJqueryAjax/Widget.ts

@@ -51,15 +51,24 @@ class ListenJqueryAjax extends BaseWidget {
         var Obj = this.popup.show("提示", html);
         $(".content-tit .pull-right.btn-hide").attr("style", "display:none");
         Obj.closeObj.hide();
+        const COOKIE_PATH = location.pathname;
         Obj.submitObj.off("click").on("click", function (e) {
             $(window).unbind('beforeunload');
             $(window).unbind('unload');
             var exp = new Date();
             exp.setTime(exp.getTime() - 1);
-            Cookies.remove(hex_sha1("token"));
-            Cookies.remove(hex_sha1("username"));
-            Cookies.remove(hex_sha1("systemmodeid"));
-            Cookies.remove(hex_sha1("systemid"));
+            Cookies.remove(hex_sha1("token"),{
+                path: COOKIE_PATH
+            });
+            Cookies.remove(hex_sha1("username"),{
+                path: COOKIE_PATH
+            });
+            Cookies.remove(hex_sha1("systemmodeid"),{
+                path: COOKIE_PATH
+            });
+            Cookies.remove(hex_sha1("systemid"),{
+                path: COOKIE_PATH
+            });
             window.location.href = window.location.href.replace(/\/+$/, "/login/");
         }.bind(this));
     }