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

update(REQ-2516) - 合并 master 代码，并解决冲突

Browse Source
This commit is contained in:
wangli 2024-06-06 09:39:11 +08:00
parent 531e46095f
commit 16d20c948f
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessCategoryApi.java
View File

@ -1,7 +1,6 @@
package cn.axzo.workflow.client.feign.manage;
import cn.axzo.workflow.client.config.CommonFeignConfiguration;
import cn.axzo.workflow.generate.annotition.Management;
import cn.axzo.workflow.common.model.request.category.CategoryConfigCreateDTO;
import cn.axzo.workflow.common.model.request.category.CategoryConfigSearchDTO;
import cn.axzo.workflow.common.model.request.category.CategoryCreateDTO;
@ -10,6 +9,7 @@ import cn.axzo.workflow.common.model.request.category.CategoryUpdateDTO;
import cn.axzo.workflow.common.model.response.BpmPageResult;
import cn.axzo.workflow.common.model.response.category.CategoryConfigItemVO;
import cn.axzo.workflow.common.model.response.category.CategoryItemVO;
import cn.axzo.workflow.generate.annotition.Management;
import cn.azxo.framework.common.model.CommonResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
@ -34,7 +34,6 @@ import java.util.List;
@FeignClient(name = "workflow-engine", url = "${axzo.service.workflow-engine:http://workflow-engine:8080}", configuration = CommonFeignConfiguration.class)
@Management
@FeignClient(name = "workflow-engine", url = "${axzo.service.workflow-engine:http://workflow-engine:8080}")
public interface ProcessCategoryApi {
/**

4
workflow-engine-common/src/main/java/cn/axzo/workflow/common/constant/BpmnConstants.java
View File

@ -151,10 +151,6 @@ public interface BpmnConstants {
* 批量操作配置默认值
*/
Boolean SUPPORT_BATCH_OPERATION_DEFAULT_VALUE = false;
/**
* 用于 MQ 的 Header， 记录当前事件的归属应用
*/
String MQ_OWNERSHIP_APP = "MQ_OWNERSHIP_APPLICATION";
/**
* 用于 MQ 的 Header， 记录当前事件的归属应用
*/

5
workflow-engine-core/src/main/java/cn/axzo/workflow/core/mq/CustomRocketMQEventProducer.java
View File

@ -17,8 +17,6 @@ import java.util.List;
import java.util.Optional;
import java.util.function.BiConsumer;
import static cn.axzo.workflow.common.constant.BpmnConstants.MQ_OWNERSHIP_APP;
import static cn.axzo.workflow.common.constant.BpmnConstants.MQ_OWNERSHIP_APPLICATION;
/**
@ -71,9 +69,8 @@ public class CustomRocketMQEventProducer extends RocketMQEventProducer {
newHeaders.put(TraceUtils.CTX_LOG_ID, TraceUtils.getOrCreateTraceId());
newHeaders.put(TraceUtils.TRACE_ID_IN_MDC, TraceUtils.getOrCreateTraceId());
// FIXME
// newHeaders.put(MQ_OWNERSHIP_APP, applicationName);
// newHeaders.put(MQ_OWNERSHIP_APPLICATION, applicationName);
newHeaders.put(MQ_OWNERSHIP_APPLICATION, "senna");
newHeaders.put(MQ_OWNERSHIP_APP, applicationName);
final Context copiedContext = context.toBuilder().headers(newHeaders).build();
Runnable runnable = () -> {