From 753eb10c4cf329e0a8d8fa75281a595221e7d86f Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Wed, 27 Nov 2024 11:09:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3004)=20-=20=E6=89=B9=E9=87=8F=20ES=20?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=9A=84=E9=80=BB=E8=BE=91=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E7=B2=BE=E7=BB=86=E5=8C=96=20tag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/web/bpmn/BpmnProcessActivityController.java    | 4 +++-
 .../mq/inside/consumer/ElasticSearchBatchSyncListener.java    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java
index 8704cf3db..bdb02d920 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java
@@ -49,7 +49,8 @@ public class BpmnProcessActivityController extends BasicPopulateAvatarController
     private BpmnProcessActivityService bpmnProcessActivityService;
 
     /**
-     * 业务节点唤醒 旧版本使用的接口
+     * 业务节点唤醒
+     * 旧版本使用的接口, 建议使用 {@link BpmnProcessActivityController#trigger(BpmnActivityTriggerDTO)}
      *
      * @param triggerId
      * @return
@@ -58,6 +59,7 @@ public class BpmnProcessActivityController extends BasicPopulateAvatarController
     @GetMapping("/trigger")
     @Override
     @RepeatSubmit
+    @Deprecated
     public CommonResponse<Boolean> trigger(@NotBlank(message = "触发 ID 不能为空") @RequestParam String triggerId) {
         log.info("业务节点唤醒 trigger2 ===>>>参数：{}", triggerId);
         return trigger(new BpmnActivityTriggerDTO(triggerId, true));
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/mq/inside/consumer/ElasticSearchBatchSyncListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/mq/inside/consumer/ElasticSearchBatchSyncListener.java
index 7cfc678b1..5c2e21069 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/mq/inside/consumer/ElasticSearchBatchSyncListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/mq/inside/consumer/ElasticSearchBatchSyncListener.java
@@ -58,7 +58,7 @@ public class ElasticSearchBatchSyncListener {
         DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(consumerGroup);
         consumer.setNamesrvAddr(rocketMQProperties.getNameServer());
         consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET);
-        consumer.subscribe(topic, "*");
+        consumer.subscribe(topic, ELASTIC_SEARCH_SYNC.getTag());
         consumer.setConsumeMessageBatchMaxSize(refreshProperties.getEsSyncBatchSize());
 //        consumer.setConsumeThreadMax(1);
 //        consumer.setConsumeThreadMin(1);