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 | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index a2ca5e0..7d3ae5f 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -103,23 +103,10 @@
wxAccessToken (appId, domain = '') {
let _url = domain || window.GLOB.baseurl
- return new Promise(resolve => {
- if (window.GLOB.accessToken.appId === appId && window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
- resolve(window.GLOB.accessToken)
- } else {
- window.GLOB.accessToken = {appId}
- axios({
- url: _url + 'wechat/getaccesstoken',
- method: 'post',
- data: JSON.stringify({app_id: appId})
- }).then(res => {
- if (res.access_token) {
- window.GLOB.accessToken.accessTime = parseInt(new Date().getTime() / 1000)
- window.GLOB.accessToken.access_token = res.access_token
- }
- resolve(res)
- })
- }
+ return axios({
+ url: _url + 'wechat/getaccesstoken',
+ method: 'post',
+ data: JSON.stringify({app_id: appId})
})
}
@@ -160,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)
}
@@ -933,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
}
@@ -1095,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