wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-2924) - Starter 适配无需使用 MQ 的情况

Browse Source
This commit is contained in:
wangli 2024-09-14 13:06:03 +08:00
parent 4ab77e7a4f
commit 9606589bab
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java
View File

@ -48,7 +48,7 @@ import static org.apache.rocketmq.spring.autoconfigure.RocketMQAutoConfiguration
* @since 2024/6/5 17:39 * @since 2024/6/5 17:39
*/ */
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnBean(name = ROCKETMQ_TEMPLATE_DEFAULT_GLOBAL_NAME) @ConditionalOnProperty(name = "rocketmq.name-server")
public class StarterBroadcastMQConfiguration { public class StarterBroadcastMQConfiguration {
private final Logger log = LoggerFactory.getLogger(StarterBroadcastMQConfiguration.class); private final Logger log = LoggerFactory.getLogger(StarterBroadcastMQConfiguration.class);
public static final String BROADCAST_EVENT_HANDLER_REPOSITORY_BEAN_NAME = "broadcastEventHandlerRepository"; public static final String BROADCAST_EVENT_HANDLER_REPOSITORY_BEAN_NAME = "broadcastEventHandlerRepository";
@ -87,7 +87,7 @@ public class StarterBroadcastMQConfiguration {
} }
@Component @Component
@ConditionalOnBean(RocketMQTemplate.class) @ConditionalOnProperty(name = "rocketmq.name-server")
@Conditional(NonContainerEnvironmentCondition.class) @Conditional(NonContainerEnvironmentCondition.class)
@RocketMQMessageListener(topic = DEFAULT_EVENT + "${spring.profiles.active}", @RocketMQMessageListener(topic = DEFAULT_EVENT + "${spring.profiles.active}",
consumerGroup = "GID_${spring.application.name}_workflow_engine_${GID_SEGMENT}_consumer", consumerGroup = "GID_${spring.application.name}_workflow_engine_${GID_SEGMENT}_consumer",

4
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterRPCInvokeMQConfiguration.java
View File

@ -52,7 +52,7 @@ import static org.apache.rocketmq.spring.autoconfigure.RocketMQAutoConfiguration
* @since 2024/5/30 14:05 * @since 2024/5/30 14:05
*/ */
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnBean(name = ROCKETMQ_TEMPLATE_DEFAULT_GLOBAL_NAME) @ConditionalOnProperty(name = "rocketmq.name-server")
public class StarterRPCInvokeMQConfiguration { public class StarterRPCInvokeMQConfiguration {
private final Logger log = LoggerFactory.getLogger(StarterRPCInvokeMQConfiguration.class); private final Logger log = LoggerFactory.getLogger(StarterRPCInvokeMQConfiguration.class);
public static final String WORKFLOW_ENGINE_STARTER_EVENT_PRODUCER_BEAN_NAME = "workflowEngineStarterEventProducer"; public static final String WORKFLOW_ENGINE_STARTER_EVENT_PRODUCER_BEAN_NAME = "workflowEngineStarterEventProducer";
@ -165,7 +165,7 @@ public class StarterRPCInvokeMQConfiguration {
} }
@Component @Component
@ConditionalOnBean(RocketMQTemplate.class) @ConditionalOnProperty(name = "rocketmq.name-server")
@Conditional(NonContainerEnvironmentCondition.class) @Conditional(NonContainerEnvironmentCondition.class)
@RocketMQMessageListener(topic = DEFAULT_EVENT + "${spring.profiles.active}", @RocketMQMessageListener(topic = DEFAULT_EVENT + "${spring.profiles.active}",
consumerGroup = "GID_${spring.application.name}_workflow_engine_starter_${GID_SEGMENT}_consumer", consumerGroup = "GID_${spring.application.name}_workflow_engine_starter_${GID_SEGMENT}_consumer",

16
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java
View File

@ -198,22 +198,6 @@ public interface WorkflowCoreService {
@InvokeMode(SYNC) @InvokeMode(SYNC)
BpmnProcessInstanceLogVO getProcessInstanceLogs(@Validated @RequestBody BpmnProcessInstanceLogQueryDTO dto); 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);
/** /**
* 同意 * 同意
* *

18
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java
View File

@ -357,6 +357,24 @@ public interface WorkflowManageService {
@Manageable @Manageable
Void executeDeadLetterJobAction(@RequestParam(required = false) String jobId, @RequestParam(required = false) String procInstId); 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);
/** /**
* 获取指定业务分类 * 获取指定业务分类
* *