From 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:19:31 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 99 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 68 insertions(+), 31 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 6bd3102..b340607 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -57,6 +57,9 @@
return Promise.reject(response.data)
} else {
+ if (response.config.requestId) {
+ response.data.$requestId = response.config.requestId
+ }
return Promise.resolve(response.data)
}
}, (error) => {
@@ -359,7 +362,6 @@
}
/**
-<<<<<<< HEAD
* @description 鐧诲綍浜屾楠岃瘉 // positecgroup
*/
verifycode (verify) {
@@ -390,10 +392,7 @@
}
/**
- * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
-=======
* @description 鑾峰彇绯荤粺鐗堟湰淇℃伅
->>>>>>> master
*/
getAppVersion (reload) {
if (!window.GLOB.IndexDB) {
@@ -684,7 +683,7 @@
param.sign = md5(values)
param.t = new Date().getTime();
- ['arr_field', 'LText_field', 'custom_script', 'LText1', 'LText', 'LText2', 'DateCount'].forEach(key => {
+ ['arr_field', 'custom_script', 'LText', 'DateCount'].forEach(key => {
if (param[key]) {
let val = param[key]
delete param[key]
@@ -698,7 +697,7 @@
/**
* @description 鑾峰彇绯荤粺閰嶇疆锛屼紭鍏堜粠缂撳瓨涓彇鍊硷紝澧炲姞appkey
* @param {Object} param 璇锋眰鍙傛暟
- * @param {Boolean} SSO 鏄惁涓哄崟鐐圭櫥褰曞湴鍧�
+ * @param {Boolean} cache 鏄惁浣跨敤缂撳瓨
*/
getSystemCacheConfig (param, cache = true) {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
@@ -794,7 +793,7 @@
param = this.encryptParam(param)
axios({
- url: token.interface,
+ url: `${token.interface}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: JSON.stringify(param)
}).then(res => {
@@ -843,7 +842,7 @@
param = this.encryptParam(param)
axios({
- url: token.interface,
+ url: `${token.interface}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: JSON.stringify(param)
}).then(res => {
@@ -873,7 +872,7 @@
* @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛
* 璁块棶 'https://sso.mk9h.cn/webapi/dostars'鎴栦簯绔椂锛屼紶鍏serid銆丩oginUID
*/
- genericInterface (param) {
+ genericInterface (param, script = '', position, requestId = '') {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
@@ -891,9 +890,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) {
@@ -901,31 +897,50 @@
}
}
- if (param.$login && !window.GLOB.transfer) {
- login = true
- rduri = param.rduri || ''
- }
- delete param.$login
+ if (script) {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('axios', 'Api', 'param', 'position', 'systemType', script)
+ let promise = func(axios, this, param, position, window.GLOB.systemType)
- let url = '/webapi/dostars'
+ if (promise instanceof Promise) {
+ return promise
+ }
+ } catch (e) {
+ console.warn(e)
+ }
- if (param.rduri && !window.GLOB.transfer && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
- url = param.rduri
+ return Promise.resolve({
+ status: false,
+ message: '鑷畾涔夎剼鏈墽琛岄敊璇�',
+ ErrCode: 'E'
+ })
+ } else if (param.$login) {
+ let rduri = 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()
+ })
})
}
@@ -934,11 +949,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)
@@ -957,10 +974,19 @@
})
})
} 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',
- data: JSON.stringify(param)
+ data: JSON.stringify(param),
+ requestId
})
}
}
@@ -1084,7 +1110,7 @@
sDebug (sql, rduri = null) {
let param = {
func: 's_debug_sql',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
userid: sessionStorage.getItem('UserID') || '',
lang: sessionStorage.getItem('lang') || '',
@@ -1092,6 +1118,15 @@
LoginUID: sessionStorage.getItem('LoginUID') || '',
appkey: window.GLOB.appkey || ''
}
+
+ sql = sql.replace(/@time_id@/ig, `'${Utils.getuuid()}'`)
+ sql = sql.replace(/@ID@/ig, `'${Utils.getuuid()}'`)
+ sql = sql.replace(/@BID@/ig, `'${Utils.getuuid()}'`)
+ sql = sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID')}'`)
+ sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid')}'`)
+ sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID')}'`)
+ sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey}'`)
+ // sql = sql.replace(/@datam@/ig, `''`)
if (window.GLOB.externalDatabase !== null) {
sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
@@ -1101,7 +1136,7 @@
sql = sql.replace(/\n/ig, ' ')
- param.LText = Utils.formatOptions(sql)
+ param.LText = Utils.formatOptions(sql, param.exec_type)
param.secretkey = Utils.encrypt('', param.timestamp)
param = this.encryptParam(param)
@@ -1138,6 +1173,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