From b1a48dcd943f97b6cc4408c8f43aa2935543bc70 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Fri, 2 Feb 2024 11:56:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=8E=AF=E5=A2=83=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/api/dto/ParameterConfig.java       |   4 +++-
 .../metersphere/api/dto/ApiParamConfig.java   |   6 +++---
 .../api/dto/ApiScenarioParamConfig.java       |   2 +-
 .../ApiScenarioControllerTests.java           |   2 +-
 .../resources/file/tcpp-sampler-env-test.jar  | Bin 522092 -> 522096 bytes
 .../dto/environment/EnvironmentConfig.java    |   2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/backend/framework/plugin/plugin-api-sdk/src/main/java/io/metersphere/plugin/api/dto/ParameterConfig.java b/backend/framework/plugin/plugin-api-sdk/src/main/java/io/metersphere/plugin/api/dto/ParameterConfig.java
index f691b4c67e..196b7abb16 100644
--- a/backend/framework/plugin/plugin-api-sdk/src/main/java/io/metersphere/plugin/api/dto/ParameterConfig.java
+++ b/backend/framework/plugin/plugin-api-sdk/src/main/java/io/metersphere/plugin/api/dto/ParameterConfig.java
@@ -3,6 +3,8 @@ package io.metersphere.plugin.api.dto;
 import io.metersphere.plugin.api.spi.AbstractMsTestElement;
 import lombok.Data;
 
+import java.util.Map;
+
 /**
  * @Author: jianxing
  * @CreateTime: 2023-10-27  17:30
@@ -21,5 +23,5 @@ public abstract class ParameterConfig {
      * @param msTestElement 当前 AbstractMsTestElement 的实现类对象
      * @return
      */
-    public abstract Object getProtocolEnvConfig(AbstractMsTestElement msTestElement);
+    public abstract Map<String, Object> getProtocolEnvConfig(AbstractMsTestElement msTestElement);
 }
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiParamConfig.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiParamConfig.java
index 6adc6a500d..7eb8482890 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiParamConfig.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiParamConfig.java
@@ -30,7 +30,7 @@ public class ApiParamConfig extends ParameterConfig {
 
 
     @Override
-    public Object getProtocolEnvConfig(AbstractMsTestElement msTestElement) {
+    public Map<String, Object> getProtocolEnvConfig(AbstractMsTestElement msTestElement) {
         return getProtocolEnvConfig(msTestElement, getEnvConfig());
     }
 
@@ -40,7 +40,7 @@ public class ApiParamConfig extends ParameterConfig {
      * @param envConfig 当前的环境配置信息
      * @return
      */
-    public Object getProtocolEnvConfig(AbstractMsTestElement msTestElement,
+    public Map<String, Object> getProtocolEnvConfig(AbstractMsTestElement msTestElement,
                                        EnvironmentInfoDTO envConfig) {
         if (envConfig == null
                 || envConfig.getConfig() == null
@@ -49,7 +49,7 @@ public class ApiParamConfig extends ParameterConfig {
                 || testElementClassPluginIdMap.get(msTestElement.getClass()) == null) {
             return null;
         }
-        Map<String, Object> pluginConfigMap = envConfig.getConfig().getPluginConfigMap();
+        Map<String, Map<String, Object>> pluginConfigMap = envConfig.getConfig().getPluginConfigMap();
         String pluginId = testElementClassPluginIdMap.get(msTestElement.getClass());
         return pluginConfigMap.get(pluginId);
     }
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiScenarioParamConfig.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiScenarioParamConfig.java
index 3258b02ec4..cac372a29f 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiScenarioParamConfig.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiScenarioParamConfig.java
@@ -27,7 +27,7 @@ public class ApiScenarioParamConfig extends ApiParamConfig {
     private Boolean grouped;
 
     @Override
-    public Object getProtocolEnvConfig(AbstractMsTestElement msTestElement) {
+    public Map<String, Object> getProtocolEnvConfig(AbstractMsTestElement msTestElement) {
         if (BooleanUtils.isTrue(grouped)) {
             return getProtocolEnvConfig(msTestElement, projectEnvMap.get(msTestElement.getProjectId()));
         } else {
diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioControllerTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioControllerTests.java
index 2d64e92d34..797b95365e 100644
--- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioControllerTests.java
+++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioControllerTests.java
@@ -680,7 +680,7 @@ public class ApiScenarioControllerTests extends BaseTest {
         envRequest.setProjectId(DEFAULT_PROJECT_ID);
         envRequest.setName("test scenario debug");
         // 添加插件的环境配置，供后续测试使用
-        Map<String, Object> pluginConfigMap = new HashMap<>();
+        Map<String, Map<String, Object>> pluginConfigMap = new HashMap<>();
         pluginConfigMap.put("tcpp-sampler", new HashMap<>());
         EnvironmentConfig environmentConfig = new EnvironmentConfig();
         environmentConfig.setPluginConfigMap(pluginConfigMap);
diff --git a/backend/services/api-test/src/test/resources/file/tcpp-sampler-env-test.jar b/backend/services/api-test/src/test/resources/file/tcpp-sampler-env-test.jar
index c93c81a7334ebb5bab98a73024a58198da495e01..e34ae891c2bd22235b9186552d3b7acb218b445e 100644
GIT binary patch
delta 1674
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

delta 1685
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

diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/dto/environment/EnvironmentConfig.java b/backend/services/project-management/src/main/java/io/metersphere/project/dto/environment/EnvironmentConfig.java
index a06bde8f46..4fa36cca14 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/dto/environment/EnvironmentConfig.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/dto/environment/EnvironmentConfig.java
@@ -38,7 +38,7 @@ public class EnvironmentConfig implements Serializable {
     @Schema(description = "全局断言")
     private MsEnvAssertionConfig assertionConfig;
     @Schema(description = "插件自定义的配置项，key为插件ID，value 为对应配置")
-    private Map<String, Object> pluginConfigMap;
+    private Map<String, Map<String, Object>> pluginConfigMap;
 
 
     public EnvironmentConfig() {