fix: refresh token after token overdue

@@ -14,7 +14,7 @@ const GLOBAL_TOKEN = (() => {
 	const common = ls.get(GLOBAL_STORAGE_KEY)
 	const common = ls.get(GLOBAL_STORAGE_KEY)
 	return {
 	return {
 		token: common && common.JWT_TOKEN && common.JWT_TOKEN.value,
 		token: common && common.JWT_TOKEN && common.JWT_TOKEN.value,
-		refreshToken: common && common.JWT_TOKEN && common.JWT_TOKEN.value,
+		refreshToken: common && common.REFRESH_TOKEN && common.REFRESH_TOKEN.value,
 	}
 	}
 })()
 })()
 
 

@@ -56,7 +56,7 @@ const createStorage = (
 		timeout = null,
 		timeout = null,
 		hasEncrypt = !isDEV,
 		hasEncrypt = !isDEV,
 	} = {}) => {
 	} = {}) => {
-	if (hasEncrypt && [ key.length, iv.length ].some((item) => item !== 16)) {
+	if (hasEncrypt && [key.length, iv.length].some((item) => item !== 16)) {
 		throw new Error('When hasEncrypt is true, the key or iv must be 16 bits!');
 		throw new Error('When hasEncrypt is true, the key or iv must be 16 bits!');
 	}
 	}
 
 
@@ -86,7 +86,7 @@ const createStorage = (
 		}
 		}
 
 
 		getKey(key) {
 		getKey(key) {
-			return `${ this.prefixKey }${ key }`.toUpperCase();
+			return `${this.prefixKey}${key}`.toUpperCase();
 		}
 		}
 
 
 		/**
 		/**
@@ -110,6 +110,19 @@ const createStorage = (
 			this.storage.setItem(this.getKey(key), stringifyValue);
 			this.storage.setItem(this.getKey(key), stringifyValue);
 		}
 		}
 
 
+		generatorValue(key, value, expire = timeout) {
+			const stringData = {
+				value,
+				time: Date.now(),
+				expire: !isNullOrUnDef(expire) ? new Date().getTime() + expire * 1000 : null,
+			};
+			const stringifyValue = this.hasEncrypt
+				? this.encryption.encryptByAES(stringData)
+				: stringData;
+
+			return stringifyValue
+		}
+
 		/**
 		/**
 		 *Read cache
 		 *Read cache
 		 * @param {string} key
 		 * @param {string} key
@@ -117,17 +130,20 @@ const createStorage = (
 		 * @memberof Cache
 		 * @memberof Cache
 		 */
 		 */
 		get(key, def = null) {
 		get(key, def = null) {
+			console.log(this.getKey(key))
 			const val = this.storage.getItem(this.getKey(key));
 			const val = this.storage.getItem(this.getKey(key));
 			if (!val) return def;
 			if (!val) return def;
 
 
 			try {
 			try {
 				const decVal = this.hasEncrypt ? this.encryption.decryptByAES(val) : val;
 				const decVal = this.hasEncrypt ? this.encryption.decryptByAES(val) : val;
 				const data = JSON.parse(decVal);
 				const data = JSON.parse(decVal);
+				console.log(data)
 				const { value, expire } = data;
 				const { value, expire } = data;
-				if (isNullOrUnDef(expire) || expire >= new Date().getTime()) {
-					return value;
-				}
-				this.remove(key);
+				// if (isNullOrUnDef(expire) || expire >= new Date().getTime()) {
+				// return value;
+				// }
+				return value
+				// this.remove(key);
 			} catch (e) {
 			} catch (e) {
 				return def;
 				return def;
 			}
 			}
@@ -150,4 +166,4 @@ const createStorage = (
 		}
 		}
 	};
 	};
 	return new WebStorage();
 	return new WebStorage();
-}
+}

+let requestQueue = []
+
+const JWT_TOKEN_KEY = 'JWT_TOKEN';
+const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN';
 /**
 /**
  * custom http request
  * custom http request
  */
  */
@@ -16,7 +20,11 @@ function createAxios(options) {
 
 
   instance.interceptors.request.use((config) => {
   instance.interceptors.request.use((config) => {
     config.headers["X-Authorization"] = "Bearer " + GLOBAL_TOKEN.token
     config.headers["X-Authorization"] = "Bearer " + GLOBAL_TOKEN.token
+
     return config
     return config
+  }, (error) => {
+    console.log(error)
+    return error
   })
   })
 
 
   /**
   /**
@@ -28,10 +36,73 @@ function createAxios(options) {
     },
     },
     function (error) {
     function (error) {
       if (error.response.status == 401) {
       if (error.response.status == 401) {
-        layer.alert('登录超时,请重新登录');
+        // layer.alert('登录超时,请重新登录');
+        // const config = error.config
+        // const url = config.url
+        // const method = config.method
+        // const data = config.data
+        // const flag = requestQueue.find(item => item.url === url)
+        // if (!flag) {
+        //   console.log(url, method, data)
+        //   requestQueue.push({ url, method, data })
+        // }
+
+        doRefreshToken()
       }
       }
       return Promise.reject(error);
       return Promise.reject(error);
     }
     }
   );
   );
   return instance;
   return instance;
 }
 }
+
+
+/**
+ * @description refresh token
+ * @param {} params 
+ * @returns 
+ */
+function doRefreshToken(params) {
+  const refreshToken = GLOBAL_TOKEN.refreshToken
+  console.log(GLOBAL_TOKEN)
+  return new Promise((resolve, reject) => {
+    axios.post('/api/auth/token',
+      { refreshToken },
+      {
+        headers: {
+          "content-type": "application/json; charset=UTF-8",
+          "X-Authorization": "Bearer " + GLOBAL_TOKEN.token,
+        },
+      })
+      .then(res => {
+
+        // 存储token
+        const { refreshToken, token } = res.data
+        Object.assign(GLOBAL_TOKEN, { refreshToken, token })
+        const ls = createStorage({ storage: localStorage })
+        const originData = ls.get(GLOBAL_STORAGE_KEY)
+        const newRefreshToken = ls.generatorValue(REFRESH_TOKEN_KEY, refreshToken, true)
+        const newToken = ls.generatorValue(REFRESH_TOKEN_KEY, token, true)
+        console.log(Object.assign(originData, { [REFRESH_TOKEN_KEY]: newRefreshToken, [JWT_TOKEN_KEY]: newToken }))
+        ls.set(GLOBAL_STORAGE_KEY, Object.assign(originData, { [REFRESH_TOKEN_KEY]: newRefreshToken, [JWT_TOKEN_KEY]: newToken }), true)
+
+        // try {
+        //   requestQueue.forEach(item => {
+        //     const { method, url, data } = item
+        //     console.log({ item })
+        //     defHttp[method](url, data)
+        //   })
+        //   requestQueue = []
+        // } catch (error) {
+
+        // }
+
+        window.location.reload()
+        resolve()
+      })
+      .catch((error) => {
+        const { origin } = window.location
+        window.location.href = `${origin}/login`
+        reject(error)
+      })
+  })
+}