From c547c75fce3c2d9badcb496da7d8e5443e22dbfc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 八月 2024 17:10:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/api/index.js | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 0dca831..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})
})
}
@@ -1115,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