From 8acfcd6e349ef2d1b797a7483940a2f3f2dfcfe6 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 03 二月 2024 17:49:25 +0800 Subject: [PATCH] Merge branch 'develop' --- src/api/index.js | 55 +++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index c4afd62..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] @@ -755,7 +755,7 @@ param = this.encryptParam(param) axios({ - url: token.interface, + url: `${token.interface}${param.func ? '/' + param.func : ''}`, method: 'post', data: JSON.stringify(param) }).then(res => { @@ -804,7 +804,7 @@ param = this.encryptParam(param) axios({ - url: token.interface, + url: `${token.interface}${param.func ? '/' + param.func : ''}`, method: 'post', data: JSON.stringify(param) }).then(res => { @@ -834,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') || '' @@ -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,22 +859,32 @@ } } - 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) @@ -885,7 +892,7 @@ sessionStorage.setItem(rduri, c_time) return new Promise((resolve, reject) => { axios({ - url: `${url}${param.func ? '/' + param.func : ''}`, + url: `${rduri}${param.func ? '/' + param.func : ''}`, method: 'post', data: JSON.stringify(param) }).then(result => { @@ -904,7 +911,7 @@ 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 => { @@ -929,6 +936,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