From 8d5b23c433d7c52bf11bda9c5cf1fc46f02de2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=B4=E6=8B=89=E8=BF=AA=E7=BB=B4?= Date: Thu, 9 Sep 2021 13:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、数据库新增 source、extra 两个字段分别用来标识信息来源和额外附带的信息 2、调整因上述原因导致的必要的Java代码 --- db/gns-notification.sql | 10 +++++++-- middleware/end_docker_compose.sh | 2 ++ middleware/services.yml | 1 + middleware/start_docker_compose.sh | 1 + .../model/dao/entity/SysNotification.java | 20 +++++++++++++++++ .../dao/entity/vo/NewSysNotificationVo.java | 22 +++++++++++++++++++ .../notification/SysNotificationMapper.xml | 20 +++++++++++++++-- 7 files changed, 72 insertions(+), 4 deletions(-) create mode 100755 middleware/end_docker_compose.sh create mode 100755 middleware/start_docker_compose.sh diff --git a/db/gns-notification.sql b/db/gns-notification.sql index 41464e4..1637c77 100644 --- a/db/gns-notification.sql +++ b/db/gns-notification.sql @@ -1,4 +1,7 @@ + +USE gitlink_notification; + DROP TABLE IF EXISTS `gns_platform_info`; CREATE TABLE `gns_platform_info` ( `id` INT NOT NULL AUTO_INCREMENT, @@ -28,5 +31,8 @@ CREATE TABLE `gitlink_sys_notification` ( ) ENGINE=INNODB DEFAULT CHARSET=utf8mb3; -- 2021-09-07 区分系统消息类型 -ALTER TABLE gitlink_sys_notification ADD COLUMN -( `type` TINYINT(4) NOT NULL DEFAULT 1 COMMENT '消息类型： 1系统消息，2@我'); \ No newline at end of file +ALTER TABLE gitlink_sys_notification ADD COLUMN (`type` TINYINT(4) NOT NULL DEFAULT 1 COMMENT '消息类型： 1系统消息，2@我'); + +-- 2021-09-09 新增 source 字段区分消息来源、新增 extra 字段保存额外信息 +ALTER TABLE gitlink_sys_notification ADD source varchar(250) NULL COMMENT '消息来源'; +ALTER TABLE gitlink_sys_notification ADD extra TEXT NULL COMMENT '额外信息（备用字段）'; \ No newline at end of file diff --git a/middleware/end_docker_compose.sh b/middleware/end_docker_compose.sh new file mode 100755 index 0000000..ae55462 --- /dev/null +++ b/middleware/end_docker_compose.sh @@ -0,0 +1,2 @@ +docker-compose -f services.yml down +docker volume prune -f diff --git a/middleware/services.yml b/middleware/services.yml index 54a01b0..a748ce7 100644 --- a/middleware/services.yml +++ b/middleware/services.yml @@ -13,6 +13,7 @@ services: - ${DOCKER_DATA_PATH}/mysql:/var/lib/mysql - ${SQL_SCRIPT_PATH}/xxl-job-structure.sql:/docker-entrypoint-initdb.d/0000.sql - ${SQL_SCRIPT_PATH}/gns-notification.sql:/docker-entrypoint-initdb.d/0001.sql + command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci ports: - ${MYSQL_LOCAL_PORT}:3306 networks: diff --git a/middleware/start_docker_compose.sh b/middleware/start_docker_compose.sh new file mode 100755 index 0000000..59c6d96 --- /dev/null +++ b/middleware/start_docker_compose.sh @@ -0,0 +1 @@ +docker-compose -f services.yml up diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java index d59fbc1..2713cfe 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java @@ -32,6 +32,26 @@ public class SysNotification { @JsonIgnore private Integer isDelete; + private String source; + + private String extra; + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getExtra() { + return extra; + } + + public void setExtra(String extra) { + this.extra = extra; + } + public Integer getId() { return id; } diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java index 03f6a0a..45da142 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java @@ -30,6 +30,28 @@ public class NewSysNotificationVo { @NotNull private Integer type; + @ApiModelProperty(value = "消息来源") + private String source; + + @ApiModelProperty(value = "额外信息") + private String extra; + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getExtra() { + return extra; + } + + public void setExtra(String extra) { + this.extra = extra; + } + public String getPlatform() { return platform; } diff --git a/model/src/main/resources/mapper/notification/SysNotificationMapper.xml b/model/src/main/resources/mapper/notification/SysNotificationMapper.xml index 5d2975e..a974ebd 100644 --- a/model/src/main/resources/mapper/notification/SysNotificationMapper.xml +++ b/model/src/main/resources/mapper/notification/SysNotificationMapper.xml @@ -13,7 +13,7 @@ - id, sender, receiver, content, notification_url, created_at, status, type, is_delete + id, sender, receiver, content, notification_url, created_at, status, type, is_delete, status, extra