diff --git a/api-test/frontend/src/business/automation/report/ApiReportViewHeader.vue b/api-test/frontend/src/business/automation/report/ApiReportViewHeader.vue index 52339c1d26..584485c677 100644 --- a/api-test/frontend/src/business/automation/report/ApiReportViewHeader.vue +++ b/api-test/frontend/src/business/automation/report/ApiReportViewHeader.vue @@ -151,15 +151,12 @@ export default { $event.target.blur(); }, redirect() { + let uuid = getUUID().substring(1, 5); + let projectId = getCurrentProjectID(); + let workspaceId = getCurrentWorkspaceId(); + let path = `/api/automation/?redirectID=${uuid}&dataType=scenario&projectId=${projectId}&workspaceId=${workspaceId}&resourceId=${this.scenarioId}`; let data = this.$router.resolve({ - name: 'ApiAutomation', - query: { - redirectID: getUUID(), - dataType: "scenario", - projectId: getCurrentProjectID(), - workspaceId: getCurrentWorkspaceId(), - resourceId: this.scenarioId - } + path: path }); window.open(data.href, '_blank'); }, diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/task/service/TaskService.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/task/service/TaskService.java index 83e0536a43..65d88d2b3f 100644 --- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/task/service/TaskService.java +++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/task/service/TaskService.java @@ -89,7 +89,7 @@ public class TaskService { microService.postForData(MicroServiceName.API_TEST, "/api/automation/stop/batch", reportIds); } if (taskRequestMap.containsKey(PERF)) { - microService.postForData(MicroServiceName.API_TEST, "/performance/stop/batch", taskRequestMap.get(PERF)); + microService.postForData(MicroServiceName.PERFORMANCE_TEST, "/performance/stop/batch", taskRequestMap.get(PERF)); } if(taskRequestMap.containsKey(UI)){ microService.postForData(MicroServiceName.UI_TEST, "/ui/automation/stop/batch", reportIds); @@ -100,7 +100,7 @@ public class TaskService { public void stopPerf(List reportIds) { if (CollectionUtils.isNotEmpty(reportIds)) { Map taskRequestMap = reportIds.stream().collect(Collectors.toMap(TaskRequestDTO::getType, taskRequest -> taskRequest)); - microService.postForData(MicroServiceName.API_TEST, "/performance/stop/batch", taskRequestMap.get(PERF)); + microService.postForData(MicroServiceName.PERFORMANCE_TEST, "/performance/stop/batch", taskRequestMap.get(PERF)); } }