From aee1d7249efd3e7978cafc6540b4458da6f9e60c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 六月 2023 16:41:13 +0800
Subject: [PATCH] 2023-06-20
---
src/api/index.js | 139 ++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 84 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index a4dd5b9..54cf1dc 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -23,19 +23,11 @@
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
axios.defaults.withCredentials = false
-axios.interceptors.request.use((config) => {
- if (/LoginAndRedirect|getjsonresult|wxNativePay|postek/ig.test(config.url)) {
- config.data = qs.stringify(config.data)
- } else if (/\/doupload|\/dopreload|\/upload/.test(config.url)) {
- config.headers = { 'Content-Type': 'multipart/form-data' }
- } else if (config.method === 'post' && config.data) {
- config.data = JSON.stringify(config.data)
- }
-
- return config
-}, (error) => {
- return Promise.reject(error)
-})
+// axios.interceptors.request.use((config) => {
+// return config
+// }, (error) => {
+// return Promise.reject(error)
+// })
const setCurrentUrl = (res) => {
if (!!(window.history && window.history.pushState)) {
@@ -49,6 +41,10 @@
axios.interceptors.response.use((response) => {
if (response.data.ErrCode === 'LoginError') {
if (window.debugger === true) {
+ response.data.ErrCode = 'E'
+ return Promise.resolve(response.data)
+ } else if (window.GLOB.developing) {
+ sessionStorage.setItem('devError', 'true')
response.data.ErrCode = 'E'
return Promise.resolve(response.data)
} else if (!sessionStorage.getItem('loginError')) {
@@ -91,24 +87,25 @@
return axios({
url: `/webapi/dostar${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
/**
* @description 寰俊涓氬姟璇锋眰
*/
- wxAccessToken () {
+ wxAccessToken (domain = '') {
let _url = window.GLOB.baseurl + 'wxpay/getaccesstoken'
- if (process.env.NODE_ENV !== 'production') {
- _url = document.location.origin + '/wxpay/getaccesstoken'
+
+ if (domain) {
+ _url = domain + 'wxpay/getaccesstoken'
}
return new Promise(resolve => {
- if (window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
+ if (window.GLOB.accessToken.domain === domain && window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
resolve(window.GLOB.accessToken)
} else {
- window.GLOB.accessToken = {}
+ window.GLOB.accessToken = {domain}
axios({
url: _url,
method: 'get'
@@ -128,19 +125,23 @@
* @description 寰俊涓氬姟璇锋眰
*/
wxNginxRequest (url, method, param) {
- let _url = window.GLOB.location + '/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + '/' + url
- }
- if (/^http:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8080/' + url
+ let _url = url
+
+ if (!/^http/.test(url)) {
+ _url = window.GLOB.location + '/' + url
if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8080/' + url
+ _url = document.location.origin + '/' + url
}
- } else if (/^https:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8443/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8443/' + url
+ if (/^http:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
+ _url = window.GLOB.location + ':8080/' + url
+ if (process.env.NODE_ENV === 'production') {
+ _url = document.location.origin + ':8080/' + url
+ }
+ } else if (/^https:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
+ _url = window.GLOB.location + ':8443/' + url
+ if (process.env.NODE_ENV === 'production') {
+ _url = document.location.origin + ':8443/' + url
+ }
}
}
@@ -160,38 +161,8 @@
/**
* @description 鐩存帴璇锋眰
- * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
- directRequest (url, method = 'post', param, cross) {
- if (cross === 'true' && param) {
- return axios({
- url,
- method,
- data: param
- })
- } else if (cross === 'true') {
- return axios({
- url,
- method
- })
- }
-
- let params = { method: 'post' }
- let _url = url
-
- if (method === 'get' && param) {
- let keys = Object.keys(param).map(key => `${key}=${param[key]}`)
- keys = keys.join('&')
- if (keys) {
- _url = _url + '?' + keys
- }
- } else if (method === 'post' && param) {
- params.data = param
- }
-
- _url = _url.replace(/&/ig, '%26')
- params.url = '/trans/redirect?rd=' + _url + '&method=' + method
-
+ directRequest (params) {
return axios(params)
}
@@ -249,7 +220,7 @@
return axios({
url: url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -288,7 +259,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -343,7 +314,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -499,7 +470,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -523,7 +494,7 @@
return axios({
url: `${url}/${param.func}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -555,7 +526,7 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -595,7 +566,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
if (res.status && window.GLOB.IndexDB) {
let msg = {
@@ -621,7 +592,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
if (res.status) {
window.GLOB.CacheMap.set(key, res)
@@ -720,7 +691,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
if (res.status) {
window.GLOB.CacheMap.set(_param, res)
@@ -751,7 +722,7 @@
token = JSON.parse(window.decodeURIComponent(window.atob(token)))
} catch (e) {
token = null
- _resolve({status: false, ErrCode: 'E', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�'})
+ _resolve({status: false, ErrCode: 'E', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�', ErrMesg: 'token_error'})
}
if (!token) return
@@ -784,7 +755,7 @@
axios({
url: token.interface,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
_resolve(res)
})
@@ -813,7 +784,7 @@
axios({
url,
method: 'post',
- data: _param
+ data: JSON.stringify(_param)
}).then(result => {
if (result.status) {
window.GLOB.OuterToken[token.interface] = {
@@ -831,7 +802,7 @@
axios({
url: token.interface,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
_resolve(res)
})
@@ -854,7 +825,7 @@
param.appkey = window.GLOB.appkey || ''
if (param.$token === '') {
- return Promise.resolve({status: false, ErrCode: 'E', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
+ return Promise.resolve({status: false, ErrCode: 'E', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�', ErrMesg: 'token_error'})
} else if (param.$token) {
return new Promise(resolve => this.visitOuterSystem(param, resolve))
}
@@ -903,7 +874,7 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -914,7 +885,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(result => {
resolve(result)
})
@@ -927,7 +898,7 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
}
@@ -968,7 +939,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -979,6 +950,7 @@
return axios({
url: '/webapi/doupload',
method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' },
data: param
})
}
@@ -990,6 +962,7 @@
return axios({
url: '/webapi/dopreload',
method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' },
data: param
})
}
@@ -1017,6 +990,7 @@
return axios({
url: _url,
method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' },
data: param
})
}
@@ -1026,14 +1000,11 @@
*/
getWxNativePay (param) {
let _url = window.GLOB.baseurl + 'wxpay/wxNativePay'
- if (process.env.NODE_ENV !== 'production') {
- _url = document.location.origin + '/wxpay/wxNativePay'
- }
return axios({
url: _url,
method: 'post',
- data: param
+ data: qs.stringify(param)
})
}
@@ -1041,7 +1012,7 @@
return axios({
url: 'http://127.0.0.1:888/postek/print',
method: 'post',
- data: data
+ data: qs.stringify(data)
})
}
}
--
Gitblit v1.8.0