Merge pull request #29 from yyyCode/feat/notification-service-split

feat(notification): 拆分统一通知服务（message）并接入独立 CI 双链

Author: yyyCode

.github/workflows/ci.yml

@@ -1,91 +1,82 @@
-# OpenBlog：push 到 master 时编译后端、打包前端，并将静态资源与 Docker 相关文件同步到阿里云，在服务器执行 docker.sh 更新 Nginx 容器。
-# 后端由内网自托管 Runner 构建为 Docker 容器（openblog-business，8082）。
-#
-# 需在仓库 Settings → Secrets and variables → Actions 中配置：
-#   SERVER_SSH_KEY      服务器 SSH 私钥（完整 PEM）
-#   SERVER_REMOTE_HOST  公网 IP 或域名
-#   SERVER_REMOTE_USER  SSH 登录用户（如 root 或 deploy）
-#   SERVER_TARGET       服务器上部署目录绝对路径（如 /opt/openblog/web），该目录下会有 dist、Dockerfile、docker.sh、nginx.conf
-#
-# 后端 Spring Boot 以 Docker 容器运行（openblog-business，8082），前端容器内 Nginx 通过 host.docker.internal 反代到宿主机 8082。
-# 前端容器默认映射宿主机端口 18088 → 容器 80，访问 http://IP:18088/ ，请在安全组放行 TCP 18088。
 name: Build and deploy OpenBlog
 
 on:
   workflow_dispatch:
   push:
     branches:
       - master
-    # 文档（*.md）变更不触发部署；具体哪些 job 要跑由 jobs.changes 细粒度过滤
     paths-ignore:
       - '**/*.md'
 
 jobs:
-  # 检测变更范围，供后续 job 条件判断
+  # 检测变更范围。business 与 message 两条链互不影响；共享契约（OpenBlog-api/**）变更会同时触发双链。
   changes:
     runs-on: ubuntu-latest
     outputs:
-      backend: ${{ steps.filter.outputs.backend }}
+      business: ${{ steps.filter.outputs.business }}
+      message: ${{ steps.filter.outputs.message }}
       frontend: ${{ steps.filter.outputs.frontend }}
     steps:
       - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: |
-            backend:
+            business:
               - 'OpenBlog-business/**'
               - 'OpenBlog-framework*/**'
-              - 'OpenBlog-message/**'
-              - 'OpenBlog-message-api/**'
+              - 'OpenBlog-common/**'
+              - 'OpenBlog-api/**'
               - 'deploy/business/**'
               - 'pom.xml'
+            message:
+              - 'OpenBlog-message/**'
+              - 'OpenBlog-common/**'
+              - 'OpenBlog-api/**'
+              - 'deploy/message/**'
+              - 'pom.xml'
             frontend:
               - 'vue/**'
 
-  build-backend:
+  # ============ business 链（独立） ============
+  build-business:
     needs: changes
