From 38c5d045d85d522abbbcdd7e1921f72d28b21a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=B4=E6=8B=89=E8=BF=AA=E7=BB=B4?= Date: Wed, 15 Sep 2021 14:46:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20ReadMe=EF=BC=9A?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=90=E8=A1=8C=E6=96=B9=E5=BC=8F=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 8cf5ad4..0762f14 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,14 @@ 3. 在本地分支修改任务并推送到自己名下的仓库 4. 在 [仓库首页](https://forgeplus.trustie.net/projects/Gitlink/gitlink-notification-system) 触发 pull request 并等待审核处理 +### 使用 Docker 运行 +1. git pull 拉取本仓库并保存到本地 +2. 下载并安装 [Docker Engine](https://docs.docker.com/engine/install/) +3. 配置好 Java 环境以及 Maven 环境 (Java 8 版本以上、Maven 3 版本以上) +4. 进入到仓库根目录下的 `{repo}/middleware` 目录并执行 `start_docker_compose.sh` 脚本 +5. 浏览器访问 + 1. 数据推送相关接口：http://localhost:58082/doc.html + 2. 数据读取相关接口：http://localhost:58080/doc.html +6. 停止 Docker 时环境时请执行 `{repo}/middleware/end_docker_compose.sh` 脚本 + From 350f8ce5e54722ad6d965132a5f755917cf713c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=B4=E6=8B=89=E8=BF=AA=E7=BB=B4?= Date: Wed, 15 Sep 2021 15:44:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9Readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0762f14..4679840 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -![](/api/attachments/365506?raw=true) +![](/api/attachments/366811?raw=true) ### 主要组成部分: -1. **xxl-job 调度管理中心** ：提供对分布式的任务集中监控、管理等功能 -2. **xxl-job 执行器** ：消息中心的业务逻辑实现，目前只实现「系统通知」功能，后续可以考虑 `email-executor`、`text-message-executor` 等实现 -3. **GNS-Writer**：给 `Forge业务层` 调用的 API 网关，负责从业务逻辑层接受信息 +1. **管理后台(在建)** ：提供对分布式的任务集中监控、管理等功能 +2. **各类执行器** ：消息中心的业务逻辑实现，目前只实现「系统通知」和「邮件通知」功能，后续可以考虑短信通知、微信通知等实现 +3. **GNS-Writer**：给 `业务层` 调用的 API 网关，负责从业务逻辑层接受信息 4. **middleware**：独立运行的中间件服务, 包括消息中间件、缓存中间件、DB -5. **GNS-Reader**：给 `Forge业务层` 调用的 API 网关，负责提供业务数据 +5. **GNS-Reader**：给 `业务层` 调用的 API 网关，负责提供业务数据 ### 一些约定： From 2903ac29c76fcb43e62f1dad365f2e5c2c9ffb2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E4=BD=B3?= Date: Wed, 15 Sep 2021 16:16:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?EmailJobsListener=E6=B3=A8=E9=87=8AKafkaLis?= =?UTF-8?q?tener=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/service/jobhandler/EmailJobsListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/executor/src/main/java/cn/org/gitlink/notification/executor/service/jobhandler/EmailJobsListener.java b/executor/src/main/java/cn/org/gitlink/notification/executor/service/jobhandler/EmailJobsListener.java index 24e0e2f..c9eda84 100644 --- a/executor/src/main/java/cn/org/gitlink/notification/executor/service/jobhandler/EmailJobsListener.java +++ b/executor/src/main/java/cn/org/gitlink/notification/executor/service/jobhandler/EmailJobsListener.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; @Component @Configuration //todo 邮件的topics和groupId待处理 -@KafkaListener(topics = "${spring.kafka.consumer.topic}", groupId = "${spring.kafka.consumer.group_id}") +//@KafkaListener(topics = "${spring.kafka.consumer.topic}", groupId = "${spring.kafka.consumer.group_id}") public class EmailJobsListener { private Logger logger = LogManager.getLogger(EmailJobsListener.class);