From 574e3e7390170182bef474164597ce719b2327bd Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期三, 24 七月 2024 17:44:57 +0800
Subject: [PATCH] fix:解决crm,之前改了域名，处理各种异常状态，跳转也会出现异常等问题。
---
src/common/untils/request.js | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/common/untils/request.js b/src/common/untils/request.js
index 0911d0d..df4cc89 100644
--- a/src/common/untils/request.js
+++ b/src/common/untils/request.js
@@ -1,6 +1,6 @@
import axios from "axios"
import { Message } from "element-ui"
-
+import {getApsPage} from './index.js';
// import router from '@/router'
// 寮�鍙戠幆澧冧笅灏嗚嚜宸辩殑token澶嶅埗鍒拌繖閲�, 涔熷彲浠ュ湪娴忚鍣ㄤ腑鎵嬪姩娣诲姞token鍒癱ookie涓�,cookie涓殑token浼樺厛
@@ -27,17 +27,17 @@
withCredentials: true // 鏄惁鍏佽甯ookie杩欎簺
})
-const getApsPage = () => {
+/*const getApsPage = () => {
// 棣栭〉閮ㄧ讲鍦ㄥ悇涓幆澧冪殑绔彛
const loginPathMap = {
prod:`//${window.location.hostname}:9080`,
test:`//192.168.20.119:9080`,
// 鎯宠烦鍒版湰鍦板惎鍔ㄧ殑鐧诲綍椤电殑璇濋渶瑕佹妸dev鏀规垚浣犳湰鍦伴」鐩矾寰�
- dev: `//192.168.8.111:8081`
+ dev: `//192.168.8.108:8080`
}
return loginPathMap[environmentType()]
-}
+}*/
/* //POST浼犲弬搴忓垪鍖�(娣诲姞璇锋眰鎷︽埅鍣�) */
Axios.interceptors.request.use(
@@ -64,19 +64,35 @@
(res) => {
/* //瀵瑰搷搴旀暟鎹仛浜涗簨 */
if (res.data.code === 200) {
- return res.data ? res.data : {}
+ if(res.config.IsHeader){
+ return res;
+ }else{
+ return res.data ? res.data : {}
+ }
} else if (res.data.code === 700001 || res.data.code === 700005) {
console.log("瀹㈡埛鍚嶇О閲嶅")
return res
} else if([2012,2013,2014,2015].includes(res.data.code)){
if (isDev){
- alert("JWT澶辨晥")
- window.location = getApsPage()+'/'
+ alert("JWT澶辨晥,鍗冲皢璺宠浆鑷崇櫥褰曢〉..")
+ window.location ='http://'+ getApsPage()+'/login'
}else {
// JWT閴存潈澶辨晥 璺宠浆鍒扮櫥褰曢〉
- window.location = getApsPage()+'/login'
+ window.location = 'http://'+getApsPage()+'/login'
}
return Promise.reject(res.data)
+ }else if([2036].includes(res.data.code)){
+ if (isDev){
+ window.location ='http://'+ getApsPage()+'/commonWeb?resetPwd=true'
+ }else {
+ // JWT閴存潈澶辨晥 璺宠浆鍒扮櫥褰曢〉
+ window.location ='http://'+ getApsPage()+'/commonWeb?resetPwd=true'
+ }
+ return Promise.reject(res.data)
+
+ // if(window.location.pathname && window.location.pathname !== '/login'){
+ // window.location = window.location.origin+'/login'
+ // }
} else {
Message({
message: res.data.msg,
@@ -89,11 +105,11 @@
(error) => {
if (error.response.status === 401){
if (isDev){
- alert("JWT澶辨晥")
- window.location = getApsPage()+'/'
+ alert("JWT澶辨晥,鍗冲皢璺宠浆鑷崇櫥褰曢〉..")
+ window.location ='http://'+ getApsPage()+'/login'
}else {
// JWT閴存潈澶辨晥 璺宠浆鍒扮櫥褰曢〉
- window.location = getApsPage()+'/login'
+ window.location ='http://'+ getApsPage()+'/login'
}
}
--
Gitblit v1.8.0