From e5fa9b4383db3a2223f13fe6b5205acaaa64d6d8 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Tue, 15 Aug 2023 15:01:29 +0800 Subject: [PATCH] build: message ddl move to project --- .../domain/MessageTask.java | 2 +- .../domain/MessageTaskBlob.java | 2 +- .../domain/MessageTaskBlobExample.java | 2 +- .../domain/MessageTaskExample.java | 2 +- .../domain/Notification.java | 2 +- .../domain/NotificationExample.java | 2 +- .../mapper/MessageTaskBlobMapper.java | 6 +- .../mapper/MessageTaskBlobMapper.xml | 22 +++---- .../mapper/MessageTaskMapper.java | 6 +- .../mapper/MessageTaskMapper.xml | 18 +++--- .../mapper/NotificationMapper.java | 6 +- .../mapper/NotificationMapper.xml | 18 +++--- .../3.0.0/ddl/V3.0.0_11__system_setting.sql | 53 ----------------- .../ddl/V3.0.0_4__project_management.sql | 57 +++++++++++++++++++ .../main/resources/projectGeneratorConfig.xml | 4 +- 15 files changed, 104 insertions(+), 98 deletions(-) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/domain/MessageTask.java (99%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/domain/MessageTaskBlob.java (98%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/domain/MessageTaskBlobExample.java (99%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/domain/MessageTaskExample.java (99%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/domain/Notification.java (99%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/domain/NotificationExample.java (99%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/mapper/MessageTaskBlobMapper.java (89%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/mapper/MessageTaskBlobMapper.xml (88%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/mapper/MessageTaskMapper.java (86%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/mapper/MessageTaskMapper.xml (94%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/mapper/NotificationMapper.java (86%) rename backend/framework/domain/src/main/java/io/metersphere/{system => project}/mapper/NotificationMapper.xml (94%) diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTask.java similarity index 99% rename from backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java rename to backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTask.java index 1d3ce60a8c..fbca61d983 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTask.java @@ -1,4 +1,4 @@ -package io.metersphere.system.domain; +package io.metersphere.project.domain; import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTaskBlob.java similarity index 98% rename from backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java rename to backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTaskBlob.java index e374847ca9..b30c01d90c 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTaskBlob.java @@ -1,4 +1,4 @@ -package io.metersphere.system.domain; +package io.metersphere.project.domain; import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlobExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTaskBlobExample.java similarity index 99% rename from backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlobExample.java rename to backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTaskBlobExample.java index 11c951f987..40cc55b97c 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlobExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTaskBlobExample.java @@ -1,4 +1,4 @@ -package io.metersphere.system.domain; +package io.metersphere.project.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTaskExample.java similarity index 99% rename from backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskExample.java rename to backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTaskExample.java index bfc63bf861..a651694817 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/MessageTaskExample.java @@ -1,4 +1,4 @@ -package io.metersphere.system.domain; +package io.metersphere.project.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/Notification.java similarity index 99% rename from backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java rename to backend/framework/domain/src/main/java/io/metersphere/project/domain/Notification.java index 83e80dda90..700d54f1a4 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/Notification.java @@ -1,4 +1,4 @@ -package io.metersphere.system.domain; +package io.metersphere.project.domain; import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/NotificationExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/NotificationExample.java similarity index 99% rename from backend/framework/domain/src/main/java/io/metersphere/system/domain/NotificationExample.java rename to backend/framework/domain/src/main/java/io/metersphere/project/domain/NotificationExample.java index 549900a513..770765a98d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/NotificationExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/NotificationExample.java @@ -1,4 +1,4 @@ -package io.metersphere.system.domain; +package io.metersphere.project.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskBlobMapper.java similarity index 89% rename from backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.java rename to backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskBlobMapper.java index a82a60fba2..8f47d11685 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskBlobMapper.java @@ -1,7 +1,7 @@ -package io.metersphere.system.mapper; +package io.metersphere.project.mapper; -import io.metersphere.system.domain.MessageTaskBlob; -import io.metersphere.system.domain.MessageTaskBlobExample; +import io.metersphere.project.domain.MessageTaskBlob; +import io.metersphere.project.domain.MessageTaskBlobExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskBlobMapper.xml similarity index 88% rename from backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.xml rename to backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskBlobMapper.xml index d7151a468a..42e6ea2df0 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskBlobMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskBlobMapper.xml @@ -1,10 +1,10 @@ - - + + - + @@ -71,7 +71,7 @@ `template` - select distinct @@ -87,7 +87,7 @@ order by ${orderByClause} - select distinct @@ -113,17 +113,17 @@ delete from message_task_blob where id = #{id,jdbcType=VARCHAR} - + delete from message_task_blob - + insert into message_task_blob (id, `template`) values (#{id,jdbcType=VARCHAR}, #{template,jdbcType=LONGVARCHAR}) - + insert into message_task_blob @@ -142,7 +142,7 @@ - select count(*) from message_task_blob @@ -177,7 +177,7 @@ - + update message_task_blob @@ -186,7 +186,7 @@ where id = #{id,jdbcType=VARCHAR} - + update message_task_blob set `template` = #{template,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskMapper.java similarity index 86% rename from backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskMapper.java rename to backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskMapper.java index 005a7bc1b2..c17ff799dc 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskMapper.java @@ -1,7 +1,7 @@ -package io.metersphere.system.mapper; +package io.metersphere.project.mapper; -import io.metersphere.system.domain.MessageTask; -import io.metersphere.system.domain.MessageTaskExample; +import io.metersphere.project.domain.MessageTask; +import io.metersphere.project.domain.MessageTaskExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskMapper.xml similarity index 94% rename from backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskMapper.xml rename to backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskMapper.xml index cb8f4d8e18..ea961026f6 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/MessageTaskMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/MessageTaskMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -73,7 +73,7 @@ id, `type`, event, receiver, task_type, webhook, test_id, create_time, project_id - select distinct @@ -97,13 +97,13 @@ delete from message_task where id = #{id,jdbcType=VARCHAR} - + delete from message_task - + insert into message_task (id, `type`, event, receiver, task_type, webhook, test_id, create_time, project_id @@ -113,7 +113,7 @@ #{testId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{projectId,jdbcType=VARCHAR} ) - + insert into message_task @@ -174,7 +174,7 @@ - select count(*) from message_task @@ -230,7 +230,7 @@ - + update message_task @@ -260,7 +260,7 @@ where id = #{id,jdbcType=VARCHAR} - + update message_task set `type` = #{type,jdbcType=VARCHAR}, event = #{event,jdbcType=VARCHAR}, diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/NotificationMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/NotificationMapper.java similarity index 86% rename from backend/framework/domain/src/main/java/io/metersphere/system/mapper/NotificationMapper.java rename to backend/framework/domain/src/main/java/io/metersphere/project/mapper/NotificationMapper.java index bb744afacc..00d057a244 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/NotificationMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/NotificationMapper.java @@ -1,7 +1,7 @@ -package io.metersphere.system.mapper; +package io.metersphere.project.mapper; -import io.metersphere.system.domain.Notification; -import io.metersphere.system.domain.NotificationExample; +import io.metersphere.project.domain.Notification; +import io.metersphere.project.domain.NotificationExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/NotificationMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/NotificationMapper.xml similarity index 94% rename from backend/framework/domain/src/main/java/io/metersphere/system/mapper/NotificationMapper.xml rename to backend/framework/domain/src/main/java/io/metersphere/project/mapper/NotificationMapper.xml index 2fa8efd689..a02626b072 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/NotificationMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/NotificationMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -76,7 +76,7 @@ id, `type`, receiver, title, `status`, create_time, `operator`, `operation`, resource_id, resource_type, resource_name - select distinct @@ -100,13 +100,13 @@ delete from notification where id = #{id,jdbcType=BIGINT} - + delete from notification - + insert into notification (id, `type`, receiver, title, `status`, create_time, `operator`, `operation`, resource_id, @@ -116,7 +116,7 @@ #{operator,jdbcType=VARCHAR}, #{operation,jdbcType=VARCHAR}, #{resourceId,jdbcType=VARCHAR}, #{resourceType,jdbcType=VARCHAR}, #{resourceName,jdbcType=VARCHAR}) - + insert into notification @@ -189,7 +189,7 @@ - select count(*) from notification @@ -253,7 +253,7 @@ - + update notification @@ -289,7 +289,7 @@ where id = #{id,jdbcType=BIGINT} - + update notification set `type` = #{type,jdbcType=VARCHAR}, receiver = #{receiver,jdbcType=VARCHAR}, diff --git a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_11__system_setting.sql b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_11__system_setting.sql index d49d245eac..59be9ebeda 100644 --- a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_11__system_setting.sql +++ b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_11__system_setting.sql @@ -55,51 +55,6 @@ CREATE TABLE IF NOT EXISTS license DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = ''; -CREATE TABLE IF NOT EXISTS message_task -( - `id` VARCHAR(50) NOT NULL COMMENT '', - `type` VARCHAR(50) NOT NULL COMMENT '消息类型', - `event` VARCHAR(255) NOT NULL COMMENT '通知事件类型', - `receiver` VARCHAR(50) NOT NULL COMMENT '接收人id', - `task_type` VARCHAR(64) NOT NULL COMMENT '任务类型', - `webhook` VARCHAR(255) COMMENT 'webhook地址', - `test_id` VARCHAR(50) NOT NULL DEFAULT 'none' COMMENT '具体测试的ID', - `create_time` BIGINT NOT NULL DEFAULT 0 COMMENT '创建时间', - `project_id` VARCHAR(50) NOT NULL COMMENT '项目ID', - PRIMARY KEY (id) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 - COLLATE = utf8mb4_general_ci COMMENT = '消息通知任务'; - - -CREATE INDEX idx_project_id ON message_task (`project_id`); -CREATE INDEX idx_create_time ON message_task (`create_time`); -CREATE INDEX idx_receiver ON message_task (`receiver`); -CREATE INDEX idx_test_id ON message_task (`test_id`); - -CREATE TABLE IF NOT EXISTS notification -( - `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID', - `type` VARCHAR(30) NOT NULL COMMENT '通知类型', - `receiver` VARCHAR(50) NOT NULL COMMENT '接收人', - `title` VARCHAR(255) NOT NULL COMMENT '标题', - `status` VARCHAR(30) NOT NULL COMMENT '状态', - `create_time` BIGINT NOT NULL COMMENT '创建时间', - `operator` VARCHAR(50) NOT NULL COMMENT '操作人', - `operation` VARCHAR(50) NOT NULL COMMENT '操作', - `resource_id` VARCHAR(50) NOT NULL COMMENT '资源ID', - `resource_type` VARCHAR(50) NOT NULL COMMENT '资源类型', - `resource_name` VARCHAR(255) NOT NULL COMMENT '资源名称', - PRIMARY KEY (id) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 - COLLATE = utf8mb4_general_ci COMMENT = '消息通知'; - - -CREATE INDEX idx_receiver ON notification (`receiver`); -CREATE INDEX idx_receiver_type ON notification (`receiver`, `type`); -CREATE INDEX idx_notification_create_time ON notification (`create_time`); - CREATE TABLE IF NOT EXISTS novice_statistics ( `id` VARCHAR(50) NOT NULL COMMENT '', @@ -368,14 +323,6 @@ CREATE TABLE IF NOT EXISTS user_extend DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户扩展'; -CREATE TABLE IF NOT EXISTS message_task_blob -( - `id` VARCHAR(50) NOT NULL COMMENT '', - `template` TEXT COMMENT '消息模版', - PRIMARY KEY (id) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 - COLLATE = utf8mb4_general_ci COMMENT = '消息通知任务大字段'; CREATE TABLE IF NOT EXISTS test_resource_pool_organization ( diff --git a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_4__project_management.sql b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_4__project_management.sql index 456c15c8fb..e8b8c0a726 100644 --- a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_4__project_management.sql +++ b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_4__project_management.sql @@ -346,5 +346,62 @@ CREATE INDEX idx_create_user ON api_template (create_user); CREATE INDEX idx_project_id ON api_template (project_id); +CREATE TABLE IF NOT EXISTS message_task +( + `id` VARCHAR(50) NOT NULL COMMENT '', + `type` VARCHAR(50) NOT NULL COMMENT '消息类型', + `event` VARCHAR(255) NOT NULL COMMENT '通知事件类型', + `receiver` VARCHAR(50) NOT NULL COMMENT '接收人id', + `task_type` VARCHAR(64) NOT NULL COMMENT '任务类型', + `webhook` VARCHAR(255) COMMENT 'webhook地址', + `test_id` VARCHAR(50) NOT NULL DEFAULT 'none' COMMENT '具体测试的ID', + `create_time` BIGINT NOT NULL DEFAULT 0 COMMENT '创建时间', + `project_id` VARCHAR(50) NOT NULL COMMENT '项目ID', + PRIMARY KEY (id) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT = '消息通知任务'; + + +CREATE INDEX idx_project_id ON message_task (`project_id`); +CREATE INDEX idx_create_time ON message_task (`create_time`); +CREATE INDEX idx_receiver ON message_task (`receiver`); +CREATE INDEX idx_test_id ON message_task (`test_id`); + +CREATE TABLE IF NOT EXISTS message_task_blob +( + `id` VARCHAR(50) NOT NULL COMMENT '', + `template` TEXT COMMENT '消息模版', + PRIMARY KEY (id) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT = '消息通知任务大字段'; + + +CREATE TABLE IF NOT EXISTS notification +( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID', + `type` VARCHAR(30) NOT NULL COMMENT '通知类型', + `receiver` VARCHAR(50) NOT NULL COMMENT '接收人', + `title` VARCHAR(255) NOT NULL COMMENT '标题', + `status` VARCHAR(30) NOT NULL COMMENT '状态', + `create_time` BIGINT NOT NULL COMMENT '创建时间', + `operator` VARCHAR(50) NOT NULL COMMENT '操作人', + `operation` VARCHAR(50) NOT NULL COMMENT '操作', + `resource_id` VARCHAR(50) NOT NULL COMMENT '资源ID', + `resource_type` VARCHAR(50) NOT NULL COMMENT '资源类型', + `resource_name` VARCHAR(255) NOT NULL COMMENT '资源名称', + PRIMARY KEY (id) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT = '消息通知'; + + +CREATE INDEX idx_receiver ON notification (`receiver`); +CREATE INDEX idx_receiver_type ON notification (`receiver`, `type`); +CREATE INDEX idx_notification_create_time ON notification (`create_time`); + + + -- set innodb lock wait timeout to default SET SESSION innodb_lock_wait_timeout = DEFAULT; \ No newline at end of file diff --git a/backend/services/project-management/src/main/resources/projectGeneratorConfig.xml b/backend/services/project-management/src/main/resources/projectGeneratorConfig.xml index f07911757f..7db114d6e1 100644 --- a/backend/services/project-management/src/main/resources/projectGeneratorConfig.xml +++ b/backend/services/project-management/src/main/resources/projectGeneratorConfig.xml @@ -89,7 +89,9 @@
- +
+
+