From eed27d3000e127c433fd45609d0d5e5d06b7868c Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 26 十二月 2023 11:14:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/common/untils/request.js | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/common/untils/request.js b/src/common/untils/request.js
index e370bc2..209035a 100644
--- a/src/common/untils/request.js
+++ b/src/common/untils/request.js
@@ -33,7 +33,7 @@
prod:`//${window.location.hostname}:9080`,
test:`//192.168.20.119:9080`,
// 鎯宠烦鍒版湰鍦板惎鍔ㄧ殑鐧诲綍椤电殑璇濋渶瑕佹妸dev鏀规垚浣犳湰鍦伴」鐩矾寰�
- dev: `//192.168.8.111:8081`
+ dev: `//192.168.20.158:8080`
}
return loginPathMap[environmentType()]
@@ -64,14 +64,18 @@
(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 = getApsPage()+'/login'
}else {
// JWT閴存潈澶辨晥 璺宠浆鍒扮櫥褰曢〉
window.location = getApsPage()+'/login'
@@ -89,8 +93,8 @@
(error) => {
if (error.response.status === 401){
if (isDev){
- alert("JWT澶辨晥")
- // window.location = getApsPage()+'/'
+ alert("JWT澶辨晥,鍗冲皢璺宠浆鑷崇櫥褰曢〉..")
+ window.location = getApsPage()+'/login'
}else {
// JWT閴存潈澶辨晥 璺宠浆鍒扮櫥褰曢〉
window.location = getApsPage()+'/login'
--
Gitblit v1.8.0