From d49124329b0119ba0ce7c69afbe2b864209e2495 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十月 2023 11:58:11 +0800
Subject: [PATCH] 2023-10-25
---
src/api/index.js | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 0b6080c..d5b630b 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -704,7 +704,7 @@
}
}
- visitOuterSystem (param, _resolve) {
+ visitOuterSystem (param, _resolve, _reject) {
let token = param.$token
delete param.$token
@@ -760,6 +760,8 @@
data: JSON.stringify(param)
}).then(res => {
_resolve(res)
+ }, () => {
+ _reject()
})
} else {
let _param = {
@@ -807,9 +809,22 @@
data: JSON.stringify(param)
}).then(res => {
_resolve(res)
+ }, () => {
+ _reject()
})
} else {
_resolve(result)
+ }
+ }, (e) => {
+ if (!e || !e.status) {
+ let msg = '缃戠粶杩炴帴涓嶆甯搞��'
+
+ if (/^http:/.test(token.interface) && /https:/.test(window.location.protocol)) {
+ msg = '缃戠粶杩炴帴涓嶆甯革紝鎺ュ彛鍦板潃鍙兘涓嶆敮鎸乭ttps銆�'
+ }
+ _resolve({status: false, ErrCode: 'E', message: msg})
+ } else {
+ _reject()
}
})
}
@@ -829,7 +844,7 @@
if (param.$token === '') {
return Promise.resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
} else if (param.$token) {
- return new Promise(resolve => this.visitOuterSystem(param, resolve))
+ return new Promise((resolve, reject) => this.visitOuterSystem(param, resolve, reject))
}
if (['sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug'].includes(param.func)) {
@@ -888,6 +903,17 @@
})
} else {
resolve(res)
+ }
+ }, (e) => {
+ if (!e || !e.status) {
+ let msg = '缃戠粶杩炴帴涓嶆甯搞��'
+
+ if (/^http:/.test(rduri) && /https:/.test(window.location.protocol)) {
+ msg = '缃戠粶杩炴帴涓嶆甯革紝鎺ュ彛鍦板潃鍙兘涓嶆敮鎸乭ttps銆�'
+ }
+ resolve({status: false, ErrCode: 'E', message: msg})
+ } else {
+ reject()
}
})
})
@@ -1073,6 +1099,8 @@
clearTimeout(timer)
if (/Shared Memory Provider|浼氳瘽澶勪簬缁堟鐘舵�亅褰撳墠鍛戒护鍙戠敓浜嗕弗閲嶉敊璇�/.test(res.message)) {
res.message = '楠岃瘉澶辫触锛岃妫�鏌QL涓槸鍚﹀瓨鍦ㄦ寰幆銆�'
+ } else if (res.message.indexOf('EXECUTE 鍚庣殑浜嬪姟璁℃暟鎸囩ず BEGIN 鍜� COMMIT 璇彞鐨勬暟鐩笉鍖归厤銆備笂涓�璁℃暟 = 1锛屽綋鍓嶈鏁� = 0') > -1) {
+ res.ErrCode = '-2'
}
resolve(res)
}, () => {
--
Gitblit v1.8.0