From 9aed5a57a971b4992277fcfff25fa94cbf2d334e Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 8 Mar 2021 10:10:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=97=B6=E6=96=B9=E6=B3=95=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/performance/test/EditPerformanceTest.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/performance/test/EditPerformanceTest.vue b/frontend/src/business/components/performance/test/EditPerformanceTest.vue index 6ae9d29709..7bdf04a6cf 100644 --- a/frontend/src/business/components/performance/test/EditPerformanceTest.vue +++ b/frontend/src/business/components/performance/test/EditPerformanceTest.vue @@ -127,7 +127,7 @@ export default { this.$set(this.test, "name", apiTest.name); let blob = new Blob([apiTest.jmx.xml], {type: "application/octet-stream"}); let file = new File([blob], apiTest.jmx.name); - this.$refs.basicConfig.beforeUpload(file); + this.$refs.basicConfig.beforeUploadJmx(file); this.$refs.basicConfig.handleUpload({file: file}); this.active = '1'; this.$store.commit("clearTest"); From 9fe06d379aa39ff51276cdd5cc2018b005056fa7 Mon Sep 17 00:00:00 2001 From: "song.tianyang" Date: Mon, 8 Mar 2021 10:41:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89workspaceServ?= =?UTF-8?q?ice=E7=94=A8=E4=B8=8D=E5=88=B0=E7=9A=84=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 去掉workspaceService用不到的引用 --- .../src/main/java/io/metersphere/service/WorkspaceService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/main/java/io/metersphere/service/WorkspaceService.java b/backend/src/main/java/io/metersphere/service/WorkspaceService.java index b2e073a71d..b9e9cb7eb4 100644 --- a/backend/src/main/java/io/metersphere/service/WorkspaceService.java +++ b/backend/src/main/java/io/metersphere/service/WorkspaceService.java @@ -1,6 +1,5 @@ package io.metersphere.service; -import com.sun.corba.se.spi.orbutil.threadpool.Work; import io.metersphere.base.domain.*; import io.metersphere.base.mapper.ProjectMapper; import io.metersphere.base.mapper.UserMapper; From 691364a527a2d349262c66368bc0778d4f6e7259 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Mon, 8 Mar 2021 11:21:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?= =?UTF-8?q?=20=E5=9C=BA=E6=99=AF=E7=94=A8=E4=BE=8B=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=9A=84=E6=89=A7=E8=A1=8C=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/api/service/ApiAutomationService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java index 5c99b63cd1..e1e3f6ed8c 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java @@ -415,6 +415,12 @@ public class ApiAutomationService { String testPlanScenarioId = item.getId(); if (request.getScenarioTestPlanIdMap() != null && request.getScenarioTestPlanIdMap().containsKey(item.getId())) { testPlanScenarioId = request.getScenarioTestPlanIdMap().get(item.getId()); + // 获取场景用例单独的执行环境 + TestPlanApiScenario planApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(testPlanScenarioId); + String environment = planApiScenario.getEnvironment(); + if (StringUtils.isNotBlank(environment)) { + scenario.setEnvironmentMap(JSON.parseObject(environment, Map.class)); + } } createScenarioReport(group.getName(), testPlanScenarioId, item.getName(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode(), request.getExecuteType(), item.getProjectId(), request.getReportUserID()); From 4e393c266036a3d00530640deb1748f587cd706a Mon Sep 17 00:00:00 2001 From: BugKing Date: Mon, 8 Mar 2021 11:23:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E7=9A=84SQL=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V78__v1.8_release.sql | 4 ---- 1 file changed, 4 deletions(-) diff --git a/backend/src/main/resources/db/migration/V78__v1.8_release.sql b/backend/src/main/resources/db/migration/V78__v1.8_release.sql index b798da63f9..bb4704ecb4 100644 --- a/backend/src/main/resources/db/migration/V78__v1.8_release.sql +++ b/backend/src/main/resources/db/migration/V78__v1.8_release.sql @@ -27,10 +27,6 @@ CREATE TABLE IF NOT EXISTS `api_document_share` ( INDEX `share_api_id`(`share_api_id`(125)) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; --- test_case_review add coloumn -ALTER TABLE test_case_review - ADD tags VARCHAR(2000) NULL; - -- swagger_url_project alter table swagger_url_project modify module_id varchar(120) null; From d634f9d5403ea6fdae43c3e4b3d6d21a3e6f06e3 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 8 Mar 2021 13:14:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B2=A1=E6=9C=89=E4=B8=8A=E4=BC=A0=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/performance/test/components/ExistFiles.vue | 8 +++++++- frontend/src/business/components/xpack | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/business/components/performance/test/components/ExistFiles.vue b/frontend/src/business/components/performance/test/components/ExistFiles.vue index 5a8814d357..5a8ea694be 100644 --- a/frontend/src/business/components/performance/test/components/ExistFiles.vue +++ b/frontend/src/business/components/performance/test/components/ExistFiles.vue @@ -121,7 +121,13 @@ export default { if (this.loadType === 'resource') { rows.forEach(row => { - this.tableData.push(row); + this.fileList.push(row); + this.tableData.push({ + name: row.name, + size: (row.size / 1024).toFixed(2) + ' KB', + type: 'JMX', + updateTime: row.lastModified, + }); }) this.$success(this.$t('test_track.case.import.success')); this.loadFileVisible = false; diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index ef5067d0de..e4422e1dc6 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit ef5067d0de3ed940a5d31485f6370f201818dc3a +Subproject commit e4422e1dc640704febfbf469185cd85b78d2147a