From 3350809003b1e92cbc8852de1c2e16fe716858a8 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 02 二月 2024 17:16:33 +0800 Subject: [PATCH] 2024-02-02 --- src/api/index.js | 108 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 82 insertions(+), 26 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 0b6080c..cc5223d 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -645,7 +645,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] @@ -659,7 +659,7 @@ /** * @description 鑾峰彇绯荤粺閰嶇疆锛屼紭鍏堜粠缂撳瓨涓彇鍊硷紝澧炲姞appkey * @param {Object} param 璇锋眰鍙傛暟 - * @param {Boolean} SSO 鏄惁涓哄崟鐐圭櫥褰曞湴鍧� + * @param {Boolean} cache 鏄惁浣跨敤缂撳瓨 */ getSystemCacheConfig (param, cache = true) { param.userid = param.userid || sessionStorage.getItem('UserID') || '' @@ -704,7 +704,7 @@ } } - visitOuterSystem (param, _resolve) { + visitOuterSystem (param, _resolve, _reject) { let token = param.$token delete param.$token @@ -755,11 +755,13 @@ param = this.encryptParam(param) axios({ - url: token.interface, + url: `${token.interface}${param.func ? '/' + param.func : ''}`, method: 'post', data: JSON.stringify(param) }).then(res => { _resolve(res) + }, () => { + _reject() }) } else { let _param = { @@ -802,14 +804,27 @@ param = this.encryptParam(param) axios({ - url: token.interface, + url: `${token.interface}${param.func ? '/' + param.func : ''}`, method: 'post', 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() } }) } @@ -819,7 +834,7 @@ * @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛 * 璁块棶 'https://sso.mk9h.cn/webapi/dostars'鎴栦簯绔椂锛屼紶鍏serid銆丩oginUID */ - genericInterface (param) { + genericInterface (param, script = '', position) { param.userid = param.userid || sessionStorage.getItem('UserID') || '' param.lang = param.lang || sessionStorage.getItem('lang') || '' param.SessionUid = localStorage.getItem('SessionUid') || '' @@ -829,16 +844,13 @@ 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)) { param.username = sessionStorage.getItem('User_Name') || '' 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, '') @@ -847,31 +859,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() + }) }) } @@ -880,18 +911,39 @@ 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) } + }, (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() + } }) }) } 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', @@ -1028,6 +1080,8 @@ appkey: window.GLOB.appkey || '' } + let id = Utils.getuuid() + sql = sql.replace(/@time_id@/ig, `'${id}'`) if (window.GLOB.externalDatabase !== null) { sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase) } @@ -1073,6 +1127,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