From 1779677cece5864b62a65df4b01a4a69496e149a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 五月 2025 20:51:15 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index bf5de0a..0c2bac9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -62,8 +62,8 @@
return Promise.reject(response.data)
} else {
if (response.data.ErrCode === 'E') {
- if (/姝婚攣/.test(response.data.message)) {
- response.data.message = window.GLOB.dict['server_busy'] || '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+ if (/姝婚攣|灏氭湭浠庢睜涓幏鍙栬繛鎺�/.test(response.data.message)) {
+ response.data.message = (window.GLOB.dict['server_busy'] || '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒') + (/姝婚攣/.test(response.data.message) ? '01' : '02')
response.data.ErrMesg = response.data.message
} else if (/鏃犳硶鎵撳紑鐧诲綍鎵�璇锋眰鐨勬暟鎹簱|鍦ㄤ笌\s*SQL\s+Server\s*寤虹珛杩炴帴鏃跺嚭鐜�/.test(response.data.message)) {
response.data.message = '鏈嶅姟鍣ㄩ摼鎺ヤ笉鍙敤锛岃鍏抽棴娴忚鍣ㄩ噸鏂版墦寮�锛�'
@@ -140,6 +140,17 @@
url: `/webapi/dostar${param.func ? '/' + param.func : ''}`,
method: 'post',
data: JSON.stringify(param)
+ })
+ }
+
+ /**
+ * @description 鑰佺郴缁熺櫥褰�
+ */
+ loginAndRedirect (param) {
+ return axios({
+ url: document.location.origin + '/zh-CN/Home/LoginAndRedirect',
+ method: 'post',
+ data: qs.stringify(param)
})
}
@@ -269,7 +280,8 @@
login_id_address: sessionStorage.getItem('ipAddress') || '',
kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
device_id: localStorage.getItem('SessionUid'),
- appkey: window.GLOB.appkey || ''
+ appkey: window.GLOB.appkey || '',
+ lang: sessionStorage.getItem('lang') || ''
}
let url = '/webapi/dologon'
@@ -307,7 +319,8 @@
kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
device_id: localStorage.getItem('SessionUid'),
timestamp: moment().add(shim, 'seconds').format('YYYY-MM-DD HH:mm:ss'),
- appkey: window.GLOB.appkey || ''
+ appkey: window.GLOB.appkey || '',
+ lang: sessionStorage.getItem('lang') || ''
}
// Type: 'S' 鏃�
--
Gitblit v1.8.0