From a74f9cc9e6ccd982c6375595e528eecc068f90b9 Mon Sep 17 00:00:00 2001 From: baiqi Date: Tue, 27 Feb 2024 16:52:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95):=20?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/modules/api-test/debug.ts | 6 ++++ .../project-management/commonScript.ts | 10 +++--- frontend/src/api/modules/user/index.ts | 4 +-- frontend/src/api/requrls/api-test/debug.ts | 1 + frontend/src/api/requrls/user.ts | 2 +- .../components/localExec.vue | 19 +++++++---- frontend/src/models/apiTest/debug.ts | 1 + .../components/requestComposition/index.vue | 33 +++++++++++++------ frontend/src/views/api-test/debug/index.vue | 10 +++++- .../components/management/api/index.vue | 9 ++++- 10 files changed, 69 insertions(+), 26 deletions(-) diff --git a/frontend/src/api/modules/api-test/debug.ts b/frontend/src/api/modules/api-test/debug.ts index 42f81fef48..1e0adedd09 100644 --- a/frontend/src/api/modules/api-test/debug.ts +++ b/frontend/src/api/modules/api-test/debug.ts @@ -9,6 +9,7 @@ import { GetApiDebugDetailUrl, GetDebugModuleCountUrl, GetDebugModulesUrl, + LocalExecuteApiDebugUrl, MoveDebugModuleUrl, TestMockUrl, UpdateApiDebugUrl, @@ -66,6 +67,11 @@ export function executeDebug(data: ExecuteRequestParams) { return MSR.post({ url: ExecuteApiDebugUrl, data }); } +// 本地执行调试 +export function localExecuteApiDebug(host: string, data: ExecuteRequestParams) { + return MSR.post({ url: `${host}${LocalExecuteApiDebugUrl}`, data }); +} + // 新增调试 export function addDebug(data: SaveDebugParams) { return MSR.post({ url: AddApiDebugUrl, data }); diff --git a/frontend/src/api/modules/project-management/commonScript.ts b/frontend/src/api/modules/project-management/commonScript.ts index f7b5960de8..7525e1a52c 100644 --- a/frontend/src/api/modules/project-management/commonScript.ts +++ b/frontend/src/api/modules/project-management/commonScript.ts @@ -74,15 +74,15 @@ export function testCommonScript(data: TestScriptType) { return MSR.post({ url: TestScriptUrl, data }); } // apiSocket 建立连接 -export const apiSocket = (url: string) => { +export const apiSocket = (url: string, host?: string) => { let protocol = 'ws://'; - if (window.location.protocol === 'https:') { + if (window.location.protocol === 'https:' || host?.startsWith('https')) { protocol = 'wss://'; } - const uri = protocol + window.location.host + url; + const uri = protocol + (host?.split('://')[1] || window.location.host) + url; return new WebSocket(uri); }; -export function getSocket(reportId: string) { - return apiSocket(`${ConnectionWebsocketUrl}/${reportId}`); +export function getSocket(reportId: string, socketUrl?: string, host?: string) { + return apiSocket(`${socketUrl || ConnectionWebsocketUrl}/${reportId}`, host); } diff --git a/frontend/src/api/modules/user/index.ts b/frontend/src/api/modules/user/index.ts index 98624e6daa..1f1d42b0ae 100644 --- a/frontend/src/api/modules/user/index.ts +++ b/frontend/src/api/modules/user/index.ts @@ -85,8 +85,8 @@ export function addLocalConfig(data: AddLocalConfigParams) { } // 个人设置-验证本地执行配置 -export function validLocalConfig(id: string) { - return MSR.get({ url: ValidLocalConfigUrl, params: id }); +export function validLocalConfig(host: string) { + return MSR.get({ url: `${host}${ValidLocalConfigUrl}` }); } // 个人设置-获取本地执行配置 diff --git a/frontend/src/api/requrls/api-test/debug.ts b/frontend/src/api/requrls/api-test/debug.ts index 61410e53ab..67897858c0 100644 --- a/frontend/src/api/requrls/api-test/debug.ts +++ b/frontend/src/api/requrls/api-test/debug.ts @@ -1,4 +1,5 @@ export const ExecuteApiDebugUrl = '/api/debug/debug'; // 执行调试 +export const LocalExecuteApiDebugUrl = '/api/debug'; // 本地执行调试 export const AddApiDebugUrl = '/api/debug/add'; // 新增调试 export const UpdateApiDebugUrl = '/api/debug/update'; // 更新调试 export const GetApiDebugDetailUrl = '/api/debug/get'; // 获取接口调试详情 diff --git a/frontend/src/api/requrls/user.ts b/frontend/src/api/requrls/user.ts index 8d5b39b051..7afd186121 100644 --- a/frontend/src/api/requrls/user.ts +++ b/frontend/src/api/requrls/user.ts @@ -7,7 +7,7 @@ export const GetMenuListUrl = '/api/user/menu'; export const GetPublicKeyUrl = '/get-key'; export const UpdateLocalConfigUrl = '/user/local/config/update'; // 个人设置-更新本地执行配置 export const AddLocalConfigUrl = '/user/local/config/add'; // 个人设置-添加本地执行 -export const ValidLocalConfigUrl = '/user/local/config/validate'; // 个人设置-验证本地执行 +export const ValidLocalConfigUrl = '/status'; // 个人设置-验证本地执行 export const GetLocalConfigUrl = '/user/local/config/get'; // 个人设置-获取本地执行配置 export const EnableLocalConfigUrl = '/user/local/config/enable'; // 个人设置-启用本地执行配置 export const DisableLocalConfigUrl = '/user/local/config/disable'; // 个人设置-禁用本地执行配置 diff --git a/frontend/src/components/business/ms-personal-drawer/components/localExec.vue b/frontend/src/components/business/ms-personal-drawer/components/localExec.vue index 98c138ca4b..b0be943e5e 100644 --- a/frontend/src/components/business/ms-personal-drawer/components/localExec.vue +++ b/frontend/src/components/business/ms-personal-drawer/components/localExec.vue @@ -49,7 +49,8 @@ -
+ +
@@ -155,10 +156,13 @@ }); async function testApi() { + if (apiConfig.value.userUrl.trim() === '') { + return; + } try { testApiLoading.value = true; - const res = await validLocalConfig(apiConfig.value.id); - apiConfig.value.status = res ? 1 : 2; + const res = await validLocalConfig(apiConfig.value.userUrl.trim()); + apiConfig.value.status = res === 'OK' ? 1 : 2; if (res) { // 检测通过才保存配置 if (apiConfig.value.id) { @@ -212,6 +216,9 @@ }); async function testUi() { + if (uiConfig.value.userUrl.trim() === '') { + return; + } try { testUiLoading.value = true; if (uiConfig.value.id) { @@ -227,8 +234,8 @@ }); uiConfig.value.id = result.id; } - const res = await validLocalConfig(uiConfig.value.id); - uiConfig.value.status = res ? 1 : 2; + const res = await validLocalConfig(uiConfig.value.userUrl.trim()); + uiConfig.value.status = res === 'OK' ? 1 : 2; if (res) { Message.success(t('ms.personal.testPass')); } else { diff --git a/frontend/src/models/apiTest/debug.ts b/frontend/src/models/apiTest/debug.ts index cba6f98e80..26e59389b3 100644 --- a/frontend/src/models/apiTest/debug.ts +++ b/frontend/src/models/apiTest/debug.ts @@ -317,6 +317,7 @@ export interface ExecuteRequestParams { linkFileIds: string[]; request: ExecuteHTTPRequestFullParams | ExecutePluginRequestParams; projectId: string; + frontendDebug?: boolean; // 是否本地调试，该模式下接口会返回执行参数，用来调用本地执行服务 } // 保存接口调试入参 export interface SaveDebugParams { diff --git a/frontend/src/views/api-test/components/requestComposition/index.vue b/frontend/src/views/api-test/components/requestComposition/index.vue index 4e1ee9b90c..a914f58949 100644 --- a/frontend/src/views/api-test/components/requestComposition/index.vue +++ b/frontend/src/views/api-test/components/requestComposition/index.vue @@ -54,7 +54,7 @@ v-if="!requestVModel.executeLoading" :disabled="requestVModel.executeLoading || (isHttpProtocol && !requestVModel.url)" class="exec-btn" - @click="execute" + @click="() => execute(isPriorityLocalExec ? 'localExec' : 'serverExec')" @select="execute" > {{ isPriorityLocalExec ? t('apiTestDebug.localExec') : t('apiTestDebug.serverExec') }} @@ -62,7 +62,7 @@ @@ -325,6 +325,7 @@ isDefinition?: boolean; // 是否是接口定义模式 hideResponseLayoutSwitch?: boolean; // 是否隐藏响应体的布局切换 executeApi: (...args) => Promise; // 执行接口 + localExecuteApi: (...args) => Promise; // 本地执行接口 createApi: (...args) => Promise; // 创建接口 updateApi: (...args) => Promise; // 更新接口 uploadTempFileApi?: (...args) => Promise; // 上传临时文件接口 @@ -468,6 +469,7 @@ const hasLocalExec = ref(false); // 是否配置了api本地执行 const isPriorityLocalExec = ref(false); // 是否优先本地执行 + const localExecuteUrl = ref(''); async function initLocalConfig() { try { const res = await getLocalConfig(); @@ -475,6 +477,7 @@ if (apiLocalExec) { hasLocalExec.value = true; isPriorityLocalExec.value = apiLocalExec.enable || false; + localExecuteUrl.value = apiLocalExec.userUrl || ''; } } catch (error) { // eslint-disable-next-line no-console @@ -656,8 +659,12 @@ const reportId = ref(''); const websocket = ref(); - function debugSocket() { - websocket.value = getSocket(reportId.value); + function debugSocket(executeType?: 'localExec' | 'serverExec') { + websocket.value = getSocket( + reportId.value, + executeType === 'localExec' ? '/ws/debug' : '', + executeType === 'localExec' ? localExecuteUrl.value : '' + ); websocket.value.addEventListener('message', (event) => { const data = JSON.parse(event.data); if (data.msgType === 'EXEC_RESULT') { @@ -700,7 +707,7 @@ } ); - function makeRequestParams() { + function makeRequestParams(executeType?: 'localExec' | 'serverExec') { const { formDataBody, wwwFormBody } = requestVModel.value.body; const polymorphicName = protocolOptions.value.find( (e) => e.value === requestVModel.value.protocol @@ -743,7 +750,7 @@ } reportId.value = getGenerateId(); requestVModel.value.reportId = reportId.value; // 存储报告ID - debugSocket(); // 开启websocket + debugSocket(executeType); // 开启websocket return { id: requestVModel.value.id.toString(), reportId: reportId.value, @@ -768,6 +775,7 @@ }, ...parseRequestBodyResult, projectId: appStore.currentProjectId, + frontendDebug: executeType === 'localExec', }; } @@ -775,12 +783,14 @@ * 执行调试 * @param val 执行类型 */ - async function execute(execuetType?: 'localExec' | 'serverExec') { - // TODO:本地&服务端执行判断 + async function execute(executeType?: 'localExec' | 'serverExec') { if (isHttpProtocol.value) { try { requestVModel.value.executeLoading = true; - await props.executeApi(makeRequestParams()); + const res = await props.executeApi(makeRequestParams(executeType)); + if (executeType === 'localExec') { + await props.localExecuteApi(localExecuteUrl.value, res); + } } catch (error) { // eslint-disable-next-line no-console console.log(error); @@ -792,7 +802,10 @@ if (valid === true) { try { requestVModel.value.executeLoading = true; - await props.executeApi(makeRequestParams()); + const res = await props.executeApi(makeRequestParams(executeType)); + if (executeType === 'localExec') { + await props.localExecuteApi(localExecuteUrl.value, res); + } } catch (error) { // eslint-disable-next-line no-console console.log(error); diff --git a/frontend/src/views/api-test/debug/index.vue b/frontend/src/views/api-test/debug/index.vue index b793d3cdfd..cc5414b78b 100644 --- a/frontend/src/views/api-test/debug/index.vue +++ b/frontend/src/views/api-test/debug/index.vue @@ -38,6 +38,7 @@ :create-api="addDebug" :update-api="updateDebug" :execute-api="executeDebug" + :local-execute-api="localExecuteApiDebug" :upload-temp-file-api="uploadTempFile" @add-done="handleDebugAddDone" /> @@ -93,7 +94,14 @@ import apiMethodName from '@/views/api-test/components/apiMethodName.vue'; import debug, { RequestParam } from '@/views/api-test/components/requestComposition/index.vue'; - import { addDebug, executeDebug, getDebugDetail, updateDebug, uploadTempFile } from '@/api/modules/api-test/debug'; + import { + addDebug, + executeDebug, + getDebugDetail, + localExecuteApiDebug, + updateDebug, + uploadTempFile, + } from '@/api/modules/api-test/debug'; import { useI18n } from '@/hooks/useI18n'; import useModal from '@/hooks/useModal'; import { parseCurlScript } from '@/utils'; diff --git a/frontend/src/views/api-test/management/components/management/api/index.vue b/frontend/src/views/api-test/management/components/management/api/index.vue index c29b570c4f..ebd436e873 100644 --- a/frontend/src/views/api-test/management/components/management/api/index.vue +++ b/frontend/src/views/api-test/management/components/management/api/index.vue @@ -24,6 +24,7 @@ :create-api="addDebug" :update-api="updateDebug" :execute-api="executeDebug" + :local-execute-api="localExecuteApiDebug" is-definiton @add-done="emit('addDone')" /> @@ -84,7 +85,13 @@ import apiTable from './apiTable.vue'; import apiMethodName from '@/views/api-test/components/apiMethodName.vue'; - import { addDebug, executeDebug, getDebugDetail, updateDebug } from '@/api/modules/api-test/debug'; + import { + addDebug, + executeDebug, + getDebugDetail, + localExecuteApiDebug, + updateDebug, + } from '@/api/modules/api-test/debug'; import { useI18n } from '@/hooks/useI18n'; import { ExecuteBody } from '@/models/apiTest/debug';