diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java index 4b8ccafc2b..3e96d74039 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java @@ -12,7 +12,7 @@ import lombok.Data; public class MessageTask implements Serializable { @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task.id.not_blank}", groups = {Created.class, Updated.class}) - @Size(min = 1, max = 255, message = "{message_task.id.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{message_task.id.length_range}", groups = {Created.class, Updated.class}) private String id; @Schema(title = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED) @@ -40,7 +40,7 @@ public class MessageTask implements Serializable { @Schema(title = "具体测试的ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task.test_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 255, message = "{message_task.test_id.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{message_task.test_id.length_range}", groups = {Created.class, Updated.class}) private String testId; @Schema(title = "创建时间") @@ -48,7 +48,7 @@ public class MessageTask implements Serializable { @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task.project_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{message_task.project_id.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{message_task.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; private static final long serialVersionUID = 1L; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java index 1975b07e19..77352d0e74 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class MessageTaskBlob implements Serializable { @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{message_task_blob.message_task_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 255, message = "{message_task_blob.message_task_id.length_range}", groups = {Created.class, Updated.class}) - private String messageTaskId; + @NotBlank(message = "{message_task_blob.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{message_task_blob.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "消息模版") private String template; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlobExample.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlobExample.java index e708178c8e..11c951f987 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlobExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlobExample.java @@ -104,73 +104,73 @@ public class MessageTaskBlobExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andMessageTaskIdIsNull() { - addCriterion("message_task_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andMessageTaskIdIsNotNull() { - addCriterion("message_task_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andMessageTaskIdEqualTo(String value) { - addCriterion("message_task_id =", value, "messageTaskId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdNotEqualTo(String value) { - addCriterion("message_task_id <>", value, "messageTaskId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdGreaterThan(String value) { - addCriterion("message_task_id >", value, "messageTaskId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdGreaterThanOrEqualTo(String value) { - addCriterion("message_task_id >=", value, "messageTaskId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdLessThan(String value) { - addCriterion("message_task_id <", value, "messageTaskId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdLessThanOrEqualTo(String value) { - addCriterion("message_task_id <=", value, "messageTaskId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdLike(String value) { - addCriterion("message_task_id like", value, "messageTaskId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdNotLike(String value) { - addCriterion("message_task_id not like", value, "messageTaskId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdIn(List values) { - addCriterion("message_task_id in", values, "messageTaskId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdNotIn(List values) { - addCriterion("message_task_id not in", values, "messageTaskId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdBetween(String value1, String value2) { - addCriterion("message_task_id between", value1, value2, "messageTaskId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andMessageTaskIdNotBetween(String value1, String value2) { - addCriterion("message_task_id not between", value1, value2, "messageTaskId"); + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } } diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java index 83008bf4e7..0b7bb55b0d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java @@ -27,7 +27,7 @@ public class Notification implements Serializable { @Schema(title = "标题", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.title.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 100, message = "{notification.title.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{notification.title.length_range}", groups = {Created.class, Updated.class}) private String title; @Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED) @@ -60,7 +60,7 @@ public class Notification implements Serializable { @Schema(title = "资源名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.resource_name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 100, message = "{notification.resource_name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{notification.resource_name.length_range}", groups = {Created.class, Updated.class}) private String resourceName; private static final long serialVersionUID = 1L; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlob.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlob.java index f5c2b429bd..7db8edc22d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlob.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class PluginBlob implements Serializable { @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{plugin_blob.plugin_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{plugin_blob.plugin_id.length_range}", groups = {Created.class, Updated.class}) - private String pluginId; + @NotBlank(message = "{plugin_blob.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{plugin_blob.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "plugin form option") private byte[] formOption; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlobExample.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlobExample.java index 12dc372be1..ff37f01f75 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlobExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlobExample.java @@ -104,73 +104,73 @@ public class PluginBlobExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andPluginIdIsNull() { - addCriterion("plugin_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andPluginIdIsNotNull() { - addCriterion("plugin_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andPluginIdEqualTo(String value) { - addCriterion("plugin_id =", value, "pluginId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andPluginIdNotEqualTo(String value) { - addCriterion("plugin_id <>", value, "pluginId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andPluginIdGreaterThan(String value) { - addCriterion("plugin_id >", value, "pluginId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andPluginIdGreaterThanOrEqualTo(String value) { - addCriterion("plugin_id >=", value, "pluginId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andPluginIdLessThan(String value) { - addCriterion("plugin_id <", value, "pluginId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andPluginIdLessThanOrEqualTo(String value) { - addCriterion("plugin_id <=", value, "pluginId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andPluginIdLike(String value) { - addCriterion("plugin_id like", value, "pluginId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andPluginIdNotLike(String value) { - addCriterion("plugin_id not like", value, "pluginId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andPluginIdIn(List values) { - addCriterion("plugin_id in", values, "pluginId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andPluginIdNotIn(List values) { - addCriterion("plugin_id not in", values, "pluginId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andPluginIdBetween(String value1, String value2) { - addCriterion("plugin_id between", value1, value2, "pluginId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andPluginIdNotBetween(String value1, String value2) { - addCriterion("plugin_id not between", value1, value2, "pluginId"); + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } } diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResource.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResource.java index c10ee89e55..fc6a3c0231 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResource.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResource.java @@ -22,7 +22,7 @@ public class TestResource implements Serializable { @Schema(title = "资源节点状态", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{test_resource.status.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{test_resource.status.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 20, message = "{test_resource.status.length_range}", groups = {Created.class, Updated.class}) private String status; @Schema(title = "创建时间") diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java index 459f290518..8af1ecfb26 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java @@ -17,7 +17,7 @@ public class TestResourcePool implements Serializable { @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{test_resource_pool.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{test_resource_pool.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{test_resource_pool.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "类型", requiredMode = Schema.RequiredMode.REQUIRED) @@ -30,7 +30,7 @@ public class TestResourcePool implements Serializable { @Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{test_resource_pool.status.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{test_resource_pool.status.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 20, message = "{test_resource_pool.status.length_range}", groups = {Created.class, Updated.class}) private String status; @Schema(title = "创建时间") diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/User.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/User.java index 28f650ea72..ae37ea398a 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/User.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/User.java @@ -17,7 +17,7 @@ public class User implements Serializable { @Schema(title = "用户名", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{user.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{user.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "用户邮箱", requiredMode = Schema.RequiredMode.REQUIRED) @@ -58,7 +58,7 @@ public class User implements Serializable { @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user.create_user.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 100, message = "{user.create_user.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{user.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; private static final long serialVersionUID = 1L; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtend.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtend.java index a523e2dfec..cc97a73a33 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtend.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtend.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class UserExtend implements Serializable { @Schema(title = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{user_extend.user_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{user_extend.user_id.length_range}", groups = {Created.class, Updated.class}) - private String userId; + @NotBlank(message = "{user_extend.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{user_extend.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "UI本地调试地址") private String seleniumServer; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtendExample.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtendExample.java index b7696d07a4..c2163a8730 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtendExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtendExample.java @@ -104,73 +104,73 @@ public class UserExtendExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andUserIdEqualTo(String value) { - addCriterion("user_id =", value, "userId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andUserIdNotEqualTo(String value) { - addCriterion("user_id <>", value, "userId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andUserIdGreaterThan(String value) { - addCriterion("user_id >", value, "userId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andUserIdGreaterThanOrEqualTo(String value) { - addCriterion("user_id >=", value, "userId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andUserIdLessThan(String value) { - addCriterion("user_id <", value, "userId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andUserIdLessThanOrEqualTo(String value) { - addCriterion("user_id <=", value, "userId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andUserIdLike(String value) { - addCriterion("user_id like", value, "userId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andUserIdNotLike(String value) { - addCriterion("user_id not like", value, "userId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andUserIdBetween(String value1, String value2) { - addCriterion("user_id between", value1, value2, "userId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andUserIdNotBetween(String value1, String value2) { - addCriterion("user_id not between", value1, value2, "userId"); + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRole.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRole.java index 925daa422d..78ce3313f4 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRole.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRole.java @@ -17,7 +17,7 @@ public class UserRole implements Serializable { @Schema(title = "组名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{user_role.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{user_role.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "描述") @@ -41,12 +41,12 @@ public class UserRole implements Serializable { @Schema(title = "创建人(操作人)", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role.create_user.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{user_role.create_user.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{user_role.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; @Schema(title = "应用范围", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role.scope_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{user_role.scope_id.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{user_role.scope_id.length_range}", groups = {Created.class, Updated.class}) private String scopeId; private static final long serialVersionUID = 1L; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.java b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.java index 927e2a5de0..66468beeb2 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.java @@ -10,7 +10,7 @@ public interface MessageTaskBlobMapper { int deleteByExample(MessageTaskBlobExample example); - int deleteByPrimaryKey(String messageTaskId); + int deleteByPrimaryKey(String id); int insert(MessageTaskBlob record); @@ -20,7 +20,7 @@ public interface MessageTaskBlobMapper { List selectByExample(MessageTaskBlobExample example); - MessageTaskBlob selectByPrimaryKey(String messageTaskId); + MessageTaskBlob selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") MessageTaskBlob record, @Param("example") MessageTaskBlobExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.xml index 4c5903463e..b9cedc122d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.xml @@ -2,7 +2,7 @@ - + @@ -66,7 +66,7 @@ - message_task_id + id `template` @@ -107,11 +107,11 @@ , from message_task_blob - where message_task_id = #{messageTaskId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from message_task_blob - where message_task_id = #{messageTaskId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from message_task_blob @@ -120,22 +120,22 @@ - insert into message_task_blob (message_task_id, `template`) - values (#{messageTaskId,jdbcType=VARCHAR}, #{template,jdbcType=LONGVARCHAR}) + insert into message_task_blob (id, `template`) + values (#{id,jdbcType=VARCHAR}, #{template,jdbcType=LONGVARCHAR}) insert into message_task_blob - - message_task_id, + + id, `template`, - - #{messageTaskId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{template,jdbcType=LONGVARCHAR}, @@ -151,8 +151,8 @@ update message_task_blob - - message_task_id = #{record.messageTaskId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, `template` = #{record.template,jdbcType=LONGVARCHAR}, @@ -164,7 +164,7 @@ update message_task_blob - set message_task_id = #{record.messageTaskId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, `template` = #{record.template,jdbcType=LONGVARCHAR} @@ -172,7 +172,7 @@ update message_task_blob - set message_task_id = #{record.messageTaskId,jdbcType=VARCHAR} + set id = #{record.id,jdbcType=VARCHAR} @@ -184,11 +184,11 @@ `template` = #{template,jdbcType=LONGVARCHAR}, - where message_task_id = #{messageTaskId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update message_task_blob set `template` = #{template,jdbcType=LONGVARCHAR} - where message_task_id = #{messageTaskId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/PluginBlobMapper.java b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/PluginBlobMapper.java index 5341d0c9d3..48996273b1 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/PluginBlobMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/PluginBlobMapper.java @@ -10,7 +10,7 @@ public interface PluginBlobMapper { int deleteByExample(PluginBlobExample example); - int deleteByPrimaryKey(String pluginId); + int deleteByPrimaryKey(String id); int insert(PluginBlob record); @@ -20,7 +20,7 @@ public interface PluginBlobMapper { List selectByExample(PluginBlobExample example); - PluginBlob selectByPrimaryKey(String pluginId); + PluginBlob selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") PluginBlob record, @Param("example") PluginBlobExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/PluginBlobMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/PluginBlobMapper.xml index dd568082a4..92c35236b6 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/PluginBlobMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/PluginBlobMapper.xml @@ -2,7 +2,7 @@ - + @@ -67,7 +67,7 @@ - plugin_id + id form_option, form_script @@ -108,11 +108,11 @@ , from plugin_blob - where plugin_id = #{pluginId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from plugin_blob - where plugin_id = #{pluginId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from plugin_blob @@ -121,16 +121,16 @@ - insert into plugin_blob (plugin_id, form_option, form_script + insert into plugin_blob (id, form_option, form_script ) - values (#{pluginId,jdbcType=VARCHAR}, #{formOption,jdbcType=LONGVARBINARY}, #{formScript,jdbcType=LONGVARBINARY} + values (#{id,jdbcType=VARCHAR}, #{formOption,jdbcType=LONGVARBINARY}, #{formScript,jdbcType=LONGVARBINARY} ) insert into plugin_blob - - plugin_id, + + id, form_option, @@ -140,8 +140,8 @@ - - #{pluginId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{formOption,jdbcType=LONGVARBINARY}, @@ -160,8 +160,8 @@ update plugin_blob - - plugin_id = #{record.pluginId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, form_option = #{record.formOption,jdbcType=LONGVARBINARY}, @@ -176,7 +176,7 @@ update plugin_blob - set plugin_id = #{record.pluginId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, form_option = #{record.formOption,jdbcType=LONGVARBINARY}, form_script = #{record.formScript,jdbcType=LONGVARBINARY} @@ -185,7 +185,7 @@ update plugin_blob - set plugin_id = #{record.pluginId,jdbcType=VARCHAR} + set id = #{record.id,jdbcType=VARCHAR} @@ -200,12 +200,12 @@ form_script = #{formScript,jdbcType=LONGVARBINARY}, - where plugin_id = #{pluginId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update plugin_blob set form_option = #{formOption,jdbcType=LONGVARBINARY}, form_script = #{formScript,jdbcType=LONGVARBINARY} - where plugin_id = #{pluginId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/UserExtendMapper.java b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/UserExtendMapper.java index 5e902539bd..84d27b447f 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/UserExtendMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/UserExtendMapper.java @@ -10,7 +10,7 @@ public interface UserExtendMapper { int deleteByExample(UserExtendExample example); - int deleteByPrimaryKey(String userId); + int deleteByPrimaryKey(String id); int insert(UserExtend record); @@ -20,7 +20,7 @@ public interface UserExtendMapper { List selectByExample(UserExtendExample example); - UserExtend selectByPrimaryKey(String userId); + UserExtend selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") UserExtend record, @Param("example") UserExtendExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/UserExtendMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/UserExtendMapper.xml index 997bb82113..a1d5a06a6e 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/UserExtendMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/UserExtendMapper.xml @@ -2,7 +2,7 @@ - + @@ -67,7 +67,7 @@ - user_id, selenium_server + id, selenium_server platform_info @@ -108,11 +108,11 @@ , from user_extend - where user_id = #{userId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from user_extend - where user_id = #{userId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from user_extend @@ -121,16 +121,16 @@ - insert into user_extend (user_id, selenium_server, platform_info + insert into user_extend (id, selenium_server, platform_info ) - values (#{userId,jdbcType=VARCHAR}, #{seleniumServer,jdbcType=VARCHAR}, #{platformInfo,jdbcType=LONGVARBINARY} + values (#{id,jdbcType=VARCHAR}, #{seleniumServer,jdbcType=VARCHAR}, #{platformInfo,jdbcType=LONGVARBINARY} ) insert into user_extend - - user_id, + + id, selenium_server, @@ -140,8 +140,8 @@ - - #{userId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{seleniumServer,jdbcType=VARCHAR}, @@ -160,8 +160,8 @@ update user_extend - - user_id = #{record.userId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, selenium_server = #{record.seleniumServer,jdbcType=VARCHAR}, @@ -176,7 +176,7 @@ update user_extend - set user_id = #{record.userId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, selenium_server = #{record.seleniumServer,jdbcType=VARCHAR}, platform_info = #{record.platformInfo,jdbcType=LONGVARBINARY} @@ -185,7 +185,7 @@ update user_extend - set user_id = #{record.userId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, selenium_server = #{record.seleniumServer,jdbcType=VARCHAR} @@ -201,17 +201,17 @@ platform_info = #{platformInfo,jdbcType=LONGVARBINARY}, - where user_id = #{userId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update user_extend set selenium_server = #{seleniumServer,jdbcType=VARCHAR}, platform_info = #{platformInfo,jdbcType=LONGVARBINARY} - where user_id = #{userId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update user_extend set selenium_server = #{seleniumServer,jdbcType=VARCHAR} - where user_id = #{userId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file