From 49f09cc6f8ff8c30a75ed1a9d6f510b69b73962a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 十二月 2023 21:05:37 +0800
Subject: [PATCH] 2023-12-12
---
src/api/index.js | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 8884f3f..cb9a698 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -852,9 +852,6 @@
param.fullname = sessionStorage.getItem('Full_Name') || ''
}
- let login = false
- let rduri = null
-
if (param.rduri && /\s|\n/.test(param.rduri)) {
param.rduri = param.rduri.replace(/\s|\n/g, '')
if (!param.rduri) {
@@ -862,31 +859,32 @@
}
}
- if (param.$login && !window.GLOB.transfer) {
- login = true
- rduri = param.rduri || ''
- }
- delete param.$login
+ if (param.$login) {
+ let rduri = param.rduri || ''
- let url = '/webapi/dostars'
-
- if (param.rduri && !window.GLOB.transfer && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
- url = param.rduri
+ delete param.$login
delete param.rduri
- }
- param = this.encryptParam(param)
+ param = this.encryptParam(param)
- if (login) {
let time = +sessionStorage.getItem(rduri)
let c_time = Math.round(new Date().getTime() / 1000)
if (time && c_time - time <= 1800) {
sessionStorage.setItem(rduri, c_time)
- return axios({
- url: `${url}${param.func ? '/' + param.func : ''}`,
- method: 'post',
- data: JSON.stringify(param)
+ return new Promise((resolve, reject) => {
+ axios({
+ url: `${rduri}${param.func ? '/' + param.func : ''}`,
+ method: 'post',
+ data: JSON.stringify(param)
+ }).then(result => {
+ if (result && result.ErrCode === 'LoginError') {
+ sessionStorage.removeItem(rduri)
+ }
+ resolve(result)
+ }, () => {
+ reject()
+ })
})
}
@@ -895,11 +893,13 @@
if (res.status) {
sessionStorage.setItem(rduri, c_time)
axios({
- url: `${url}${param.func ? '/' + param.func : ''}`,
+ url: `${rduri}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: JSON.stringify(param)
}).then(result => {
resolve(result)
+ }, () => {
+ reject()
})
} else {
resolve(res)
@@ -918,6 +918,14 @@
})
})
} else {
+ let url = '/webapi/dostars'
+ if (param.rduri && !window.GLOB.transfer && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
+ url = param.rduri
+ delete param.rduri
+ }
+
+ param = this.encryptParam(param)
+
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
--
Gitblit v1.8.0