From ca4fdf029f5b3334cf518087d20b0b231c930e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Tue, 5 Nov 2024 08:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=94=E5=9B=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production     |  5 +----
 src/api/request.js  | 22 +++++++++++-----------
 src/util/refresh.js |  3 ++-
 vue.config.js       |  8 +++-----
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/.env.production b/.env.production
index 82a5c2d..1950622 100644
--- a/.env.production
+++ b/.env.production
@@ -6,10 +6,7 @@ VUE_APP_FILE_HOST = "https://www.jichuanglanhai.com:88/api/"
 # 二期接口
 VUE_APP_RUOYI ='https://www.jichuanglanhai.com:88'
 
-# IOS和安卓访问 
-VUE_APP_INTERFACE = "http://39.101.188.84:89"
-# 图片前缀正式服务器
-VUE_APP_IMGURL ='http://221.229.220.83:9028'
+
 
 VUE_APP_VERSION = "3.2.8"
 VUE_APP_VERSION2 = "3.2.8"
diff --git a/src/api/request.js b/src/api/request.js
index cfa5200..9caaecb 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -18,12 +18,12 @@ import { refreshToken, isRefreshRequest } from '@/util/refresh.js'
 // 实例化axios
 const request = axios.create({
   baseURL: process.env.VUE_APP_HOST,
-  timeout: 50000,
+  timeout: 50000
 })
 
 // request--请求 拦截器
 request.interceptors.request.use(
-  (config) => {
+  config => {
     if (config.url !== 'secret/token') {
       let token = localStorage.getItem('mudu_token')
       let authToken = 'Bearer ' + token
@@ -36,7 +36,7 @@ request.interceptors.request.use(
         let params = config.data
         // debugger
         const formData = new FormData()
-        Object.keys(params).forEach((key) => {
+        Object.keys(params).forEach(key => {
           //参数为null或者'null'时候不传入后台
           if (params[key] && params[key] !== 'null')
             formData.append(key, params[key])
@@ -46,19 +46,19 @@ request.interceptors.request.use(
     }
     return config
   },
-  (error) => {
+  error => {
     Promise.reject(error)
   }
 )
 
 // response--响应 拦截器
 request.interceptors.response.use(
-  async (response) => {
+  async response => {
     // 系统返回状态判断
     if (response.data.code === 500) {
       Toast({
         message: response.data.message,
-        position: 'bottom',
+        position: 'bottom'
       })
       // router.replace('/')
       return Promise.reject(response.data)
@@ -70,7 +70,7 @@ request.interceptors.response.use(
         if (message.length === 0) message = '暂无数据'
         Toast({
           message: message,
-          position: 'bottom',
+          position: 'bottom'
         })
       }
       return Promise.reject(response.data)
@@ -80,14 +80,14 @@ request.interceptors.response.use(
       return response.data
     }
   },
-  async (error) => {
+  async error => {
     let errorData = error.response
 
     if (errorData.status === 401 && !isRefreshRequest(errorData.config)) {
       const isSucceed = await refreshToken()
       if (isSucceed) {
         //重新请求
-        // console.log('重新刷新')
+        console.log('重新刷新')
         errorData.config.headers.Authorization =
           'Bearer ' + localStorage.getItem('mudu_token') //替换token
         let result = await request.request(errorData.config) //重新请求
@@ -95,13 +95,13 @@ request.interceptors.response.use(
       } else {
         Toast({
           message: '刷新令牌失败',
-          position: 'bottom',
+          position: 'bottom'
         })
       }
     } else {
       Toast({
         message: '网络异常，请检查网络情况',
-        position: 'bottom',
+        position: 'bottom'
       })
     }
     return Promise.reject(error)
diff --git a/src/util/refresh.js b/src/util/refresh.js
index 547588b..29e4f72 100644
--- a/src/util/refresh.js
+++ b/src/util/refresh.js
@@ -6,8 +6,9 @@ export async function refreshToken() {
   if (promise) {
     return promise
   }
-  promise = new Promise(async (resolve) => {
+  promise = new Promise(async resolve => {
     const loginFrom = encryptionLogin()
+    console.log('重新换token', loginFrom)
     let res = await api.login(loginFrom, { __isRefreshToken: true })
     localStorage.setItem('mudu_token', res.access_token) //存token
     resolve(res.code === 200)
diff --git a/vue.config.js b/vue.config.js
index bba7b10..1cd0b06 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,12 +7,10 @@
  */
 module.exports = {
   publicPath: '/demo/mudu-vx/', //APP打包
-  // publicPath: '/demo/mudu-app-ceshi/',
-  // publicPath: '/demo/mudu-app-zhengshi/',
 
   devServer: {
     proxy: {
-         '/api': {
+      '/api': {
         target: 'http://221.229.220.83:86', //代理接口
         changeOrigin: true,
         pathRewrite: {}
@@ -32,6 +30,6 @@ module.exports = {
       //   changeOrigin: true,
       //   pathRewrite: {},
       // },
-    },
-  },
+    }
+  }
 }