test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(接口测试): 修复任务中心报告跳转问题及全部停止报错问题 

--bug=1018298 --user=赵勇 【接口测试】接口自动化批量执行，任务中心点击详情名称进行跳转跳转到错误位置（系统设置） https://www.tapd.cn/55049933/s/1265592
This commit is contained in:
fit2-zhao 2022-10-18 10:59:08 +08:00 committed by f2c-ci-robot[bot]
parent bc681d6c58
commit e5711a2351
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api-test/frontend/src/business/automation/report/ApiReportViewHeader.vue
View File

@ -151,15 +151,12 @@ export default {
$event.target.blur(); $event.target.blur();
}, },
redirect() { 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({ let data = this.$router.resolve({
name: 'ApiAutomation', path: path
query: {
redirectID: getUUID(),
dataType: "scenario",
projectId: getCurrentProjectID(),
workspaceId: getCurrentWorkspaceId(),
resourceId: this.scenarioId
}
}); });
window.open(data.href, '_blank'); window.open(data.href, '_blank');
}, },

4
framework/sdk-parent/sdk/src/main/java/io/metersphere/task/service/TaskService.java
View File

@ -89,7 +89,7 @@ public class TaskService {
microService.postForData(MicroServiceName.API_TEST, "/api/automation/stop/batch", reportIds); microService.postForData(MicroServiceName.API_TEST, "/api/automation/stop/batch", reportIds);
} }
if (taskRequestMap.containsKey(PERF)) { 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)){ if(taskRequestMap.containsKey(UI)){
microService.postForData(MicroServiceName.UI_TEST, "/ui/automation/stop/batch", reportIds); microService.postForData(MicroServiceName.UI_TEST, "/ui/automation/stop/batch", reportIds);
@ -100,7 +100,7 @@ public class TaskService {
public void stopPerf(List<TaskRequestDTO> reportIds) { public void stopPerf(List<TaskRequestDTO> reportIds) {
if (CollectionUtils.isNotEmpty(reportIds)) { if (CollectionUtils.isNotEmpty(reportIds)) {
Map<String, TaskRequestDTO> taskRequestMap = reportIds.stream().collect(Collectors.toMap(TaskRequestDTO::getType, taskRequest -> taskRequest)); Map<String, TaskRequestDTO> 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));
} }
} }