From 025fa9cde07b9224daf6377c780a238d45b52d34 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 26 Feb 2021 13:14:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=9C=BA=E6=99=AF=E6=AD=A5=E9=AA=A4=E4=B8=AD?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=97=A0=E6=B3=95=E6=89=A7=E8=A1=8C=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/definition/request/MsScenario.java |  2 +-
 .../request/sampler/MsHTTPSamplerProxy.java    |  2 +-
 .../api/service/ApiDefinitionService.java      | 16 ++++++++++++++++
 .../automation/scenario/EditApiScenario.vue    |  2 +-
 .../scenario/component/ApiComponent.vue        | 18 +++++++++++++-----
 .../scenario/component/ComponentConfig.vue     |  5 +++--
 .../api/definition/components/Run.vue          | 16 +++++++++++++---
 .../definition/components/case/ApiCaseList.vue |  4 +++-
 .../components/runtest/RunTestHTTPPage.vue     |  3 ++-
 frontend/src/common/js/utils.js                |  8 ++++++++
 10 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
index b0ae06627b..104c568e6c 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
@@ -189,7 +189,7 @@ public class MsScenario extends MsTestElement {
                 }
             });
         }
-        if (config != null && config.getConfig() != null && config.getConfig().get(this.getProjectId()).getCommonConfig() != null
+        if (config != null && config.getConfig() != null && config.getConfig().get(this.getProjectId()) != null && config.getConfig().get(this.getProjectId()).getCommonConfig() != null
                 && CollectionUtils.isNotEmpty(config.getConfig().get(this.getProjectId()).getCommonConfig().getVariables())) {
             config.getConfig().get(this.getProjectId()).getCommonConfig().getVariables().stream().filter(KeyValue::isValid).filter(KeyValue::isEnable).forEach(keyValue ->
                     arguments.addArgument(keyValue.getName(), keyValue.getValue(), "=")
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index 726df485fe..1ce15e9f3d 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -114,7 +114,7 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         sampler.setFollowRedirects(this.isFollowRedirects());
         sampler.setUseKeepAlive(true);
         sampler.setDoMultipart(this.isDoMultipartPost());
-        if (config != null && config.getConfig() != null) {
+        if (config != null && config.getConfig() != null && !config.getConfig().isEmpty()) {
             config.setConfig(config.getConfig());
         } else {
             // 单独接口执行
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index cf39bcd701..8f9a45da4b 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -13,6 +13,7 @@ import io.metersphere.api.dto.definition.parse.ApiDefinitionImportParserFactory;
 import io.metersphere.api.dto.definition.request.ParameterConfig;
 import io.metersphere.api.dto.definition.request.ScheduleInfoSwaggerUrlRequest;
 import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
+import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
 import io.metersphere.api.dto.scenario.request.RequestType;
 import io.metersphere.api.dto.swaggerurl.SwaggerTaskResult;
 import io.metersphere.api.dto.swaggerurl.SwaggerUrlRequest;
@@ -85,6 +86,8 @@ public class ApiDefinitionService {
     private ScheduleMapper scheduleMapper;
     @Resource
     private ApiTestCaseMapper apiTestCaseMapper;
+    @Resource
+    private ApiTestEnvironmentService environmentService;
 
     private static Cache cache = Cache.newHardMemoryCache(0, 3600 * 24);
 
@@ -427,8 +430,21 @@ public class ApiDefinitionService {
     public String run(RunDefinitionRequest request, List<MultipartFile> bodyFiles) {
         List<String> bodyUploadIds = new ArrayList<>(request.getBodyUploadIds());
         FileUtils.createBodyFiles(bodyUploadIds, bodyFiles);
+
         ParameterConfig config = new ParameterConfig();
         config.setProjectId(request.getProjectId());
+
+        Map<String, EnvironmentConfig> envConfig = new HashMap<>();
+        Map<String, String> map = request.getEnvironmentMap();
+        if (map != null) {
+            map.keySet().forEach(id -> {
+                ApiTestEnvironmentWithBLOBs environment = environmentService.get(map.get(id));
+                EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
+                envConfig.put(id, env);
+            });
+            config.setConfig(envConfig);
+        }
+
         HashTree hashTree = request.getTestElement().generateHashTree(config);
         String runMode = ApiRunMode.DEFINITION.name();
         if (StringUtils.isNotBlank(request.getType()) && StringUtils.equals(request.getType(), ApiRunMode.API_PLAN.name())) {
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 25caf7618a..78ae9e667b 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -149,7 +149,7 @@
                     <span class="custom-tree-node father" slot-scope="{ node, data}" style="width: 96%">
                       <!-- 步骤组件-->
                        <ms-component-config :type="data.type" :scenario="data" :response="response" :currentScenario="currentScenario"
-                                            :currentEnvironmentId="currentEnvironmentId" :node="node" :project-list="projectList"
+                                            :currentEnvironmentId="currentEnvironmentId" :node="node" :project-list="projectList" :env-map="projectEnvMap"
                                             @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="reload"/>
                     </span>
               </el-tree>
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 2d8644c056..1bfc9ebdc0 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -16,7 +16,7 @@
       <el-tag size="mini" style="margin-left: 20px" v-if="request.referenced==='Copy'">{{ $t('commons.copy') }}</el-tag>
       <el-tag size="mini" style="margin-left: 20px" v-if="request.referenced ==='REF'">{{ $t('api_test.scenario.reference') }}</el-tag>
       <span style="margin-left: 20px;">{{getProjectName(request.projectId)}}</span>
-      <ms-run :debug="true" :reportId="reportId" :run-data="runData"
+      <ms-run :debug="true" :reportId="reportId" :run-data="runData" :env-map="envMap"
               @runRefresh="runRefresh" ref="runTest"/>
 
     </template>
@@ -84,7 +84,8 @@
         default: false,
       },
       currentEnvironmentId: String,
-      projectList: Array
+      projectList: Array,
+      envMap: Map
     },
     components: {
       CustomizeReqInfo,
@@ -249,13 +250,20 @@
         this.reload();
       },
       run() {
-        if (!this.currentEnvironmentId) {
-          this.$error(this.$t('api_test.environment.select_environment'));
-          return;
+        if (!this.envMap || this.envMap.size === 0) {
+          this.$warning("请在环境配置中为该步骤所属项目选择运行环境！");
+          return false;
+        } else if (this.envMap && this.envMap.size > 0) {
+          const env = this.envMap.get(this.request.projectId);
+          if (!env) {
+            this.$warning("请在环境配置中为该步骤所属项目选择运行环境！");
+            return false;
+          }
         }
         this.request.active = true;
         this.loading = true;
         this.runData = [];
+        this.runData.projectId = this.request.projectId;
         this.request.useEnvironment = this.currentEnvironmentId;
         this.request.customizeReq = this.isCustomizeReq;
         let debugData = {
diff --git a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
index 12ed422f4e..4b5d93a5f2 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
@@ -2,7 +2,7 @@
   <div class="request-form">
     <component :is="component" :scenario="scenario" :controller="scenario" :timer="scenario" :assertions="scenario" :extract="scenario" :jsr223-processor="scenario" :request="scenario" :currentScenario="currentScenario" :currentEnvironmentId="currentEnvironmentId" :node="node"
                :draggable="true" :title="title" :color="titleColor" :background-color="backgroundColor" @suggestClick="suggestClick(node)" :response="response"
-               @remove="remove" @copyRow="copyRow" @refReload="refReload" :project-list="projectList"/>
+               @remove="remove" @copyRow="copyRow" @refReload="refReload" :project-list="projectList" :env-map="envMap"/>
   </div>
 </template>
 
@@ -28,7 +28,8 @@
       currentEnvironmentId: String,
       response: {},
       node: {},
-      projectList: Array
+      projectList: Array,
+      envMap: Map
     },
     data() {
       return {
diff --git a/frontend/src/business/components/api/definition/components/Run.vue b/frontend/src/business/components/api/definition/components/Run.vue
index e53b698131..d8d6d9ae85 100644
--- a/frontend/src/business/components/api/definition/components/Run.vue
+++ b/frontend/src/business/components/api/definition/components/Run.vue
@@ -2,7 +2,7 @@
   <span></span>
 </template>
 <script>
-  import {getUUID, getBodyUploadFiles,getCurrentProjectID} from "@/common/js/utils";
+import {getUUID, getBodyUploadFiles, getCurrentProjectID, strMapToObj} from "@/common/js/utils";
   import ThreadGroup from "./jmeter/components/thread-group";
   import TestPlan from "./jmeter/components/test-plan";
 
@@ -14,7 +14,8 @@
       debug: Boolean,
       reportId: String,
       runData: Array,
-      type: String
+      type: String,
+      envMap: Map
     },
     data() {
       return {
@@ -64,7 +65,16 @@
         this.runData.forEach(item => {
           threadGroup.hashTree.push(item);
         })
-        let reqObj = {id: this.reportId, testElement: testPlan, type: this.type,projectId:getCurrentProjectID()};
+
+        let projectId = "";
+        // 如果envMap不存在，是单接口调用
+        if (!this.envMap) {
+          projectId = getCurrentProjectID();
+        } else {
+          // 场景步骤下接口调用
+          projectId = this.runData.projectId;
+        }
+        let reqObj = {id: this.reportId, testElement: testPlan, type: this.type,projectId:getCurrentProjectID(), environmentMap: strMapToObj(this.envMap)};
         let bodyFiles = getBodyUploadFiles(reqObj, this.runData);
         let url = "";
         if (this.debug) {
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 0282739dd8..3acbe1b7a1 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -38,7 +38,7 @@
     </ms-drawer>
 
     <!-- 执行组件 -->
-    <ms-run :debug="false" :environment="environment" :reportId="reportId" :run-data="runData"
+    <ms-run :debug="false" :environment="environment" :reportId="reportId" :run-data="runData" :env-map="envMap"
             @runRefresh="runRefresh" ref="runTest"/>
     <!--批量编辑-->
     <ms-batch-edit ref="batchEdit" @batchEdit="batchEdit" :typeArr="typeArr" :value-arr="valueArr"/>
@@ -111,6 +111,7 @@
           priority: CASE_PRIORITY,
           method: REQ_METHOD,
         },
+        envMap: new Map
       }
     },
     watch: {
@@ -274,6 +275,7 @@
         this.$get('/api/definition/get/' + row.request.id, response => {
           row.request.path = response.data.path;  //  取的path是对应接口的path，因此查库以获得
           row.request.useEnvironment = this.environment.id;
+          row.request.projectId = getCurrentProjectID();
           this.runData.push(row.request);
           /*触发执行操作*/
           this.reportId = getUUID().substring(0, 8);
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
index 91054215dd..58e2d947bd 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
@@ -64,7 +64,7 @@
                       ref="caseList"/>
 
     <!-- 执行组件 -->
-    <ms-run :debug="false" :environment="api.environment" :reportId="reportId" :run-data="runData"
+    <ms-run :debug="false" :environment="api.environment" :reportId="reportId" :run-data="runData" :env-map="envMap"
             @runRefresh="runRefresh" ref="runTest"/>
 
   </div>
@@ -110,6 +110,7 @@ export default {
         },
         runData: [],
         reportId: "",
+        envMap: new Map
       }
     },
     props: {apiData: {}, currentProtocol: String, syncTabs: Array, projectId: String},
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index deca536429..4faaccda89 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -328,3 +328,11 @@ export function handleCtrlSEvent(event, func) {
     return false;
   }
 }
+
+export function strMapToObj(strMap){
+  let obj= Object.create(null);
+  for (let[k,v] of strMap) {
+    obj[k] = v;
+  }
+  return obj;
+}