diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java index 50f833182d..5084926451 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java @@ -166,7 +166,7 @@ public class Swagger2Parser extends SwaggerAbstractParser { private void parsePathParameters(Parameter parameter, List rests) { PathParameter pathParameter = (PathParameter) parameter; - rests.add(new KeyValue(pathParameter.getName(), "", getDefaultStringValue(parameter.getDescription()))); + rests.add(new KeyValue(pathParameter.getName(), "", getDefaultStringValue(parameter.getDescription()), pathParameter.getRequired())); } private String getDefaultStringValue(String val) { diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenario.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenario.java index d33144975c..bef31b76a2 100644 --- a/backend/src/main/java/io/metersphere/base/domain/ApiScenario.java +++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenario.java @@ -49,7 +49,5 @@ public class ApiScenario implements Serializable { private String createUser; - private Integer version; - private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioExample.java index a56faf3328..39c31daeab 100644 --- a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioExample.java @@ -1603,66 +1603,6 @@ public class ApiScenarioExample { addCriterion("create_user not between", value1, value2, "createUser"); return (Criteria) this; } - - public Criteria andVersionIsNull() { - addCriterion("version is null"); - return (Criteria) this; - } - - public Criteria andVersionIsNotNull() { - addCriterion("version is not null"); - return (Criteria) this; - } - - public Criteria andVersionEqualTo(Integer value) { - addCriterion("version =", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionNotEqualTo(Integer value) { - addCriterion("version <>", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionGreaterThan(Integer value) { - addCriterion("version >", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionGreaterThanOrEqualTo(Integer value) { - addCriterion("version >=", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionLessThan(Integer value) { - addCriterion("version <", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionLessThanOrEqualTo(Integer value) { - addCriterion("version <=", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionIn(List values) { - addCriterion("version in", values, "version"); - return (Criteria) this; - } - - public Criteria andVersionNotIn(List values) { - addCriterion("version not in", values, "version"); - return (Criteria) this; - } - - public Criteria andVersionBetween(Integer value1, Integer value2) { - addCriterion("version between", value1, value2, "version"); - return (Criteria) this; - } - - public Criteria andVersionNotBetween(Integer value1, Integer value2) { - addCriterion("version not between", value1, value2, "version"); - return (Criteria) this; - } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioMapper.xml index d6e7826446..17631f59f2 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioMapper.xml @@ -24,7 +24,6 @@ - @@ -92,8 +91,7 @@ id, project_id, tags, user_id, api_scenario_module_id, module_path, `name`, `level`, `status`, principal, step_total, follow_people, schedule, create_time, update_time, - pass_rate, last_result, report_id, num, original_state, custom_num, create_user, - version + pass_rate, last_result, report_id, num, original_state, custom_num, create_user scenario_definition, description, use_url @@ -154,8 +152,8 @@ schedule, create_time, update_time, pass_rate, last_result, report_id, num, original_state, custom_num, - create_user, version, scenario_definition, - description, use_url) + create_user, scenario_definition, description, + use_url) values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{apiScenarioModuleId,jdbcType=VARCHAR}, #{modulePath,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, @@ -163,8 +161,8 @@ #{schedule,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{passRate,jdbcType=VARCHAR}, #{lastResult,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, #{originalState,jdbcType=VARCHAR}, #{customNum,jdbcType=VARCHAR}, - #{createUser,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER}, #{scenarioDefinition,jdbcType=LONGVARCHAR}, - #{description,jdbcType=LONGVARCHAR}, #{useUrl,jdbcType=LONGVARCHAR}) + #{createUser,jdbcType=VARCHAR}, #{scenarioDefinition,jdbcType=LONGVARCHAR}, #{description,jdbcType=LONGVARCHAR}, + #{useUrl,jdbcType=LONGVARCHAR}) insert into api_scenario @@ -235,9 +233,6 @@ create_user, - - version, - scenario_definition, @@ -315,9 +310,6 @@ #{createUser,jdbcType=VARCHAR}, - - #{version,jdbcType=INTEGER}, - #{scenarioDefinition,jdbcType=LONGVARCHAR}, @@ -404,9 +396,6 @@ create_user = #{record.createUser,jdbcType=VARCHAR}, - - version = #{record.version,jdbcType=INTEGER}, - scenario_definition = #{record.scenarioDefinition,jdbcType=LONGVARCHAR}, @@ -445,7 +434,6 @@ original_state = #{record.originalState,jdbcType=VARCHAR}, custom_num = #{record.customNum,jdbcType=VARCHAR}, create_user = #{record.createUser,jdbcType=VARCHAR}, - version = #{record.version,jdbcType=INTEGER}, scenario_definition = #{record.scenarioDefinition,jdbcType=LONGVARCHAR}, description = #{record.description,jdbcType=LONGVARCHAR}, use_url = #{record.useUrl,jdbcType=LONGVARCHAR} @@ -476,8 +464,7 @@ num = #{record.num,jdbcType=INTEGER}, original_state = #{record.originalState,jdbcType=VARCHAR}, custom_num = #{record.customNum,jdbcType=VARCHAR}, - create_user = #{record.createUser,jdbcType=VARCHAR}, - version = #{record.version,jdbcType=INTEGER} + create_user = #{record.createUser,jdbcType=VARCHAR} @@ -548,9 +535,6 @@ create_user = #{createUser,jdbcType=VARCHAR}, - - version = #{version,jdbcType=INTEGER}, - scenario_definition = #{scenarioDefinition,jdbcType=LONGVARCHAR}, @@ -586,7 +570,6 @@ original_state = #{originalState,jdbcType=VARCHAR}, custom_num = #{customNum,jdbcType=VARCHAR}, create_user = #{createUser,jdbcType=VARCHAR}, - version = #{version,jdbcType=INTEGER}, scenario_definition = #{scenarioDefinition,jdbcType=LONGVARCHAR}, description = #{description,jdbcType=LONGVARCHAR}, use_url = #{useUrl,jdbcType=LONGVARCHAR} @@ -614,8 +597,7 @@ num = #{num,jdbcType=INTEGER}, original_state = #{originalState,jdbcType=VARCHAR}, custom_num = #{customNum,jdbcType=VARCHAR}, - create_user = #{createUser,jdbcType=VARCHAR}, - version = #{version,jdbcType=INTEGER} + create_user = #{createUser,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml index 911df343ff..03907a864c 100644 --- a/backend/src/main/resources/generatorConfig.xml +++ b/backend/src/main/resources/generatorConfig.xml @@ -84,7 +84,7 @@ - +