From f90807ebc6358a5354b8a6c5ae374ed1a7b2b0f5 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 6 Jun 2022 10:23:33 +0800
Subject: [PATCH] =?UTF-8?q?token=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue          | 5 ++---
 utils/request.js | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/App.vue b/App.vue
index c7e2217..b64374f 100644
--- a/App.vue
+++ b/App.vue
@@ -1,5 +1,3 @@
-
-
 <script>
 /**
  * vuex管理登录状态，具体可以参考官方登录模板示例
@@ -7,7 +5,8 @@
 import { mapMutations } from "vuex";
 import APPUpdate from "@/plugins/APPUpdate";
 import { getClipboardData } from "@/js_sdk/h5-copy/h5-copy.js";
-import config from "@/config/config";
+import config from "@/config/config";
+import storage from "@/utils/storage.js";
 // 悬浮球
 
 export default {
diff --git a/utils/request.js b/utils/request.js
index 17cf14a..3cb42cc 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -119,9 +119,11 @@ http.interceptors.response.use(
       response.data.status === 403
     ) {
       if (!isRefreshing) {
+		console.log('旧token',token) 
         isRefreshing = true;
+		let oldRefreshToken = storage.getRefreshToken();
         //调用刷新token的接口
-        return refreshTokenFn(storage.getRefreshToken())
+        return refreshTokenFn(oldRefreshToken)
           .then((res) => {
             let { accessToken, refreshToken } = res.data.result;
             storage.setAccessToken(accessToken);
@@ -129,11 +131,13 @@ http.interceptors.response.use(
 
             response.header.accessToken = `${accessToken}`;
             // token 刷新后将数组的方法重新执行
+			console.log('接口队列',requests,'新token',accessToken) 
             requests.forEach((cb) => cb(accessToken));
             requests = []; // 重新请求完清空
             return http.request(response.config);
           })
           .catch((err) => {
+			console.log('刷新token报错'+oldRefreshToken,err)
             cleanStorage();
             return Promise.reject(err);
           })
@@ -153,9 +157,10 @@ http.interceptors.response.use(
 
       // 如果当前返回没登录
     } else if (
-      (!token && response.statusCode === 403) ||
+      (!token && !storage.getRefreshToken() && response.statusCode === 403) ||
       response.data.code === 403
     ) {
+	  console.log('没有token 以及刷新token 内容',token,storage.getRefreshToken())
       cleanStorage();
 
       // 如果当前状态码为正常但是success为不正常时