From ac2c07d6a9a211f921223d69a174c4e004f6c9d1 Mon Sep 17 00:00:00 2001
From: ToshiFourteen <toshifourteen@163.com>
Date: Tue, 18 May 2021 11:14:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtoken=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E6=88=96=E9=94=99=E8=AF=AF=E5=90=8E=20=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E4=B8=8D=E4=B8=8B=E6=9D=A5=20=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=8A=A5=E5=BE=88=E5=A4=9A=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 2fb95ac0..814af57d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,6 +3,20 @@ import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 
+function confirmReLogin() {
+  return new Promise((resolve, reject) => {
+    MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
+      confirmButtonText: 'Re-Login',
+      cancelButtonText: 'Cancel',
+      type: 'warning'
+    }).then(() => {
+      store.dispatch('user/resetToken').then(() => {
+        location.reload()
+      })
+    })
+  })
+}
+
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
@@ -42,30 +56,20 @@ service.interceptors.response.use(
    * Here is just an example
    * You can also judge the status by HTTP Status Code
    */
-  response => {
+  async response => {
     const res = response.data
 
-    // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 20000) {
+    // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
+    if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+      // to re-login
+      await confirmReLogin()
+    } else if (res.code !== 20000) {
+      // if the custom code is not 20000, it is judged as an error.
       Message({
         message: res.message || 'Error',
         type: 'error',
         duration: 5 * 1000
       })
-
-      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
-      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
-        // to re-login
-        MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
-          confirmButtonText: 'Re-Login',
-          cancelButtonText: 'Cancel',
-          type: 'warning'
-        }).then(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-          })
-        })
-      }
       return Promise.reject(new Error(res.message || 'Error'))
     } else {
       return res