From 3ec8d3625e6fb7614e2ec4bb02ed99a3cdf4cdb7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 12 Feb 2026 11:28:47 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/mobile-web-view/src/axios.js | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/applications/mobile-web-view/src/axios.js b/applications/mobile-web-view/src/axios.js
index 2087131..6d74033 100644
--- a/applications/mobile-web-view/src/axios.js
+++ b/applications/mobile-web-view/src/axios.js
@@ -9,23 +9,20 @@
import store from '@/store/'
import router from '@/router/'
import { serialize } from '@/utils/util'
-import { getToken, removeToken, removeRefreshToken } from '@/utils/auth'
-import { isURL, validatenull } from '@/utils/validate'
-import { ElMessage } from 'element-plus'
+import { getToken, removeRefreshToken, removeToken } from '@/utils/auth'
+import { validatenull } from '@/utils/validate'
import website from '@/config/website'
import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style
-import { Base64 } from 'js-base64'
import crypto from '@/utils/crypto'
import { getStore } from '@/utils/store'
import { showToast } from 'vant'
-let baseUrl = import.meta.env.VITE_APP_API
+let { VITE_APP_ENV,VITE_APP_XT_URL,VITE_APP_API } = import.meta.env
// 全局未授权错误提示状态，只提示一次
let isErrorShown = false
// 全局锁机制相关变量
window.isRefreshing = false // 标记当前是否正在刷新token
-let refreshTokenPromise = null // 刷新token的Promise，避免重复请求
axios.defaults.timeout = 60000
//返回其他状态码
@@ -33,8 +30,7 @@
return status >= 200 && status <= 500 // 默认的
}
//跨域请求，允许保存cookie
-axios.defaults.withCredentials = true
-// NProgress Configuration
+axios.defaults.withCredentials = false
NProgress.configure({
showSpinner: false,
})
@@ -42,24 +38,23 @@
//http request拦截
axios.interceptors.request.use(
config => {
- const isBase = config.isBase === false
- // start progress bar
- // NProgress.start()
// 初始化错误提示状态
isErrorShown = false
- //地址为已经配置状态则不添加前缀
- if (!isBase && !isURL(config.url) && !config.url.startsWith(baseUrl)) {
- config.url = baseUrl + config.url
+ if (VITE_APP_ENV === 'development') {
+ config.url = VITE_APP_API + config.url
+ } else {
+ config.url = VITE_APP_XT_URL + config.url
}
-
config.headers['areaCode'] = store.state.user.selectedAreaCode
//安全请求header
config.headers['Blade-Requested-With'] = 'BladeHttpRequest'
//headers判断是否需要
- const authorization = config.authorization === false
- if (!authorization) {
- config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`
- }
+ // const authorization = config.authorization === false
+ // if (!authorization) {
+ // config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`
+ // }
+
+ config.headers['Authorization'] = store.state.user.token
// 根据后端要求，post的data为空的话传｛｝
if (config.method === 'post') {
config.data = config.data || {}
--
Gitblit v1.9.3