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 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);