-    if: ${{ needs.changes.outputs.backend == 'true' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ needs.changes.outputs.business == 'true' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     env:
       FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: "17"
           distribution: "temurin"
           cache: "maven"
-
-      - name: Build backend (Maven)
+      - name: Build business (Maven)
         run: mvn -B -ntp package -DskipTests -pl OpenBlog-business -am
-
-      - name: Upload backend JAR
+      - name: Upload business JAR
         uses: actions/upload-artifact@v4
         with:
-          name: backend-jar
+          name: business-jar
           path: OpenBlog-business/target/OpenBlog-business-*.jar
           retention-days: 1
 
-  deploy-backend:
-    needs: build-backend
-    if: ${{ needs.build-backend.result == 'success' || github.event_name == 'workflow_dispatch' }}
+  deploy-business:
+    needs: build-business
+    if: ${{ needs.build-business.result == 'success' || github.event_name == 'workflow_dispatch' }}
     runs-on: openblog-backend
 
     steps:
       - name: Checkout（获取 deploy/business 下的 Docker 部署文件）
         uses: actions/checkout@v4
-
-      - name: Download backend JAR
+      - name: Download business JAR
         uses: actions/download-artifact@v4
         with:
-          name: backend-jar
-          path: backend
-
+          name: business-jar
+          path: business
       - name: Deploy via Docker（构建镜像 + 重启容器）
         run: |
           set -euo pipefail
@@ -102,28 +93,113 @@ jobs:
             cp "$TARGET_JAR" "$TARGET_DIR/backup/OpenBlog-business-$(date +%Y%m%d-%H%M%S).jar" 2>/dev/null || true
           fi
 
-          # 3. 拷贝新 jar + Docker 部署文件（.dockerignore 缩小构建上下文）
-          JAR_FILE=$(ls backend/OpenBlog-business-*.jar | head -1)
+          # 3. 拷贝新 jar + Docker 部署文件
+          JAR_FILE=$(ls business/OpenBlog-business-*.jar | head -1)
           cp "$JAR_FILE" "$TARGET_JAR"
           cp deploy/business/Dockerfile deploy/business/docker-compose.yml deploy/business/.dockerignore "$TARGET_DIR/"
 
-          # 4. Docker 构建并启动容器（兼容 compose v2「docker compose」/ v1「docker-compose」）
+          # 4. Docker 构建并启动容器
           cd "$TARGET_DIR"
-          docker info >/dev/null 2>&1 || { echo "!! Docker 守护进程未运行，请先启动 Docker（宝塔 → Docker 管理器）" >&2; exit 1; }
+          docker info >/dev/null 2>&1 || { echo "!! Docker 守护进程未运行，请先启动 Docker" >&2; exit 1; }
           if docker compose version >/dev/null 2>&1; then
             DC="docker compose"
           elif docker-compose version >/dev/null 2>&1; then
             DC="docker-compose"
           else
-            echo "!! 服务器上没有 docker compose / docker-compose，请先安装 Docker（宝塔 → Docker 管理器）" >&2
+            echo "!! 服务器上没有 docker compose / docker-compose" >&2
             exit 1
           fi
           echo "==> 使用: $DC"
           $DC up -d --build --remove-orphans
           $DC ps
-
           echo "==> Deployed OpenBlog-business via Docker"
 
+  # ============ message 链（独立，与 business 互不影响） ============
+  build-message:
+    needs: changes
+    if: ${{ needs.changes.outputs.message == 'true' || github.event_name == 'workflow_dispatch' }}
+    runs-on: ubuntu-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: "17"
+          distribution: "temurin"
+          cache: "maven"
+      - name: Build message (Maven)
+        run: mvn -B -ntp package -DskipTests -pl OpenBlog-message -am
+      - name: Upload message JAR
+        uses: actions/upload-artifact@v4
+        with:
+          name: message-jar
+          path: OpenBlog-message/target/OpenBlog-message-*.jar
+          retention-days: 1
+
+  deploy-message:
+    needs: build-message
+    if: ${{ needs.build-message.result == 'success' || github.event_name == 'workflow_dispatch' }}
+    runs-on: openblog-backend
+
+    steps:
+      - name: Checkout（获取 deploy/message 下的 Docker 部署文件）
+        uses: actions/checkout@v4
+      - name: Download message JAR
+        uses: actions/download-artifact@v4
+        with:
+          name: message-jar
+          path: message
+      - name: Deploy via Docker（构建镜像 + 重启容器 + 注入阿里云凭据）
+        env:
+          ALIYUN_AK: ${{ secrets.ALIYUN_AK }}
+          ALIYUN_SK: ${{ secrets.ALIYUN_SK }}
+          ALIYUN_FROM: ${{ secrets.ALIYUN_FROM }}
+        run: |
+          set -euo pipefail
+          TARGET_DIR="/www/wwwroot/java/openblog-message"
+          TARGET_JAR="$TARGET_DIR/OpenBlog-message-1.0.0-SNAPSHOT.jar"
+
+          # 1. 停掉旧 宝塔/手动部署的 message 进程（释放 8083/20883；若无则该步 no-op）
+          systemctl stop openblog-message 2>/dev/null || true
+
+          # 2. 备份旧 jar
+          mkdir -p "$TARGET_DIR"
+          if [ -f "$TARGET_JAR" ]; then
+            mkdir -p "$TARGET_DIR/backup"
+            cp "$TARGET_JAR" "$TARGET_DIR/backup/OpenBlog-message-$(date +%Y%m%d-%H%M%S).jar" 2>/dev/null || true
+          fi
+
+          # 3. 拷贝新 jar + Docker 部署文件
+          JAR_FILE=$(ls message/OpenBlog-message-*.jar | head -1)
+          cp "$JAR_FILE" "$TARGET_JAR"
+          cp deploy/message/Dockerfile deploy/message/docker-compose.yml deploy/message/.dockerignore "$TARGET_DIR/"
+
+          # 4. 阿里云凭据写入服务器 .env（compose 自动加载），供 message 容器读取
+          printf 'ALIYUN_AK=%s\nALIYUN_SK=%s\nALIYUN_FROM=%s\n' \
+            "$ALIYUN_AK" "$ALIYUN_SK" "$ALIYUN_FROM" \
+            > "$TARGET_DIR/.env"
+
+          # 5. Docker 构建并启动容器
+          cd "$TARGET_DIR"
+          docker info >/dev/null 2>&1 || { echo "!! Docker 守护进程未运行，请先启动 Docker" >&2; exit 1; }
+          if docker compose version >/dev/null 2>&1; then
+            DC="docker compose"
+          elif docker-compose version >/dev/null 2>&1; then
+            DC="docker-compose"
+          else
+            echo "!! 服务器上没有 docker compose / docker-compose" >&2
+            exit 1
+          fi
+          echo "==> 使用: $DC"
+          $DC up -d --build --remove-orphans
+          $DC ps
+          echo "==> Deployed OpenBlog-message via Docker"
+
+  # ============ 前端链（原样保留） ============
   build-frontend:
     needs: changes
     if: ${{ needs.changes.outputs.frontend == 'true' || github.event_name == 'workflow_dispatch' }}
@@ -134,31 +210,26 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: "22"
           cache: "npm"
           cache-dependency-path: vue/package-lock.json
-
       - name: Install frontend dependencies and build
         working-directory: vue
         run: |
           npm ci
           npm run build
-
       - name: Prepare release bundle for server
         run: |
           mkdir -p release
           cp -r vue/dist release/dist
           cp vue/Dockerfile vue/docker.sh vue/nginx.conf release/
-
       - name: Build Docker image on runner
         run: |
           docker build -t openblog-web release/
           docker save openblog-web | gzip > release/openblog-web.tar.gz
-
       - name: Upload release bundle
         uses: actions/upload-artifact@v4
         with:
@@ -176,7 +247,6 @@ jobs:
         with:
           name: release-frontend
           path: release/
-
       - name: Deploy files to server
         uses: easingthemes/ssh-deploy@v5.1.1
         with:
@@ -187,7 +257,6 @@ jobs:
           REMOTE_USER: ${{ secrets.SERVER_REMOTE_USER }}
           TARGET: ${{ secrets.SERVER_TARGET }}
           SCRIPT_BEFORE: ls -la
-
       - name: Run Docker commands on server
         uses: appleboy/ssh-action@v1.2.0
         with:

OpenBlog-api/OpenBlog-message-api/src/main/java/com/yqz/openblog/message/api/EmailRpcService.java

@@ -0,0 +1,24 @@
+package com.yqz.openblog.message.api;
+
+import com.yqz.openblog.notification.NotificationMessage;
+
+/**
+ * 统一通知 RPC 接口（business 消费，message 提供）。
+ * <p>
+ * 与旧 EmailRPC 服务的区别：入参是渠道无关的 {@link NotificationMessage}，
+ * 由 message 内部按渠道路由投递；同步返回结果对象（显式错误码，不依赖 Dubbo 异常传播）。
+ */
+public interface NotificationRpcService {
+
+    /** 注册验证码模板 code（共享常量：business 构造消息与 message 渲染共用同一来源）。 */
+    String TEMPLATE_REGISTER_VERIFICATION_CODE = "register-verification-code";
+
+    /** 邮件渠道不可用（同步链路降级码，随 result.errorCode 跨服务回传，business 映射回 BizException(5002)）。 */
+    int ERROR_CODE_EMAIL_UNAVAILABLE = 5002;
+
+    /** 通用内部错误（未预期的非业务异常，如 DB/序列化等）。 */
+    int ERROR_CODE_INTERNAL = 5000;
+
+    /** 同步提交一条通知并投递。失败时返回 result.success=false + 错误码/消息。 */
+    NotificationSendResult submit(NotificationMessage message);
+}

OpenBlog-api/OpenBlog-message-api/src/main/java/com/yqz/openblog/message/api/NotificationRpcService.java

@@ -0,0 +1,43 @@
+package com.yqz.openblog.message.api;
+
+import java.io.Serializable;
+
+/**
+ * 通知提交结果（跨服务显式错误语义）。
+ * <p>
+ * success=false 时携带 errorCode / errorMsg（如 5002「邮件服务暂不可用」），
+ * 供 business 侧映射回 {@code BizException} 并做相应清理。
+ */
+public class NotificationSendResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private boolean success;
+    private Integer errorCode;
+    private String errorMsg;
+
+    public NotificationSendResult() {}
+
+    public NotificationSendResult(boolean success, Integer errorCode, String errorMsg) {
+        this.success = success;
+        this.errorCode = errorCode;
+        this.errorMsg = errorMsg;
+    }
+
+    public static NotificationSendResult ok() {
+        return new NotificationSendResult(true, null, null);
+    }
+
+    public static NotificationSendResult fail(int errorCode, String errorMsg) {
+        return new NotificationSendResult(false, errorCode, errorMsg);
+    }
+
+    public boolean isSuccess() { return success; }
+    public void setSuccess(boolean success) { this.success = success; }
+
+    public Integer getErrorCode() { return errorCode; }
+    public void setErrorCode(Integer errorCode) { this.errorCode = errorCode; }
+
+    public String getErrorMsg() { return errorMsg; }
+    public void setErrorMsg(String errorMsg) { this.errorMsg = errorMsg; }
+}

OpenBlog-api/OpenBlog-message-api/src/main/java/com/yqz/openblog/message/api/NotificationSendResult.java

@@ -3,7 +3,7 @@
 /**
  * 通知渠道类型。
  * <p>
- * 当前只实现 EMAIL（经 Dubbo 调 email 模块直发）。SMS / FEISHU 为未来扩展位，
+ * 当前只实现 EMAIL（message 内进程直调 EmailService 投递）。SMS / FEISHU 为未来扩展位，
  * 接入时新增枚举值 + 对应 {@link NotificationChannel} 策略 + 配置即可，主链路零改动。
  */
 public enum NotificationChannelType {

…otification/NotificationChannelType.java …otification/NotificationChannelType.javaOpenBlog-business/src/main/java/com/yqz/openblog/notification/NotificationChannelType.java renamed to OpenBlog-api/OpenBlog-message-api/src/main/java/com/yqz/openblog/notification/NotificationChannelType.java OpenBlog-business/src/main/java/com/yqz/openblog/notification/NotificationChannelType.java renamed to OpenBlog-api/OpenBlog-message-api/src/main/java/com/yqz/openblog/notification/NotificationChannelType.java

@@ -1,5 +1,6 @@
 package com.yqz.openblog.notification;
 
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -9,7 +10,9 @@
  * 经 {@link NotificationTemplateService} 渲染成各渠道内容。未来接 SMS/飞书时扩展 templateCode
  * 与模板即可，调用方无需感知渠道实现差异。
  */
-public class NotificationMessage {
+public class NotificationMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 全局幂等键（业务方生成，如 UUID）：贯穿 outbox / MQ / 消费端投递。