From c18f79e01a2705d34d5ac2923a26913dba07ea14 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 八月 2024 16:04:18 +0800
Subject: [PATCH] 2024-08-03
---
src/api/index.js | 100 +++++++++++++++++++++++---------------------------
1 files changed, 46 insertions(+), 54 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 50f5937..7d3ae5f 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -100,35 +100,13 @@
/**
* @description 寰俊涓氬姟璇锋眰 鍘熸帴鍙� 'wxpay/getaccesstoken'
*/
- wxAccessToken (domain = '') {
- let _url = domain || window.GLOB.baseurl
+ wxAccessToken (appId, domain = '') {
+ let _url = domain || window.GLOB.baseurl
- if (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
- _url = _url.replace('http://qingqiumarket.cn', 'http://qingqiumarket.cn:8080')
- _url = _url.replace('http://cloud.mk9h.cn', 'http://cloud.mk9h.cn:8080')
- _url = _url.replace('https://qingqiumarket.cn', 'https://qingqiumarket.cn:8443')
- _url = _url.replace('https://cloud.mk9h.cn', 'https://cloud.mk9h.cn:8443')
- }
-
- return new Promise(resolve => {
- 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 = {domain}
- axios({
- url: _url + 'wechat/jsapi/getaccesstoken',
- method: 'post',
- headers: { 'Content-Type': 'application/json' },
- data: JSON.stringify({appId: 'wx4d8a34c8d4494872'})
- }).then(res => {
- if (res.oa_access_token) {
- window.GLOB.accessToken.accessTime = parseInt(new Date().getTime() / 1000)
- window.GLOB.accessToken.oa_access_token = res.oa_access_token
- // window.GLOB.accessToken.mini_access_token = res.mini_access_token
- }
- resolve(res)
- })
- }
+ return axios({
+ url: _url + 'wechat/getaccesstoken',
+ method: 'post',
+ data: JSON.stringify({app_id: appId})
})
}
@@ -144,12 +122,12 @@
if (process.env.NODE_ENV === 'production') {
_url = document.location.origin + '/' + url
}
- if (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
- _url = _url.replace('http://qingqiumarket.cn', 'http://qingqiumarket.cn:8080')
- _url = _url.replace('http://cloud.mk9h.cn', 'http://cloud.mk9h.cn:8080')
- _url = _url.replace('https://qingqiumarket.cn', 'https://qingqiumarket.cn:8443')
- _url = _url.replace('https://cloud.mk9h.cn', 'https://cloud.mk9h.cn:8443')
- }
+ }
+ if (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
+ _url = _url.replace('http://qingqiumarket.cn/', 'http://qingqiumarket.cn:8080/')
+ _url = _url.replace('http://cloud.mk9h.cn/', 'http://cloud.mk9h.cn:8080/')
+ _url = _url.replace('https://qingqiumarket.cn/', 'https://qingqiumarket.cn:8443/')
+ _url = _url.replace('https://cloud.mk9h.cn/', 'https://cloud.mk9h.cn:8443/')
}
if (param) {
@@ -169,7 +147,27 @@
/**
* @description 鐩存帴璇锋眰
*/
- directRequest (params) {
+ directRequest (params, script, position) {
+ if (script) {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('axios', 'Api', 'param', 'position', 'systemType', 'notification', script)
+ let promise = func(axios, this, params, position, window.GLOB.systemType, notification)
+
+ if (promise instanceof Promise) {
+ return promise
+ }
+ } catch (e) {
+ console.warn(e)
+ }
+
+ return Promise.resolve({
+ status: false,
+ message: '鑷畾涔夎剼鏈墽琛岄敊璇�',
+ ErrCode: 'E'
+ })
+ }
+
return axios(params)
}
@@ -942,7 +940,7 @@
})
} else {
let url = '/webapi/dostars'
- if (param.rduri && !window.GLOB.transfer && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
+ if (param.rduri && (!window.GLOB.transfer || /https:\/\/sso.mk9h.cn/.test(param.rduri)) && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
url = param.rduri
delete param.rduri
}
@@ -1031,10 +1029,10 @@
_url = document.location.origin + '/file/oss/upload'
}
if (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
- _url = _url.replace('http://qingqiumarket.cn', 'http://qingqiumarket.cn:8080')
- _url = _url.replace('http://cloud.mk9h.cn', 'http://cloud.mk9h.cn:8080')
- _url = _url.replace('https://qingqiumarket.cn', 'https://qingqiumarket.cn:8443')
- _url = _url.replace('https://cloud.mk9h.cn', 'https://cloud.mk9h.cn:8443')
+ _url = _url.replace('http://qingqiumarket.cn/', 'http://qingqiumarket.cn:8080/')
+ _url = _url.replace('http://cloud.mk9h.cn/', 'http://cloud.mk9h.cn:8080/')
+ _url = _url.replace('https://qingqiumarket.cn/', 'https://qingqiumarket.cn:8443/')
+ _url = _url.replace('https://cloud.mk9h.cn/', 'https://cloud.mk9h.cn:8443/')
}
return axios({
@@ -1046,30 +1044,24 @@
}
/**
- * @description 鑾峰彇寰俊鏀粯浜岀淮鐮�
+ * @description 鑾峰彇寰俊鏀粯浜岀淮鐮� 鍘熸帴鍙xpay/wxNativePay
*/
getWxNativePay (param) {
- let _url = window.GLOB.baseurl + 'wxpay/wxNativePay'
-
return axios({
- url: _url,
+ url: window.GLOB.baseurl + 'wechat/native',
method: 'post',
- data: qs.stringify(param)
+ data: JSON.stringify(param)
})
}
/**
- * @description 寰俊鏀粯閫�娆�
+ * @description 寰俊鏀粯閫�娆� 鍘熸帴鍙xpay/wxRefund
*/
- setRefund (orderId) {
- let _param = new FormData()
- _param.append('out_biz_no', orderId)
-
+ setRefund (param) {
return axios({
- url: '/wxpay/wxRefund',
- headers: { 'Content-Type': 'multipart/form-data' },
+ url: window.GLOB.baseurl + 'wechat/wxRefund',
method: 'post',
- data: _param
+ data: JSON.stringify(param)
})
}
@@ -1110,7 +1102,7 @@
sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
}
- console.info(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
+ window.mkInfo(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
sql = sql.replace(/\n/ig, ' ')
--
Gitblit v1.8.0