From b136c0a80500d929897a8e24f920efad47e2e307 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 01 十一月 2023 19:03:01 +0800
Subject: [PATCH] 变更公海 的接口传参修改
---
src/common/untils/request.js | 76 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/src/common/untils/request.js b/src/common/untils/request.js
index 4939506..9cb4874 100644
--- a/src/common/untils/request.js
+++ b/src/common/untils/request.js
@@ -1,8 +1,26 @@
import axios from "axios"
import { Message } from "element-ui"
-import Cookies from 'js-cookie'
// import router from '@/router'
+
+// 寮�鍙戠幆澧冧笅灏嗚嚜宸辩殑token澶嶅埗鍒拌繖閲�, 涔熷彲浠ュ湪娴忚鍣ㄤ腑鎵嬪姩娣诲姞token鍒癱ookie涓�,cookie涓殑token浼樺厛
+const DEV_TOKEN = ''
+
+function environmentType(){
+ let type
+ if (location.href.includes('192.168.20.119')) {
+ type = 'test'
+ } else if (location.href.includes('192.168') || location.href.includes('localhost')) {
+ type = 'dev'
+ } else {
+ type = 'prod'
+ }
+
+ return type
+}
+
+const isDev = environmentType() === 'dev'
+
const Axios = axios.create({
responseType: "json",
@@ -15,41 +33,26 @@
prod:`//${window.location.hostname}:9080`,
test:`//192.168.20.119:9080`,
// 鎯宠烦鍒版湰鍦板惎鍔ㄧ殑鐧诲綍椤电殑璇濋渶瑕佹妸dev鏀规垚浣犳湰鍦伴」鐩矾寰�
- dev: `//192.168.20.119:9080`
+ dev: `//192.168.20.124:8081`
}
- if (location.href.includes('192.168.20.119')) {
- return loginPathMap.test
- } else if (location.href.includes('192.168') || location.href.includes('localhost')) {
- return loginPathMap.dev
- } else {
- return loginPathMap.prod
- }
-}
-
-function getToken(){
- const localStorageToken = localStorage.getItem('token')
- const cookieToken = Cookies.get("token")
- if (localStorageToken){
- return localStorageToken
- }else if ( cookieToken) {
- localStorage.setItem('token',cookieToken)
- return cookieToken
- }else {
- return ''
- }
+ return loginPathMap[environmentType()]
}
/* //POST浼犲弬搴忓垪鍖�(娣诲姞璇锋眰鎷︽埅鍣�) */
Axios.interceptors.request.use(
(config) => {
- // 鑻ユ槸鏈夊仛閴存潈token , 灏辩粰澶撮儴甯︿笂token
- let token = getToken()
- if (token) {
- config.headers.Authorization = "Bearer " + token;
- }
-
- return config
+ let token = document.cookie.replace(
+ /(?:(?:^|.*;\s*)token\s*\=\s*([^;]*).*$)|^.*$/,
+ "$1",
+ );
+ if (isDev){
+ token = token || DEV_TOKEN
+ }
+ if (token) {
+ config.headers.Authorization = "Bearer " + token;
+ }
+ return config
},
(error) => {
return Promise.reject(error)
@@ -66,9 +69,13 @@
console.log("瀹㈡埛鍚嶇О閲嶅")
return res
} else if([2012,2013,2014,2015].includes(res.data.code)){
+ if (isDev){
+ alert("JWT澶辨晥")
+ }else {
// JWT閴存潈澶辨晥 璺宠浆鍒扮櫥褰曢〉
window.location = getApsPage()+'/login'
- return Promise.reject(res.data)
+ }
+ return Promise.reject(res.data)
} else {
Message({
message: res.data.msg,
@@ -79,6 +86,15 @@
}
},
(error) => {
+ if (error.response.status === 401){
+ if (isDev){
+ alert("JWT澶辨晥")
+ }else {
+ // JWT閴存潈澶辨晥 璺宠浆鍒扮櫥褰曢〉
+ window.location = getApsPage()+'/login'
+ }
+ }
+
let { message } = error
if (message === "Network Error") {
message = "鍚庣鎺ュ彛杩炴帴寮傚父"
--
Gitblit v1.8.0