diff --git a/api-test/backend/src/main/java/io/metersphere/api/dto/plugin/PluginResourceDTO.java b/api-test/backend/src/main/java/io/metersphere/api/dto/plugin/PluginResourceDTO.java deleted file mode 100644 index 825c229180..0000000000 --- a/api-test/backend/src/main/java/io/metersphere/api/dto/plugin/PluginResourceDTO.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.metersphere.api.dto.plugin; - -import io.metersphere.plugin.core.ui.PluginResource; -import lombok.Data; - -@Data -public class PluginResourceDTO extends PluginResource { - private String entry; -} diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/PluginMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/PluginMapper.xml deleted file mode 100644 index ca671513c5..0000000000 --- a/api-test/backend/src/main/java/io/metersphere/base/mapper/PluginMapper.xml +++ /dev/null @@ -1,409 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, `name`, plugin_id, script_id, jmeter_clazz, clazz_name, source_path, source_name, - exec_entry, create_time, update_time, create_user_id - - - form_option, form_script - - - - - - delete from plugin - where id = #{id,jdbcType=VARCHAR} - - - delete from plugin - - - - - - insert into plugin (id, `name`, plugin_id, - script_id, jmeter_clazz, clazz_name, - source_path, source_name, exec_entry, - create_time, update_time, create_user_id, - form_option, form_script) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{pluginId,jdbcType=VARCHAR}, - #{scriptId,jdbcType=VARCHAR}, #{jmeterClazz,jdbcType=VARCHAR}, #{clazzName,jdbcType=VARCHAR}, - #{sourcePath,jdbcType=VARCHAR}, #{sourceName,jdbcType=VARCHAR}, #{execEntry,jdbcType=VARCHAR}, - #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{createUserId,jdbcType=VARCHAR}, - #{formOption,jdbcType=LONGVARCHAR}, #{formScript,jdbcType=LONGVARCHAR}) - - - insert into plugin - - - id, - - - `name`, - - - plugin_id, - - - script_id, - - - jmeter_clazz, - - - clazz_name, - - - source_path, - - - source_name, - - - exec_entry, - - - create_time, - - - update_time, - - - create_user_id, - - - form_option, - - - form_script, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{pluginId,jdbcType=VARCHAR}, - - - #{scriptId,jdbcType=VARCHAR}, - - - #{jmeterClazz,jdbcType=VARCHAR}, - - - #{clazzName,jdbcType=VARCHAR}, - - - #{sourcePath,jdbcType=VARCHAR}, - - - #{sourceName,jdbcType=VARCHAR}, - - - #{execEntry,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=BIGINT}, - - - #{updateTime,jdbcType=BIGINT}, - - - #{createUserId,jdbcType=VARCHAR}, - - - #{formOption,jdbcType=LONGVARCHAR}, - - - #{formScript,jdbcType=LONGVARCHAR}, - - - - - - update plugin - - - id = #{record.id,jdbcType=VARCHAR}, - - - `name` = #{record.name,jdbcType=VARCHAR}, - - - plugin_id = #{record.pluginId,jdbcType=VARCHAR}, - - - script_id = #{record.scriptId,jdbcType=VARCHAR}, - - - jmeter_clazz = #{record.jmeterClazz,jdbcType=VARCHAR}, - - - clazz_name = #{record.clazzName,jdbcType=VARCHAR}, - - - source_path = #{record.sourcePath,jdbcType=VARCHAR}, - - - source_name = #{record.sourceName,jdbcType=VARCHAR}, - - - exec_entry = #{record.execEntry,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=BIGINT}, - - - update_time = #{record.updateTime,jdbcType=BIGINT}, - - - create_user_id = #{record.createUserId,jdbcType=VARCHAR}, - - - form_option = #{record.formOption,jdbcType=LONGVARCHAR}, - - - form_script = #{record.formScript,jdbcType=LONGVARCHAR}, - - - - - - - - update plugin - set id = #{record.id,jdbcType=VARCHAR}, - `name` = #{record.name,jdbcType=VARCHAR}, - plugin_id = #{record.pluginId,jdbcType=VARCHAR}, - script_id = #{record.scriptId,jdbcType=VARCHAR}, - jmeter_clazz = #{record.jmeterClazz,jdbcType=VARCHAR}, - clazz_name = #{record.clazzName,jdbcType=VARCHAR}, - source_path = #{record.sourcePath,jdbcType=VARCHAR}, - source_name = #{record.sourceName,jdbcType=VARCHAR}, - exec_entry = #{record.execEntry,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT}, - create_user_id = #{record.createUserId,jdbcType=VARCHAR}, - form_option = #{record.formOption,jdbcType=LONGVARCHAR}, - form_script = #{record.formScript,jdbcType=LONGVARCHAR} - - - - - - update plugin - set id = #{record.id,jdbcType=VARCHAR}, - `name` = #{record.name,jdbcType=VARCHAR}, - plugin_id = #{record.pluginId,jdbcType=VARCHAR}, - script_id = #{record.scriptId,jdbcType=VARCHAR}, - jmeter_clazz = #{record.jmeterClazz,jdbcType=VARCHAR}, - clazz_name = #{record.clazzName,jdbcType=VARCHAR}, - source_path = #{record.sourcePath,jdbcType=VARCHAR}, - source_name = #{record.sourceName,jdbcType=VARCHAR}, - exec_entry = #{record.execEntry,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT}, - create_user_id = #{record.createUserId,jdbcType=VARCHAR} - - - - - - update plugin - - - `name` = #{name,jdbcType=VARCHAR}, - - - plugin_id = #{pluginId,jdbcType=VARCHAR}, - - - script_id = #{scriptId,jdbcType=VARCHAR}, - - - jmeter_clazz = #{jmeterClazz,jdbcType=VARCHAR}, - - - clazz_name = #{clazzName,jdbcType=VARCHAR}, - - - source_path = #{sourcePath,jdbcType=VARCHAR}, - - - source_name = #{sourceName,jdbcType=VARCHAR}, - - - exec_entry = #{execEntry,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=BIGINT}, - - - update_time = #{updateTime,jdbcType=BIGINT}, - - - create_user_id = #{createUserId,jdbcType=VARCHAR}, - - - form_option = #{formOption,jdbcType=LONGVARCHAR}, - - - form_script = #{formScript,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update plugin - set `name` = #{name,jdbcType=VARCHAR}, - plugin_id = #{pluginId,jdbcType=VARCHAR}, - script_id = #{scriptId,jdbcType=VARCHAR}, - jmeter_clazz = #{jmeterClazz,jdbcType=VARCHAR}, - clazz_name = #{clazzName,jdbcType=VARCHAR}, - source_path = #{sourcePath,jdbcType=VARCHAR}, - source_name = #{sourceName,jdbcType=VARCHAR}, - exec_entry = #{execEntry,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT}, - create_user_id = #{createUserId,jdbcType=VARCHAR}, - form_option = #{formOption,jdbcType=LONGVARCHAR}, - form_script = #{formScript,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=VARCHAR} - - - update plugin - set `name` = #{name,jdbcType=VARCHAR}, - plugin_id = #{pluginId,jdbcType=VARCHAR}, - script_id = #{scriptId,jdbcType=VARCHAR}, - jmeter_clazz = #{jmeterClazz,jdbcType=VARCHAR}, - clazz_name = #{clazzName,jdbcType=VARCHAR}, - source_path = #{sourcePath,jdbcType=VARCHAR}, - source_name = #{sourceName,jdbcType=VARCHAR}, - exec_entry = #{execEntry,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT}, - create_user_id = #{createUserId,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/Plugin.java b/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/Plugin.java index 832b8adcc5..1c8e2d69e3 100644 --- a/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/Plugin.java +++ b/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/Plugin.java @@ -1,8 +1,7 @@ package io.metersphere.base.domain; -import lombok.Data; - import java.io.Serializable; +import lombok.Data; @Data public class Plugin implements Serializable { @@ -14,10 +13,10 @@ public class Plugin implements Serializable { private String scriptId; - private String jmeterClazz; - private String clazzName; + private String jmeterClazz; + private String sourcePath; private String sourceName; @@ -30,5 +29,9 @@ public class Plugin implements Serializable { private String createUserId; + private Boolean xpack; + + private String scenario; + private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/PluginExample.java b/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/PluginExample.java index fb6f44fcc7..cb6a297afd 100644 --- a/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/PluginExample.java +++ b/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/PluginExample.java @@ -384,76 +384,6 @@ public class PluginExample { return (Criteria) this; } - public Criteria andJmeterClazzIsNull() { - addCriterion("jmeter_clazz is null"); - return (Criteria) this; - } - - public Criteria andJmeterClazzIsNotNull() { - addCriterion("jmeter_clazz is not null"); - return (Criteria) this; - } - - public Criteria andJmeterClazzEqualTo(String value) { - addCriterion("jmeter_clazz =", value, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzNotEqualTo(String value) { - addCriterion("jmeter_clazz <>", value, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzGreaterThan(String value) { - addCriterion("jmeter_clazz >", value, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzGreaterThanOrEqualTo(String value) { - addCriterion("jmeter_clazz >=", value, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzLessThan(String value) { - addCriterion("jmeter_clazz <", value, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzLessThanOrEqualTo(String value) { - addCriterion("jmeter_clazz <=", value, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzLike(String value) { - addCriterion("jmeter_clazz like", value, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzNotLike(String value) { - addCriterion("jmeter_clazz not like", value, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzIn(List values) { - addCriterion("jmeter_clazz in", values, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzNotIn(List values) { - addCriterion("jmeter_clazz not in", values, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzBetween(String value1, String value2) { - addCriterion("jmeter_clazz between", value1, value2, "jmeterClazz"); - return (Criteria) this; - } - - public Criteria andJmeterClazzNotBetween(String value1, String value2) { - addCriterion("jmeter_clazz not between", value1, value2, "jmeterClazz"); - return (Criteria) this; - } - public Criteria andClazzNameIsNull() { addCriterion("clazz_name is null"); return (Criteria) this; @@ -524,6 +454,76 @@ public class PluginExample { return (Criteria) this; } + public Criteria andJmeterClazzIsNull() { + addCriterion("jmeter_clazz is null"); + return (Criteria) this; + } + + public Criteria andJmeterClazzIsNotNull() { + addCriterion("jmeter_clazz is not null"); + return (Criteria) this; + } + + public Criteria andJmeterClazzEqualTo(String value) { + addCriterion("jmeter_clazz =", value, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzNotEqualTo(String value) { + addCriterion("jmeter_clazz <>", value, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzGreaterThan(String value) { + addCriterion("jmeter_clazz >", value, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzGreaterThanOrEqualTo(String value) { + addCriterion("jmeter_clazz >=", value, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzLessThan(String value) { + addCriterion("jmeter_clazz <", value, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzLessThanOrEqualTo(String value) { + addCriterion("jmeter_clazz <=", value, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzLike(String value) { + addCriterion("jmeter_clazz like", value, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzNotLike(String value) { + addCriterion("jmeter_clazz not like", value, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzIn(List values) { + addCriterion("jmeter_clazz in", values, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzNotIn(List values) { + addCriterion("jmeter_clazz not in", values, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzBetween(String value1, String value2) { + addCriterion("jmeter_clazz between", value1, value2, "jmeterClazz"); + return (Criteria) this; + } + + public Criteria andJmeterClazzNotBetween(String value1, String value2) { + addCriterion("jmeter_clazz not between", value1, value2, "jmeterClazz"); + return (Criteria) this; + } + public Criteria andSourcePathIsNull() { addCriterion("source_path is null"); return (Criteria) this; @@ -923,6 +923,136 @@ public class PluginExample { addCriterion("create_user_id not between", value1, value2, "createUserId"); return (Criteria) this; } + + public Criteria andXpackIsNull() { + addCriterion("xpack is null"); + return (Criteria) this; + } + + public Criteria andXpackIsNotNull() { + addCriterion("xpack is not null"); + return (Criteria) this; + } + + public Criteria andXpackEqualTo(Boolean value) { + addCriterion("xpack =", value, "xpack"); + return (Criteria) this; + } + + public Criteria andXpackNotEqualTo(Boolean value) { + addCriterion("xpack <>", value, "xpack"); + return (Criteria) this; + } + + public Criteria andXpackGreaterThan(Boolean value) { + addCriterion("xpack >", value, "xpack"); + return (Criteria) this; + } + + public Criteria andXpackGreaterThanOrEqualTo(Boolean value) { + addCriterion("xpack >=", value, "xpack"); + return (Criteria) this; + } + + public Criteria andXpackLessThan(Boolean value) { + addCriterion("xpack <", value, "xpack"); + return (Criteria) this; + } + + public Criteria andXpackLessThanOrEqualTo(Boolean value) { + addCriterion("xpack <=", value, "xpack"); + return (Criteria) this; + } + + public Criteria andXpackIn(List values) { + addCriterion("xpack in", values, "xpack"); + return (Criteria) this; + } + + public Criteria andXpackNotIn(List values) { + addCriterion("xpack not in", values, "xpack"); + return (Criteria) this; + } + + public Criteria andXpackBetween(Boolean value1, Boolean value2) { + addCriterion("xpack between", value1, value2, "xpack"); + return (Criteria) this; + } + + public Criteria andXpackNotBetween(Boolean value1, Boolean value2) { + addCriterion("xpack not between", value1, value2, "xpack"); + return (Criteria) this; + } + + public Criteria andScenarioIsNull() { + addCriterion("scenario is null"); + return (Criteria) this; + } + + public Criteria andScenarioIsNotNull() { + addCriterion("scenario is not null"); + return (Criteria) this; + } + + public Criteria andScenarioEqualTo(String value) { + addCriterion("scenario =", value, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioNotEqualTo(String value) { + addCriterion("scenario <>", value, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioGreaterThan(String value) { + addCriterion("scenario >", value, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioGreaterThanOrEqualTo(String value) { + addCriterion("scenario >=", value, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioLessThan(String value) { + addCriterion("scenario <", value, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioLessThanOrEqualTo(String value) { + addCriterion("scenario <=", value, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioLike(String value) { + addCriterion("scenario like", value, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioNotLike(String value) { + addCriterion("scenario not like", value, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioIn(List values) { + addCriterion("scenario in", values, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioNotIn(List values) { + addCriterion("scenario not in", values, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioBetween(String value1, String value2) { + addCriterion("scenario between", value1, value2, "scenario"); + return (Criteria) this; + } + + public Criteria andScenarioNotBetween(String value1, String value2) { + addCriterion("scenario not between", value1, value2, "scenario"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { @@ -1017,4 +1147,4 @@ public class PluginExample { this(condition, value, secondValue, null); } } -} \ No newline at end of file +} diff --git a/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/PluginWithBLOBs.java b/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/PluginWithBLOBs.java index 889cacb428..997dba2c29 100644 --- a/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/PluginWithBLOBs.java +++ b/framework/sdk-parent/domain/src/main/java/io/metersphere/base/domain/PluginWithBLOBs.java @@ -1,11 +1,10 @@ package io.metersphere.base.domain; +import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.io.Serializable; - @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -15,4 +14,4 @@ public class PluginWithBLOBs extends Plugin implements Serializable { private String formScript; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/framework/sdk-parent/frontend/src/components/template/CustomFiledComponent.vue b/framework/sdk-parent/frontend/src/components/template/CustomFiledComponent.vue index 040ab5c9bd..2452a4fe27 100644 --- a/framework/sdk-parent/frontend/src/components/template/CustomFiledComponent.vue +++ b/framework/sdk-parent/frontend/src/components/template/CustomFiledComponent.vue @@ -105,10 +105,21 @@ :default-open="defaultOpen" :data="data" :disabled="disabled"/> - + + + @input="handleChange"/> diff --git a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js index 244fd031bb..bce694a1c9 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js @@ -1256,6 +1256,7 @@ const message = { jar_file: "Jar Package", jar_manage: "JAR package management", delete_tip: "The deletion takes effect after the service is restarted", + delete_confirm: "Confirm to delete the plugin", file_exist: "The name already exists in the project", upload_limit_size: "Upload file size cannot exceed 30MB!", upload_limit_size_warn: "Upload file size cannot exceed {0} MB!", diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js index db6cacd557..d3340222d1 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js @@ -1266,6 +1266,7 @@ const message = { jar_file: "jar包", jar_manage: "JAR包管理", delete_tip: "删除需重启服务后生效", + delete_confirm: "确认删除插件", file_exist: "该项目下已存在该jar包", upload_limit_size: "上传文件大小不能超过 30MB!", upload_limit_size_warn: "上传文件大小不能超过 {0} MB!", diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js index d0df714336..1546a4807e 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js @@ -1264,6 +1264,7 @@ const message = { jar_manage: "JAR包管理", delete_tip: "刪除需重啟服務後生效", file_exist: "該項目下已存在該jar包", + delete_confirm: "確認刪除插件", upload_limit_size: "上傳文件大小不能超過 30MB!", upload_limit_size_warn: "上傳文件大小不能超過 {0} MB!", upload_limit: "上傳文件大小不能超過", diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/PluginMapper.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/PluginMapper.java similarity index 99% rename from api-test/backend/src/main/java/io/metersphere/base/mapper/PluginMapper.java rename to framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/PluginMapper.java index 7b31811c62..a8ef5a9547 100644 --- a/api-test/backend/src/main/java/io/metersphere/base/mapper/PluginMapper.java +++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/PluginMapper.java @@ -3,9 +3,8 @@ package io.metersphere.base.mapper; import io.metersphere.base.domain.Plugin; import io.metersphere.base.domain.PluginExample; import io.metersphere.base.domain.PluginWithBLOBs; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface PluginMapper { long countByExample(PluginExample example); @@ -35,4 +34,4 @@ public interface PluginMapper { int updateByPrimaryKeyWithBLOBs(PluginWithBLOBs record); int updateByPrimaryKey(Plugin record); -} \ No newline at end of file +} diff --git a/system-setting/backend/src/main/java/io/metersphere/base/mapper/PluginMapper.xml b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/PluginMapper.xml similarity index 87% rename from system-setting/backend/src/main/java/io/metersphere/base/mapper/PluginMapper.xml rename to framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/PluginMapper.xml index ca671513c5..f4b53c8717 100644 --- a/system-setting/backend/src/main/java/io/metersphere/base/mapper/PluginMapper.xml +++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/PluginMapper.xml @@ -6,14 +6,16 @@ - + + + @@ -78,8 +80,8 @@ - id, `name`, plugin_id, script_id, jmeter_clazz, clazz_name, source_path, source_name, - exec_entry, create_time, update_time, create_user_id + id, `name`, plugin_id, script_id, clazz_name, jmeter_clazz, source_path, source_name, + exec_entry, create_time, update_time, create_user_id, xpack, scenario form_option, form_script @@ -115,7 +117,7 @@