diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN.Abp.Elsa.Server.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN.Abp.Elsa.Server.csproj index a1a43babb..9498cf6c4 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN.Abp.Elsa.Server.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN.Abp.Elsa.Server.csproj @@ -10,7 +10,6 @@ - diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaAutoMapperProfile.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaAutoMapperProfile.cs deleted file mode 100644 index c3e985d3d..000000000 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaAutoMapperProfile.cs +++ /dev/null @@ -1,29 +0,0 @@ -using AutoMapper; -using Elsa.Models; -using Elsa.Server.Api.Endpoints.WorkflowDefinitions; -using Elsa.Server.Api.Endpoints.WorkflowInstances; -using Elsa.Server.Api.Endpoints.WorkflowRegistry; -using Elsa.Server.Api.Mapping; -using Elsa.Services.Models; -using Volo.Abp.AutoMapper; - -namespace LINGYUN.Abp.Elsa; -public class AbpElsaAutoMapperProfile : Profile -{ - public AbpElsaAutoMapperProfile() - { - CreateMap() - .ForMember(x => x.IsEnabled, y => y.MapFrom(map => !map.IsDisabled)) - .Ignore(x => x.InputProperties) - .Ignore(x => x.OutputProperties); - CreateMap(); - CreateMap().ConvertUsing(); - CreateMap() - .Ignore(x => x.InputProperties) - .Ignore(x => x.OutputProperties); - CreateMap().ConvertUsing(); - CreateMap(); - CreateMap(); - CreateMap(); - } -} diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaServerAutoMapperProfile.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaServerAutoMapperProfile.cs new file mode 100644 index 000000000..f4d30ab57 --- /dev/null +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaServerAutoMapperProfile.cs @@ -0,0 +1,9 @@ +using AutoMapper; + +namespace LINGYUN.Abp.Elsa; +public class AbpElsaServerAutoMapperProfile : Profile +{ + public AbpElsaServerAutoMapperProfile() + { + } +} diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaServerModule.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaServerModule.cs index 87cb9ab39..7041b4aef 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaServerModule.cs +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaServerModule.cs @@ -1,5 +1,4 @@ -using Elsa; -using Elsa.Server.Api; +using Elsa.Server.Api; using Elsa.Server.Api.Mapping; using Elsa.Server.Api.Services; using Microsoft.AspNetCore.Mvc; @@ -12,7 +11,6 @@ namespace LINGYUN.Abp.Elsa; [DependsOn( typeof(AbpElsaModule), - typeof(AbpAutoMapperModule), typeof(AbpAspNetCoreMvcModule))] public class AbpElsaServerModule : AbpModule { @@ -23,7 +21,6 @@ public class AbpElsaServerModule : AbpModule .AddSingleton() .AddScoped() .AddSingleton() - .AddAutoMapperProfile() .AddSignalR(); PreConfigure(mvcBuilder => @@ -50,11 +47,10 @@ public class AbpElsaServerModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - Configure(options => { - options.AddProfile(validate: true); + options.AddProfile(validate: false); + options.AddProfile(validate: false); }); } } diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN.Abp.Elsa.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN.Abp.Elsa.csproj index fcf7f9078..7b68e65a3 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN.Abp.Elsa.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN.Abp.Elsa.csproj @@ -10,6 +10,7 @@ + diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN/Abp/Elsa/AbpElsaAutoMapperProfile.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN/Abp/Elsa/AbpElsaAutoMapperProfile.cs new file mode 100644 index 000000000..d3b91c4dc --- /dev/null +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN/Abp/Elsa/AbpElsaAutoMapperProfile.cs @@ -0,0 +1,10 @@ +using AutoMapper; + +namespace LINGYUN.Abp.Elsa; +public class AbpElsaAutoMapperProfile : Profile +{ + public AbpElsaAutoMapperProfile() + { + + } +} diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN/Abp/Elsa/AbpElsaModule.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN/Abp/Elsa/AbpElsaModule.cs index eb880bee3..05912fcf6 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN/Abp/Elsa/AbpElsaModule.cs +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN/Abp/Elsa/AbpElsaModule.cs @@ -1,8 +1,10 @@ using Elsa; +using Elsa.Mapping; using Elsa.Services; using LINGYUN.Abp.Elsa.Localization; using LINGYUN.Abp.Elsa.Scripting.JavaScript; using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.AutoMapper; using Volo.Abp.Features; using Volo.Abp.Json; using Volo.Abp.Localization; @@ -13,6 +15,7 @@ using ElsaOptionsBuilder = Elsa.Options.ElsaOptionsBuilder; namespace LINGYUN.Abp.Elsa; [DependsOn( + typeof(AbpAutoMapperModule), typeof(AbpFeaturesModule), typeof(AbpThreadingModule), typeof(AbpJsonModule))] @@ -49,5 +52,14 @@ public class AbpElsaModule : AbpModule { options.Resources.Add(); }); + + Configure(options => + { + options.AddProfile(validate: false); + options.AddProfile(validate: false); + options.AddProfile(validate: false); + + options.AddProfile(validate: false); + }); } }