From 9606589bab877a02349e77ad613073e115a26627 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Sat, 14 Sep 2024 13:06:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-2924)=20-=20Starter=20=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E6=97=A0=E9=9C=80=E4=BD=BF=E7=94=A8=20MQ=20=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StarterBroadcastMQConfiguration.java       |  4 ++--
 .../StarterRPCInvokeMQConfiguration.java       |  4 ++--
 .../starter/api/WorkflowCoreService.java       | 16 ----------------
 .../starter/api/WorkflowManageService.java     | 18 ++++++++++++++++++
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java
index 27d4868bb..bb1d862c7 100644
--- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java
+++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java
@@ -48,7 +48,7 @@ import static org.apache.rocketmq.spring.autoconfigure.RocketMQAutoConfiguration
  * @since 2024/6/5 17:39
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnBean(name = ROCKETMQ_TEMPLATE_DEFAULT_GLOBAL_NAME)
+@ConditionalOnProperty(name = "rocketmq.name-server")
 public class StarterBroadcastMQConfiguration {
     private final Logger log = LoggerFactory.getLogger(StarterBroadcastMQConfiguration.class);
     public static final String BROADCAST_EVENT_HANDLER_REPOSITORY_BEAN_NAME = "broadcastEventHandlerRepository";
@@ -87,7 +87,7 @@ public class StarterBroadcastMQConfiguration {
     }
 
     @Component
-    @ConditionalOnBean(RocketMQTemplate.class)
+    @ConditionalOnProperty(name = "rocketmq.name-server")
     @Conditional(NonContainerEnvironmentCondition.class)
     @RocketMQMessageListener(topic = DEFAULT_EVENT + "${spring.profiles.active}",
         consumerGroup = "GID_${spring.application.name}_workflow_engine_${GID_SEGMENT}_consumer",
diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterRPCInvokeMQConfiguration.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterRPCInvokeMQConfiguration.java
index 25e15d6d8..7ae0fdca4 100644
--- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterRPCInvokeMQConfiguration.java
+++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterRPCInvokeMQConfiguration.java
@@ -52,7 +52,7 @@ import static org.apache.rocketmq.spring.autoconfigure.RocketMQAutoConfiguration
  * @since 2024/5/30 14:05
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnBean(name = ROCKETMQ_TEMPLATE_DEFAULT_GLOBAL_NAME)
+@ConditionalOnProperty(name = "rocketmq.name-server")
 public class StarterRPCInvokeMQConfiguration {
     private final Logger log = LoggerFactory.getLogger(StarterRPCInvokeMQConfiguration.class);
     public static final String WORKFLOW_ENGINE_STARTER_EVENT_PRODUCER_BEAN_NAME = "workflowEngineStarterEventProducer";
@@ -165,7 +165,7 @@ public class StarterRPCInvokeMQConfiguration {
     }
 
     @Component
-    @ConditionalOnBean(RocketMQTemplate.class)
+    @ConditionalOnProperty(name = "rocketmq.name-server")
     @Conditional(NonContainerEnvironmentCondition.class)
     @RocketMQMessageListener(topic = DEFAULT_EVENT + "${spring.profiles.active}",
             consumerGroup = "GID_${spring.application.name}_workflow_engine_starter_${GID_SEGMENT}_consumer",
diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java
index b3aacf712..bb5f7f8c1 100644
--- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java
+++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java
@@ -198,22 +198,6 @@ public interface WorkflowCoreService {
     @InvokeMode(SYNC)
     BpmnProcessInstanceLogVO getProcessInstanceLogs(@Validated @RequestBody BpmnProcessInstanceLogQueryDTO dto);
 
-    /**
-     * 查询死信消息数据
-     * @param procInstId 流程实例id
-     * @return
-     */
-    @GetMapping("/dead-letter/exception/stacktrace")
-    String getDeadLetterJobExceptionStacktrace(@RequestParam String procInstId);
-
-    /**
-     * 查询死信消息数据
-     * @param jobId 死信job的id
-     * @return
-     */
-    @GetMapping("/dead-letter/exception/stacktrace/byId")
-    String getDeadLetterJobExceptionStacktraceByJobId(@RequestParam String jobId);
-
     /**
      * 同意
      *
diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java
index f06c18b58..b076bd213 100644
--- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java
+++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java
@@ -357,6 +357,24 @@ public interface WorkflowManageService {
     @Manageable
     Void executeDeadLetterJobAction(@RequestParam(required = false) String jobId, @RequestParam(required = false) String procInstId);
 
+    /**
+     * 查询死信消息数据
+     * @param procInstId 流程实例id
+     * @return
+     */
+    @GetMapping("/dead-letter/exception/stacktrace")
+    @Manageable
+    String getDeadLetterJobExceptionStacktrace(@RequestParam String procInstId);
+
+    /**
+     * 查询死信消息数据
+     * @param jobId 死信job的id
+     * @return
+     */
+    @GetMapping("/dead-letter/exception/stacktrace/byId")
+    @Manageable
+    String getDeadLetterJobExceptionStacktraceByJobId(@RequestParam String jobId);
+
     /**
      * 获取指定业务分类
      *