From e4a778413ce67be7a9b442d3894c38d69428284d Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Mon, 13 Dec 2021 19:22:15 +0800 Subject: [PATCH] add the workflow sharing component to the admin module script --- .../LINGYUN.Abp.EventBus.CAP.xml | 105 +++--------------- .../WorkflowRegistryManager.cs | 2 +- .../WorkflowEngineManager.cs | 5 - .../WorkflowManagementHttpApiHostModule.cs | 2 +- build/modules.dependencies.json | 4 +- 5 files changed, 19 insertions(+), 99 deletions(-) diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml index 0f822f075..5c139a103 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml +++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml @@ -4,39 +4,39 @@ LINGYUN.Abp.EventBus.CAP - + 消费者查找器 - + CAP配置 - + Abp分布式事件配置 - + 服务提供者 - + Creates a new . - + 查找消费者集合 - + 获取事件处理器集合 @@ -44,71 +44,6 @@ - - - 过期消息清理任务 - - - - - 过期消息清理配置 - - - - - Initializer - - - - - Storage - - - - - 创建过期消息清理任务 - - - - - - - - - - 异步执行任务 - - - - - - - CapProcessingServer - - - - - CapProcessingServer - - - - - - - - Start - - - - - Pulse - - - - - Dispose - - AbpCAPEventBusModule @@ -120,12 +55,6 @@ - - - OnApplicationInitialization - - - 过期消息清理配置项 @@ -137,18 +66,6 @@ default: false - - - 批量清理数量 - default: 1000 - - - - - 执行间隔(ms) - default: 3600000 (1 hours) - - AbpECAPExecutionFailedException @@ -282,12 +199,17 @@ 当前客户端 + + + typeof + + 取消令牌 - + constructor @@ -297,6 +219,7 @@ + diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowRegistryManager.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowRegistryManager.cs index 6e0c0ffc8..c49cc0b6c 100644 --- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowRegistryManager.cs +++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowRegistryManager.cs @@ -36,7 +36,7 @@ namespace LINGYUN.Abp.WorkflowManagement if (!_workflowManager.IsRegistered(workflow)) { var stepNodes = await _stepNodeRepository - .GetAllChildrenWithWorkflowAsync(workflow.Id, cancellationToken: cancellationToken); + .GetAllChildrenWithWorkflowAsync(workflow.Id, cancellationToken: cancellationToken); var compensateNodes = await _compensateNodeRepository .GetAllChildrenWithWorkflowAsync(workflow.Id, cancellationToken: cancellationToken); diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowEngineManager.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowEngineManager.cs index 1d1962f44..d705f9c6f 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowEngineManager.cs +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowEngineManager.cs @@ -50,11 +50,6 @@ public class WorkflowEngineManager : IWorkflowEngineManager, ISingletonDependenc _logger.LogInformation("Migrated workflow management context."); } - public async Task RegisterAsync(CancellationToken cancellationToken = default) - { - - } - public async Task StartAsync(CancellationToken cancellationToken = default) { await _workflowHost.StartAsync(cancellationToken); diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs index 044149d28..e6ea7e58b 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs @@ -93,7 +93,7 @@ namespace LY.MicroService.WorkflowManagement ConfigureSecurity(context.Services, configuration, hostingEnvironment.IsDevelopment()); // 开发取消权限检查 - // context.Services.AddAlwaysAllowAuthorization(); + context.Services.AddAlwaysAllowAuthorization(); } public override void OnApplicationInitialization(ApplicationInitializationContext context) diff --git a/build/modules.dependencies.json b/build/modules.dependencies.json index e885418b3..2c9b4e490 100644 --- a/build/modules.dependencies.json +++ b/build/modules.dependencies.json @@ -55,7 +55,9 @@ "depPath": "/../aspnet-core/LocalNuget/netstandard2.0/", "dependencies": [ "LINGYUN.Abp.Features.LimitValidation.dll", - "LINGYUN.Abp.Features.LimitValidation.Redis.dll" + "LINGYUN.Abp.Features.LimitValidation.Redis.dll", + "LINGYUN.Abp.WorkflowManagement.Application.Contracts.dll", + "LINGYUN.Abp.WorkflowManagement.Domain.Shared.dll" ] } ]