build: api basic function

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinition.java

@@ -27,22 +27,22 @@ public class ApiDefinition implements Serializable {
     @ApiModelProperty(name = "创建时间", required = true, dataType = "Long")
     private Long createTime;
 
-    @Size(min = 1, max = 100, message = "{api_definition.create_user.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{api_definition.create_user.length_range}", groups = {Created.class, Updated.class})
     @NotBlank(message = "{api_definition.create_user.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "创建人", required = true, allowableValues = "range[1, 100]")
+    @ApiModelProperty(name = "创建人", required = true, allowableValues = "range[1, 50]")
     private String createUser;
 
 
     @ApiModelProperty(name = "修改时间", required = true, dataType = "Long")
     private Long updateTime;
 
-    @Size(min = 1, max = 64, message = "{api_definition.update_user.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{api_definition.update_user.length_range}", groups = {Created.class, Updated.class})
     @NotBlank(message = "{api_definition.update_user.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "修改人", required = true, allowableValues = "range[1, 64]")
+    @ApiModelProperty(name = "修改人", required = true, allowableValues = "range[1, 50]")
     private String updateUser;
 
 
-    @ApiModelProperty(name = "删除人", required = false, allowableValues = "range[1, 64]")
+    @ApiModelProperty(name = "删除人", required = false, allowableValues = "range[1, 50]")
     private String deleteUser;
 
 
@@ -59,12 +59,12 @@ public class ApiDefinition implements Serializable {
     @ApiModelProperty(name = "接口名称", required = true, allowableValues = "range[1, 255]")
     private String name;
 
-    @Size(min = 1, max = 64, message = "{api_definition.method.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{api_definition.method.length_range}", groups = {Created.class, Updated.class})
     @NotBlank(message = "{api_definition.method.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "接口类型", required = true, allowableValues = "range[1, 64]")
+    @ApiModelProperty(name = "接口类型", required = true, allowableValues = "range[1, 50]")
     private String method;
 
-    @Size(min = 1, max = 255, message = "{api_definition.protocol.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 20, message = "{api_definition.protocol.length_range}", groups = {Created.class, Updated.class})
     @NotBlank(message = "{api_definition.protocol.not_blank}", groups = {Created.class})
     @ApiModelProperty(name = "接口协议", required = true, allowableValues = "range[1, 255]")
     private String protocol;
@@ -77,9 +77,9 @@ public class ApiDefinition implements Serializable {
     @ApiModelProperty(name = "模块全路径-用于导入处理", required = false, allowableValues = "range[1, 1000]")
     private String modulePath;
 
-    @Size(min = 1, max = 64, message = "{api_definition.status.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{api_definition.status.length_range}", groups = {Created.class, Updated.class})
     @NotBlank(message = "{api_definition.status.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "接口状态/进行中/已完成", required = true, allowableValues = "range[1, 64]")
+    @ApiModelProperty(name = "接口状态/进行中/已完成", required = true, allowableValues = "range[1, 50]")
     private String status;
 
 
@@ -91,7 +91,7 @@ public class ApiDefinition implements Serializable {
     private Integer num;
 
 
-    @ApiModelProperty(name = "标签", required = false, allowableValues = "range[1, 1000]")
+    @ApiModelProperty(name = "标签", required = false, allowableValues = "range[1, 500]")
     private String tags;
 
 

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionBlob.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @ApiModel(value = "接口定义详情内容")
 @TableName("api_definition_blob")
 @Data
-public class ApiDefinitionBlob implements Serializable {
+public class ApiDefinitionBlob extends ApiDefinition implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMock.java

@@ -24,10 +24,10 @@ public class ApiDefinitionMock implements Serializable {
     @ApiModelProperty(name = "mock pk", required = true, allowableValues = "range[1, 50]")
     private String id;
 
-    @ApiModelProperty(name = "接口路径", required = false, allowableValues = "range[1, 1000]")
+    @ApiModelProperty(name = "接口路径", required = false, allowableValues = "range[1, 500]")
     private String apiPath;
 
-    @ApiModelProperty(name = "接口类型", required = false, allowableValues = "range[1, 64]")
+    @ApiModelProperty(name = "接口类型", required = false, allowableValues = "range[1, 50]")
     private String apiMethod;
 
     @ApiModelProperty(name = "创建时间", required = true, dataType = "Long")
@@ -36,9 +36,9 @@ public class ApiDefinitionMock implements Serializable {
     @ApiModelProperty(name = "修改时间", required = true, dataType = "Long")
     private Long updateTime;
 
-    @Size(min = 1, max = 64, message = "{api_definition_mock.create_user.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{api_definition_mock.create_user.length_range}", groups = {Created.class, Updated.class})
     @NotBlank(message = "{api_definition_mock.create_user.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "创建人", required = true, allowableValues = "range[1, 64]")
+    @ApiModelProperty(name = "创建人", required = true, allowableValues = "range[1, 50]")
     private String createUser;
 
     @Size(min = 1, max = 200, message = "{api_definition_mock.name.length_range}", groups = {Created.class, Updated.class})
@@ -46,11 +46,11 @@ public class ApiDefinitionMock implements Serializable {
     @ApiModelProperty(name = "mock 名称", required = true, allowableValues = "range[1, 200]")
     private String name;
 
-    @ApiModelProperty(name = "自定义标签", required = false, allowableValues = "range[1, 1000]")
+    @ApiModelProperty(name = "自定义标签", required = false, allowableValues = "range[1, 500]")
     private String tags;
 
-    @ApiModelProperty(name = "状态", required = false, allowableValues = "range[1, 10]")
+    @ApiModelProperty(name = "启用/禁用", required = false, dataType = "boolean")
-    private String status;
+    private boolean enable;
 
     @Size(min = 1, max = 50, message = "{api_definition_mock.expect_num.length_range}", groups = {Created.class, Updated.class})
     @NotBlank(message = "{api_definition_mock.expect_num.not_blank}", groups = {Created.class})

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionSwagger.java

@@ -21,7 +21,7 @@ public class ApiDefinitionSwagger implements Serializable {
 
     @TableId
     @NotBlank(message = "{api_definition_swagger.id.not_blank}", groups = {Updated.class})
-    @ApiModelProperty(name = "主键", required = true, allowableValues = "range[1, 120]")
+    @ApiModelProperty(name = "主键", required = true, allowableValues = "range[1, 50]")
     private String id;
 
     @Size(min = 1, max = 500, message = "{api_definition_swagger.swagger_url.length_range}", groups = {Created.class, Updated.class})

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionTemplate.java

@@ -1,61 +0,0 @@
-
-package io.metersphere.api.domain;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@ApiModel(value = "API模版表")
-@TableName("api_definition_template")
-@Data
-public class ApiDefinitionTemplate implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId
-    @NotBlank(message = "{api_definition_template.id.not_blank}", groups = {Updated.class})
-    @ApiModelProperty(name = "模版主键", required = true, allowableValues = "range[1, 50]")
-    private String id;
-
-    @Size(min = 1, max = 100, message = "{api_definition_template.name.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_definition_template.name.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "API模版名称", required = true, allowableValues = "range[1, 100]")
-    private String name;
-
-    @Size(min = 1, max = 1, message = "{api_definition_template.system.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_definition_template.system.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "是否是系统模版", required = true, allowableValues = "range[1, 1]")
-    private Boolean system;
-
-    @Size(min = 1, max = 1, message = "{api_definition_template.global.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_definition_template.global.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "是否是公共模版", required = true, allowableValues = "range[1, 1]")
-    private Boolean global;
-
-    @ApiModelProperty(name = "创建时间", required = true, dataType = "Long")
-    private Long createTime;
-
-    @ApiModelProperty(name = "更新时间", required = true, dataType = "Long")
-    private Long updateTime;
-
-    @Size(min = 1, max = 50, message = "{api_definition_template.create_user.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_definition_template.create_user.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "创建人", required = true, allowableValues = "range[1, 50]")
-    private String createUser;
-
-    @Size(min = 1, max = 50, message = "{api_definition_template.project_id.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_definition_template.project_id.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "项目fk", required = true, allowableValues = "range[1, 50]")
-    private String projectId;
-
-    @ApiModelProperty(name = "API模版描述", required = false, allowableValues = "range[1, 500]")
-    private String description;
-
-}

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiEnvironmentConfig.java

@@ -13,10 +13,10 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel(value = "接口定义环境")
+@ApiModel(value = "接口定义公共部分环境")
-@TableName("api_definition_env")
+@TableName("api_environment_config")
 @Data
-public class ApiDefinitionEnv implements Serializable {
+public class ApiEnvironmentConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiLoadTest.java

@@ -1,46 +0,0 @@
-
-package io.metersphere.api.domain;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@ApiModel(value = "关联场景测试和性能测试")
-@TableName("api_load_test")
-@Data
-public class ApiLoadTest implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId
-    @NotBlank(message = "{api_load_test.id.not_blank}", groups = {Updated.class})
-    @ApiModelProperty(name = "ID", required = true, allowableValues = "range[1, 50]")
-    private String id;
-
-    @Size(min = 1, max = 50, message = "{api_load_test.resource_id.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_load_test.resource_id.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "接口用例fk/场景用例fk", required = true, allowableValues = "range[1, 50]")
-    private String resourceId;
-
-    @Size(min = 1, max = 50, message = "{api_load_test.load_test_id.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_load_test.load_test_id.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "性能测试用例fk", required = true, allowableValues = "range[1, 50]")
-    private String loadTestId;
-
-    @ApiModelProperty(name = "环境fk", required = false, allowableValues = "range[1, 50]")
-    private String environmentId;
-
-    @Size(min = 1, max = 10, message = "{api_load_test.type.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_load_test.type.not_blank}", groups = {Created.class})
-    @ApiModelProperty(name = "资源类型/CASE/SCENARIO", required = true, allowableValues = "range[1, 10]")
-    private String type;
-
-
-}

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReport.java

@@ -73,10 +73,10 @@ public class ApiReport implements Serializable {
     @ApiModelProperty(name = "执行模块/API/CASE/API_PLAN", required = true, allowableValues = "range[1, 20]")
     private String runMode;
 
-    @Size(min = 1, max = 50, message = "{api_report.resource_pool.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{api_report.pool_id.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_report.resource_pool.not_blank}", groups = {Created.class})
+    @NotBlank(message = "{api_report.pool_id.not_blank}", groups = {Created.class})
     @ApiModelProperty(name = "资源池", required = true, allowableValues = "range[1, 50]")
-    private String resourcePool;
+    private String poolId;
 
     @Size(min = 1, max = 50, message = "{api_report.trigger_mode.length_range}", groups = {Created.class, Updated.class})
     @NotBlank(message = "{api_report.trigger_mode.not_blank}", groups = {Created.class})

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportBlob.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @ApiModel(value = "API/CASE执行结果详情")
 @TableName("api_report_blob")
 @Data
-public class ApiReportBlob implements Serializable {
+public class ApiReportBlob extends ApiReport implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenario.java

@@ -122,7 +122,7 @@ public class ApiScenario implements Serializable {
     @ApiModelProperty(name = "模块全路径/用于导入模块创建", required = false, allowableValues = "range[1, 1000]")
     private String modulePath;
 
-    @ApiModelProperty(name = "标签", required = false, allowableValues = "range[1, 1000]")
+    @ApiModelProperty(name = "标签", required = false, allowableValues = "range[1, 500]")
     private String tags;
 
 }

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioBlob.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @ApiModel(value = "场景步骤详情")
 @TableName("api_scenario_blob")
 @Data
-public class ApiScenarioBlob implements Serializable {
+public class ApiScenarioBlob extends ApiScenario implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioEnvironment.java

@@ -14,23 +14,23 @@ import lombok.Data;
 import java.io.Serializable;
 
 @ApiModel(value = "场景环境")
-@TableName("api_scenario_env")
+@TableName("api_scenario_environment")
 @Data
-public class ApiScenarioEnv implements Serializable {
+public class ApiScenarioEnvironment implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId
-    @NotBlank(message = "{api_scenario_env.id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{api_scenario_environment.id.not_blank}", groups = {Updated.class})
     @ApiModelProperty(name = "场景环境pk", required = true, allowableValues = "range[1, 50]")
     private String id;
 
-    @Size(min = 1, max = 50, message = "{api_scenario_env.api_scenario_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{api_scenario_environment.api_scenario_id.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_scenario_env.api_scenario_id.not_blank}", groups = {Created.class})
+    @NotBlank(message = "{api_scenario_environment.api_scenario_id.not_blank}", groups = {Created.class})
     @ApiModelProperty(name = "场景fk", required = true, allowableValues = "range[1, 50]")
     private String apiScenarioId;
 
-    @Size(min = 1, max = 50, message = "{api_scenario_env.project_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{api_scenario_environment.project_id.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_scenario_env.project_id.not_blank}", groups = {Created.class})
+    @NotBlank(message = "{api_scenario_environment.project_id.not_blank}", groups = {Created.class})
     @ApiModelProperty(name = "项目fk", required = true, allowableValues = "range[1, 50]")
     private String projectId;
 

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReport.java

@@ -74,10 +74,10 @@ public class ApiScenarioReport implements Serializable {
     @ApiModelProperty(name = "执行模式", required = true, allowableValues = "range[1, 20]")
     private String runMode;
 
-    @Size(min = 1, max = 50, message = "{api_scenario_report.resource_pool.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{api_scenario_report.pool_id.length_range}", groups = {Created.class, Updated.class})
-    @NotBlank(message = "{api_scenario_report.resource_pool.not_blank}", groups = {Created.class})
+    @NotBlank(message = "{api_scenario_report.pool_id.not_blank}", groups = {Created.class})
     @ApiModelProperty(name = "资源池", required = true, allowableValues = "range[1, 50]")
-    private String resourcePool;
+    private String poolId;
 
 
     @ApiModelProperty(name = "版本fk", required = false, allowableValues = "range[1, 50]")

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportDetail.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 @ApiModel(value = "场景报告步骤结果")
 @TableName("api_scenario_report_detail")
 @Data
-public class ApiScenarioReportDetail implements Serializable {
+public class ApiScenarioReportDetail extends ApiScenarioReport implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCase.java

@@ -64,7 +64,7 @@ public class ApiTestCase implements Serializable {
     @ApiModelProperty(name = "接口用例编号id", required = false, dataType = "Integer")
     private Integer num;
 
-    @ApiModelProperty(name = "标签", required = false, allowableValues = "range[1, 1000]")
+    @ApiModelProperty(name = "标签", required = false, allowableValues = "range[1, 500]")
     private String tags;
 
     @ApiModelProperty(name = "用例状态", required = false, allowableValues = "range[1, 20]")

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCaseBlob.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @ApiModel(value = "接口用例详情")
 @TableName("api_test_case_blob")
 @Data
-public class ApiTestCaseBlob implements Serializable {
+public class ApiTestCaseBlob extends ApiTestCase implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId

backend/framework/sdk/src/main/resources/i18n/api_en_US.properties

@@ -75,8 +75,8 @@ api_scenario_report.trigger_mode.length_range=Trigger method length must be betw
 api_scenario_report.trigger_mode.not_blank=Trigger method cannot be empty
 api_scenario_report.run_mode.length_range=Execution pattern length must be between 1-20
 api_scenario_report.run_mode.not_blank=Execution mode cannot be empty
-api_scenario_report.resource_pool.length_range=Resource pool length must be between 1-50
+api_scenario_report.pool_id.length_range=Resource pool length must be between 1-50
-api_scenario_report.resource_pool.not_blank=Resource pool cannot be empty
+api_scenario_report.pool_id.not_blank=Resource pool cannot be empty
 api_scenario_report.integrated.length_range=Whether it is an integrated report length must be between 1-1
 api_scenario_report.integrated.not_blank=Whether it is an integrated report cannot be empty
 api_scenario_report.project_id.length_range=Item fk length must be between 1-50
@@ -84,11 +84,11 @@ api_scenario_report.project_id.not_blank=Item fk cannot be empty
 api_scenario_report.scenario_id.length_range=Scene fk length must be between 1-50
 api_scenario_report.scenario_id.not_blank=Scene fk cannot be empty
 #module：ApiScenarioEnv
-api_scenario_env.id.not_blank=The scene environment pk cannot be empty
+api_scenario_environment.id.not_blank=The scene environment pk cannot be empty
-api_scenario_env.api_scenario_id.length_range=Scene fk length must be between 1-50
+api_scenario_environment.api_scenario_id.length_range=Scene fk length must be between 1-50
-api_scenario_env.api_scenario_id.not_blank=Scene fk cannot be empty
+api_scenario_environment.api_scenario_id.not_blank=Scene fk cannot be empty
-api_scenario_env.project_id.length_range=Item fk length must be between 1-50
+api_scenario_environment.project_id.length_range=Item fk length must be between 1-50
-api_scenario_env.project_id.not_blank=Item fk cannot be empty
+api_scenario_environment.project_id.not_blank=Item fk cannot be empty
 #module：ApiDefinition
 api_definition.id.not_blank=Interface pk cannot be empty
 api_definition.create_user.length_range=Creator length must be between 1-100
@@ -197,8 +197,8 @@ api_report.status.length_range=Result status length must be between 1-50
 api_report.status.not_blank=Result status cannot be empty
 api_report.run_mode.length_range=Execution module/API/CASE/API_PLAN length must be between 1-20
 api_report.run_mode.not_blank=Execution module/API/CASE/API_PLAN cannot be empty
-api_report.resource_pool.length_range=Resource pool length must be between 1-50
+api_report.pool_id.length_range=Resource pool length must be between 1-50
-api_report.resource_pool.not_blank=Resource pool cannot be empty
+api_report.pool_id.not_blank=Resource pool cannot be empty
 api_report.trigger_mode.length_range=Trigger mode/manual/batch/timed task/JENKINS length must be between 1-50
 api_report.trigger_mode.not_blank=Trigger mode/manual/batch/timed task/JENKINS cannot be empty
 api_report.project_id.length_range=Item fk length must be between 1-50

backend/framework/sdk/src/main/resources/i18n/api_zh_CN.properties

@@ -75,8 +75,8 @@ api_scenario_report.trigger_mode.length_range=触发方式长度必须在1-20之
 api_scenario_report.trigger_mode.not_blank=触发方式不能为空
 api_scenario_report.run_mode.length_range=执行模式长度必须在1-20之间
 api_scenario_report.run_mode.not_blank=执行模式不能为空
-api_scenario_report.resource_pool.length_range=资源池长度必须在1-50之间
+api_scenario_report.pool_id.length_range=资源池长度必须在1-50之间
-api_scenario_report.resource_pool.not_blank=资源池不能为空
+api_scenario_report.pool_id.not_blank=资源池不能为空
 api_scenario_report.integrated.length_range=是否是集成报告长度必须在1-1之间
 api_scenario_report.integrated.not_blank=是否是集成报告不能为空
 api_scenario_report.project_id.length_range=项目ID长度必须在1-50之间
@@ -84,11 +84,11 @@ api_scenario_report.project_id.not_blank=项目ID不能为空
 api_scenario_report.scenario_id.length_range=场景ID长度必须在1-50之间
 api_scenario_report.scenario_id.not_blank=场景ID不能为空
 #module：ApiScenarioEnv
-api_scenario_env.id.not_blank=场景环境pk不能为空
+api_scenario_environment.id.not_blank=场景环境pk不能为空
-api_scenario_env.api_scenario_id.length_range=场景ID长度必须在1-50之间
+api_scenario_environment.api_scenario_id.length_range=场景ID长度必须在1-50之间
-api_scenario_env.api_scenario_id.not_blank=场景ID不能为空
+api_scenario_environment.api_scenario_id.not_blank=场景ID不能为空
-api_scenario_env.project_id.length_range=项目ID长度必须在1-50之间
+api_scenario_environment.project_id.length_range=项目ID长度必须在1-50之间
-api_scenario_env.project_id.not_blank=项目ID不能为空
+api_scenario_environment.project_id.not_blank=项目ID不能为空
 #module：ApiDefinition
 api_definition.id.not_blank=接口pk不能为空
 api_definition.create_user.length_range=创建人长度必须在1-100之间
@@ -197,8 +197,8 @@ api_report.status.length_range=结果状态长度必须在1-50之间
 api_report.status.not_blank=结果状态不能为空
 api_report.run_mode.length_range=执行模块/API/CASE/API_PLAN长度必须在1-20之间
 api_report.run_mode.not_blank=执行模块/API/CASE/API_PLAN不能为空
-api_report.resource_pool.length_range=资源池长度必须在1-50之间
+api_report.pool_id.length_range=资源池长度必须在1-50之间
-api_report.resource_pool.not_blank=资源池不能为空
+api_report.pool_id.not_blank=资源池不能为空
 api_report.trigger_mode.length_range=触发模式/手动/批量/定时任务/JENKINS长度必须在1-50之间
 api_report.trigger_mode.not_blank=触发模式/手动/批量/定时任务/JENKINS不能为空
 api_report.project_id.length_range=项目ID长度必须在1-50之间

backend/framework/sdk/src/main/resources/i18n/api_zh_TW.properties

@@ -75,8 +75,8 @@ api_scenario_report.trigger_mode.length_range=觸發方式長度必須在1-20之
 api_scenario_report.trigger_mode.not_blank=觸發方式不能為空
 api_scenario_report.run_mode.length_range=執行模式長度必須在1-20之間
 api_scenario_report.run_mode.not_blank=執行模式不能為空
-api_scenario_report.resource_pool.length_range=資源池長度必須在1-50之間
+api_scenario_report.pool_id.length_range=資源池長度必須在1-50之間
-api_scenario_report.resource_pool.not_blank=資源池不能為空
+api_scenario_report.pool_id.not_blank=資源池不能為空
 api_scenario_report.integrated.length_range=是否是集成報告長度必須在1-1之間
 api_scenario_report.integrated.not_blank=是否是集成報告不能為空
 api_scenario_report.project_id.length_range=項目ID長度必須在1-50之間
@@ -84,11 +84,11 @@ api_scenario_report.project_id.not_blank=項目ID不能為空
 api_scenario_report.scenario_id.length_range=場景ID長度必須在1-50之間
 api_scenario_report.scenario_id.not_blank=場景ID不能為空
 #module：ApiScenarioEnv
-api_scenario_env.id.not_blank=場景環境pk不能為空
+api_scenario_environment.id.not_blank=場景環境pk不能為空
-api_scenario_env.api_scenario_id.length_range=場景ID長度必須在1-50之間
+api_scenario_environment.api_scenario_id.length_range=場景ID長度必須在1-50之間
-api_scenario_env.api_scenario_id.not_blank=場景ID不能為空
+api_scenario_environment.api_scenario_id.not_blank=場景ID不能為空
-api_scenario_env.project_id.length_range=項目ID長度必須在1-50之間
+api_scenario_environment.project_id.length_range=項目ID長度必須在1-50之間
-api_scenario_env.project_id.not_blank=項目ID不能為空
+api_scenario_environment.project_id.not_blank=項目ID不能為空
 #module：ApiDefinition
 api_definition.id.not_blank=接口pk不能為空
 api_definition.create_user.length_range=創建人長度必須在1-100之間
@@ -197,8 +197,8 @@ api_report.status.length_range=結果狀態長度必須在1-50之間
 api_report.status.not_blank=結果狀態不能為空
 api_report.run_mode.length_range=執行模塊/API/CASE/API_PLAN長度必須在1-20之間
 api_report.run_mode.not_blank=執行模塊/API/CASE/API_PLAN不能為空
-api_report.resource_pool.length_range=資源池長度必須在1-50之間
+api_report.pool_id.length_range=資源池長度必須在1-50之間
-api_report.resource_pool.not_blank=資源池不能為空
+api_report.pool_id.not_blank=資源池不能為空
 api_report.trigger_mode.length_range=觸發模式/手動/批量/定時任務/JENKINS長度必須在1-50之間
 api_report.trigger_mode.not_blank=觸發模式/手動/批量/定時任務/JENKINS不能為空
 api_report.project_id.length_range=項目ID長度必須在1-50之間

backend/services/api-test/src/main/java/io/metersphere/api/controller/ApiDefinitionEnvController.java

@@ -1,13 +0,0 @@
-package io.metersphere.api.controller;
-
-import io.metersphere.api.service.ApiDefinitionEnvService;
-import jakarta.annotation.Resource;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("/api/definition/env")
-public class ApiDefinitionEnvController {
-    @Resource
-    private ApiDefinitionEnvService apiDefinitionEnvService;
-
-}

backend/services/api-test/src/main/java/io/metersphere/api/controller/ApiDefinitionTemplateController.java

@@ -1,13 +0,0 @@
-package io.metersphere.api.controller;
-
-import io.metersphere.api.service.ApiDefinitionTemplateService;
-import jakarta.annotation.Resource;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("/api/definition/template")
-public class ApiDefinitionTemplateController {
-    @Resource
-    private ApiDefinitionTemplateService apiDefinitionTemplateService;
-
-}

backend/services/api-test/src/main/java/io/metersphere/api/controller/ApiEnvironmentConfigController.java

@@ -0,0 +1,13 @@
+package io.metersphere.api.controller;
+
+import io.metersphere.api.service.ApiEnvironmentConfigService;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/environment/config")
+public class ApiEnvironmentConfigController {
+    @Resource
+    private ApiEnvironmentConfigService apiEnvironmentConfigService;
+
+}

backend/services/api-test/src/main/java/io/metersphere/api/controller/ApiScenarioEnvironmentController.java

@@ -1,13 +1,13 @@
 package io.metersphere.api.controller;
 
-import io.metersphere.api.service.ApiScenarioEnvService;
+import io.metersphere.api.service.ApiScenarioEnvironmentService;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/scenario/env")
-public class ApiScenarioEnvController {
+public class ApiScenarioEnvironmentController {
     @Resource
-    private ApiScenarioEnvService apiScenarioEnvService;
+    private ApiScenarioEnvironmentService apiScenarioEnvironmentService;
 
 }

backend/services/api-test/src/main/java/io/metersphere/api/mapper/ApiDefinitionTemplateMapper.java

@@ -1,14 +0,0 @@
-package io.metersphere.api.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import io.metersphere.api.domain.ApiDefinitionTemplate;
-
-/**
- * API模版表数据库访问层
- *
- * @date : 2023-5-15
- */
-@Mapper
-public interface ApiDefinitionTemplateMapper  extends BaseMapper<ApiDefinitionTemplate> {
-}

backend/services/api-test/src/main/java/io/metersphere/api/mapper/ApiEnvironmentConfigMapper.java

@@ -2,7 +2,7 @@ package io.metersphere.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import io.metersphere.api.domain.ApiDefinitionEnv;
+import io.metersphere.api.domain.ApiEnvironmentConfig;
 
 /**
  * 接口定义环境数据库访问层
@@ -10,5 +10,5 @@ import io.metersphere.api.domain.ApiDefinitionEnv;
  * @date : 2023-5-15
  */
 @Mapper
-public interface ApiDefinitionEnvMapper extends BaseMapper<ApiDefinitionEnv> {
+public interface ApiEnvironmentConfigMapper extends BaseMapper<ApiEnvironmentConfig> {
 }

backend/services/api-test/src/main/java/io/metersphere/api/mapper/ApiScenarioEnvironmentMapper.java

@@ -2,7 +2,7 @@ package io.metersphere.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import io.metersphere.api.domain.ApiScenarioEnv;
+import io.metersphere.api.domain.ApiScenarioEnvironment;
 
 /**
  * 场景环境数据库访问层
@@ -10,5 +10,5 @@ import io.metersphere.api.domain.ApiScenarioEnv;
  * @date : 2023-5-15
  */
 @Mapper
-public interface ApiScenarioEnvMapper  extends BaseMapper<ApiScenarioEnv> {
+public interface ApiScenarioEnvironmentMapper extends BaseMapper<ApiScenarioEnvironment> {
 }

backend/services/api-test/src/main/java/io/metersphere/api/service/ApiDefinitionEnvService.java

@@ -1,13 +0,0 @@
-package io.metersphere.api.service;
-
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.metersphere.api.domain.ApiDefinitionEnv;
-import io.metersphere.api.mapper.ApiDefinitionEnvMapper;
- /**
- * 接口定义环境服务实现类
- * @date : 2023-5-15
- */
-@Service
-public class ApiDefinitionEnvService extends ServiceImpl<ApiDefinitionEnvMapper, ApiDefinitionEnv> {
-}

backend/services/api-test/src/main/java/io/metersphere/api/service/ApiDefinitionTemplateService.java

@@ -1,15 +0,0 @@
-package io.metersphere.api.service;
-
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.metersphere.api.domain.ApiDefinitionTemplate;
-import io.metersphere.api.mapper.ApiDefinitionTemplateMapper;
-
- /**
- * API模版表服务实现类
- *
- * @date : 2023-5-15
- */
-@Service
-public class ApiDefinitionTemplateService extends ServiceImpl<ApiDefinitionTemplateMapper, ApiDefinitionTemplate> {
-}

backend/services/api-test/src/main/java/io/metersphere/api/service/ApiEnvironmentConfigService.java

@@ -0,0 +1,13 @@
+package io.metersphere.api.service;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.metersphere.api.domain.ApiEnvironmentConfig;
+import io.metersphere.api.mapper.ApiEnvironmentConfigMapper;
+ /**
+ * 接口定义环境服务实现类
+ * @date : 2023-5-15
+ */
+@Service
+public class ApiEnvironmentConfigService extends ServiceImpl<ApiEnvironmentConfigMapper, ApiEnvironmentConfig> {
+}

backend/services/api-test/src/main/java/io/metersphere/api/service/ApiScenarioEnvService.java

@@ -1,15 +0,0 @@
-package io.metersphere.api.service;
-
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.metersphere.api.domain.ApiScenarioEnv;
-import io.metersphere.api.mapper.ApiScenarioEnvMapper;
-
- /**
- * 场景环境服务实现类
- *
- * @date : 2023-5-15
- */
-@Service
-public class ApiScenarioEnvService extends ServiceImpl<ApiScenarioEnvMapper, ApiScenarioEnv> {
-}

backend/services/api-test/src/main/java/io/metersphere/api/service/ApiScenarioEnvironmentService.java

@@ -0,0 +1,15 @@
+package io.metersphere.api.service;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.metersphere.api.domain.ApiScenarioEnvironment;
+import io.metersphere.api.mapper.ApiScenarioEnvironmentMapper;
+
+ /**
+ * 场景环境服务实现类
+ *
+ * @date : 2023-5-15
+ */
+@Service
+public class ApiScenarioEnvironmentService extends ServiceImpl<ApiScenarioEnvironmentMapper, ApiScenarioEnvironment> {
+}