Ver código fonte

升级book-ui

dusenyao 1 ano atrás
pai
commit
d0fea1708f
3 arquivos alterados com 20 adições e 10 exclusões
  1. 6 6
      package-lock.json
  2. 1 1
      package.json
  3. 13 3
      src/utils/auth.js

+ 6 - 6
package-lock.json

@@ -11,7 +11,7 @@
         "@tinymce/tinymce-vue": "^3.2.8",
         "awe-dnd": "^0.3.4",
         "axios": "^1.6.8",
-        "book-ui": "file:../book-ui-0.3.72.tgz",
+        "book-ui": "file:../book-ui-0.3.73.tgz",
         "core-js": "^3.36.1",
         "dayjs": "^1.11.10",
         "element-ui": "^2.15.14",
@@ -5864,9 +5864,9 @@
       }
     },
     "node_modules/book-ui": {
-      "version": "0.3.72",
-      "resolved": "file:../book-ui-0.3.72.tgz",
-      "integrity": "sha512-BdX/K5hjZkVWJABOoYwRpzAAx+N6esX2LB7OiEShhxFGxzuevN/jUzZx7mbGcegyJoNHH0/JPKe2wIZt5wVBOA==",
+      "version": "0.3.73",
+      "resolved": "file:../book-ui-0.3.73.tgz",
+      "integrity": "sha512-sAHet5Pg+Llf3V8B/1EqknQYDvHDZNpDuQe5oM8wGiF/ioC8cGW5La4qZPFzvScQLwO2ZlVJ6KkBMXMb/lB9Xw==",
       "dependencies": {
         "awe-dnd": "^0.3.4",
         "axios": "^0.21.1",
@@ -26828,8 +26828,8 @@
       }
     },
     "book-ui": {
-      "version": "file:..\\book-ui-0.3.72.tgz",
-      "integrity": "sha512-BdX/K5hjZkVWJABOoYwRpzAAx+N6esX2LB7OiEShhxFGxzuevN/jUzZx7mbGcegyJoNHH0/JPKe2wIZt5wVBOA==",
+      "version": "file:..\\book-ui-0.3.73.tgz",
+      "integrity": "sha512-sAHet5Pg+Llf3V8B/1EqknQYDvHDZNpDuQe5oM8wGiF/ioC8cGW5La4qZPFzvScQLwO2ZlVJ6KkBMXMb/lB9Xw==",
       "requires": {
         "awe-dnd": "^0.3.4",
         "axios": "^0.21.1",

+ 1 - 1
package.json

@@ -16,7 +16,7 @@
     "@tinymce/tinymce-vue": "^3.2.8",
     "awe-dnd": "^0.3.4",
     "axios": "^1.6.8",
-    "book-ui": "file:../book-ui-0.3.72.tgz",
+    "book-ui": "file:../book-ui-0.3.73.tgz",
     "core-js": "^3.36.1",
     "dayjs": "^1.11.10",
     "element-ui": "^2.15.14",

+ 13 - 3
src/utils/auth.js

@@ -1,7 +1,9 @@
+import Cookies from 'js-cookie';
+
 const TokenKey = 'GCLS_Token';
 
 export function getSessionID() {
-  const token = localStorage.getItem(TokenKey);
+  const token = Cookies.get(TokenKey) || sessionStorage.getItem(TokenKey) || localStorage.getItem(TokenKey);
   if (token) {
     return JSON.parse(token)['session_id'];
   }
@@ -9,7 +11,7 @@ export function getSessionID() {
 }
 
 export function getToken() {
-  const token = localStorage.getItem(TokenKey);
+  const token = Cookies.get(TokenKey) || sessionStorage.getItem(TokenKey) || localStorage.getItem(TokenKey);
   if (token) {
     return { token: JSON.parse(token), isHas: true };
   }
@@ -19,17 +21,21 @@ export function getToken() {
 export function setToken(token) {
   const _token = typeof token === 'object' ? JSON.stringify(token) : '';
   localStorage.setItem(TokenKey, _token);
+  sessionStorage.setItem(TokenKey, _token);
+  Cookies.set(TokenKey, _token);
 }
 
 export function removeToken() {
   localStorage.removeItem(TokenKey);
+  sessionStorage.removeItem(TokenKey);
+  Cookies.remove(TokenKey);
 }
 
 // 系统信息
 const ConfigKey = 'GCLS_Config';
 
 export function getConfig() {
-  const token = localStorage.getItem(ConfigKey);
+  const token = Cookies.get(ConfigKey) || sessionStorage.getItem(ConfigKey) || localStorage.getItem(ConfigKey);
   if (token) {
     return { token: JSON.parse(token), isHas: true };
   }
@@ -39,8 +45,12 @@ export function getConfig() {
 export function setConfig(value) {
   let _val = typeof value === 'object' ? JSON.stringify(value) : '';
   localStorage.setItem(ConfigKey, _val);
+  sessionStorage.setItem(ConfigKey, _val);
+  Cookies.set(ConfigKey, _val);
 }
 
 export function removeConfig() {
   localStorage.removeItem(ConfigKey);
+  sessionStorage.removeItem(ConfigKey);
+  Cookies.remove(ConfigKey);
 }