From cbeffcc0902631909c0373f274752a97ddaf2d4e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 06 八月 2022 01:41:54 +0800
Subject: [PATCH] 2022-08-06
---
src/api/index.js | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 10a19bd..1487f05 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -110,23 +110,29 @@
/**
* @description 寰俊涓氬姟璇锋眰
*/
- wxRequest (url, method, param) {
- let _url = document.location.origin + '/' + window.GLOB.service + url
+ wxAccessToken () {
+ let _url = document.location.origin + '/' + window.GLOB.service + 'wxpay/getaccesstoken'
if (process.env.NODE_ENV !== 'production') {
- _url = document.location.origin + '/' + url
+ _url = document.location.origin + '/wxpay/getaccesstoken'
}
- if (param) {
- return axios({
- url: _url,
- method,
- data: param
- })
- }
-
- return axios({
- url: _url,
- method
+ return new Promise(resolve => {
+ if (window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
+ resolve(window.GLOB.accessToken)
+ } else {
+ window.GLOB.accessToken = {}
+ axios({
+ url: _url,
+ method: 'get'
+ }).then(res => {
+ if (res.oa_access_token || res.mini_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)
+ })
+ }
})
}
@@ -134,9 +140,20 @@
* @description 寰俊涓氬姟璇锋眰
*/
wxNginxRequest (url, method, param) {
- let _url = window.GLOB.location + ':8080/' + url
+ let _url = window.GLOB.location + '/' + url
if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8080/' + url
+ _url = document.location.origin + '/' + 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
+ }
}
if (param) {
@@ -224,7 +241,6 @@
let url = '/webapi/dologon/s_visitor_login'
if (window.GLOB.mainSystemApi) {
- // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
}
@@ -259,14 +275,12 @@
if (isCloud) {
param.debug = 'Y'
if (options.cloudServiceApi) {
- // url = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
} else if (window.GLOB.mainSystemApi) {
if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
param.linkurl = window.GLOB.linkurl
}
- // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
@@ -796,17 +810,16 @@
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || param.LoginUID || ''
}
- // 寰呬紭鍖栵紝澧炲姞鏄惁鏀寔璺ㄥ煙璇锋眰
- // let url = '/webapi/dostars'
- // if (param.rduri) {
- // url = param.rduri
- // delete param.rduri
- // }
+ let url = '/webapi/dostars'
+ if (param.rduri && /\/dostars/.test(param.rduri)) {
+ url = param.rduri
+ delete param.rduri
+ }
param = this.encryptParam(param)
return axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+ url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: param
})
--
Gitblit v1.8.0