From 8eb708f2b6d792f03725a0ff437f51da5af45a45 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十一月 2024 10:02:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/utils/request.js | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/admin/src/utils/request.js b/admin/src/utils/request.js
index bb715e1..b70945d 100644
--- a/admin/src/utils/request.js
+++ b/admin/src/utils/request.js
@@ -3,6 +3,8 @@
import pkg from '../../package'
import { trim } from './util'
import cache from '../plugins/cache'
+import { Message } from 'element-ui'
+import router from '@/router'
axios.defaults.headers.common['Content-Type'] = 'application/json;charset=UTF-8'
const axiosInstance = axios.create({
@@ -29,9 +31,9 @@
// 璁剧疆鎿嶄綔骞冲彴
config.headers['eva-platform'] = `pc-${pkg.version}`
// 璁剧疆璁よ瘉澶�
- const authToken = Cookies.get('eva-auth-token')
+ const authToken = Cookies.get('dm_user_token')
if (authToken != null) {
- config.headers['eva-auth-token'] = authToken
+ config.headers['dm_user_token'] = authToken
}
return config
}, function (error) {
@@ -40,6 +42,7 @@
// 鏂板缓鍝嶅簲鎷︽埅鍣�
axiosInstance.interceptors.response.use((response) => {
+
// 璇锋眰澶辫触
if (response.status !== 200) {
return Promise.reject(new Error('鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇�'))
@@ -49,14 +52,19 @@
return Promise.resolve(response)
}
// 鏈櫥褰�
- if (response.data.code === 401) {
- if (response.config.autoLogin !== false) {
- window.location.href = process.env.VUE_APP_ROUTER_MODE === 'history' ? '/#/login' : '/login'
- }
+ if (response.data.code === 503) {
+ return Promise.reject(new Error('鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇�'))
+ }
+ if (response.data.code === 401 || response.data.code === 5112) {
+ // if (response.config.autoLogin !== false) {
+ Cookies.set('dm_user_token','')
+ router.replace({name: 'login'})
+ // }
return Promise.reject(response.data)
}
// 涓氬姟澶辫触
if (!response.data.success) {
+ Message.error(response.data.message)
return Promise.reject(response.data)
}
return response.data.data
--
Gitblit v1.9.3