diff --git a/aspnet-core/LINGYUN.MicroService.Aspire.slnx b/aspnet-core/LINGYUN.MicroService.Aspire.slnx index b0b61f0cf..122c96e61 100644 --- a/aspnet-core/LINGYUN.MicroService.Aspire.slnx +++ b/aspnet-core/LINGYUN.MicroService.Aspire.slnx @@ -555,6 +555,9 @@ + + + @@ -562,7 +565,9 @@ - + + + diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/LINGYUN.Abp.MicroService.WorkflowService.csproj b/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/LINGYUN.Abp.MicroService.WorkflowService.csproj index 73a27bf88..cf1c97bab 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/LINGYUN.Abp.MicroService.WorkflowService.csproj +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/LINGYUN.Abp.MicroService.WorkflowService.csproj @@ -47,6 +47,7 @@ + @@ -71,6 +72,7 @@ + @@ -84,12 +86,18 @@ + + + + + + diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/WorkflowServiceModule.Configure.cs b/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/WorkflowServiceModule.Configure.cs index 02e526715..d2cd66737 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/WorkflowServiceModule.Configure.cs +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/WorkflowServiceModule.Configure.cs @@ -15,6 +15,7 @@ using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.LocalizationManagement; using LINGYUN.Abp.MicroService.WorkflowService.Extensions; using LINGYUN.Abp.MicroService.WorkflowService.Navigation; +using LINGYUN.Abp.Notifications; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using Localization.Resources.AbpUi; using Medallion.Threading; @@ -22,6 +23,7 @@ using Medallion.Threading.Redis; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -332,6 +334,15 @@ public partial class WorkflowServiceModule }); } + private void ConfigureNotificationsManagement() + { + Configure(options => + { + options.IsDynamicNotificationsStoreEnabled = true; + options.SaveStaticNotificationsToDatabase = false; + }); + } + private void ConfigurePermissionManagement() { Configure(options => diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/WorkflowServiceModule.cs b/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/WorkflowServiceModule.cs index 87063ec32..708f3824e 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/WorkflowServiceModule.cs +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/WorkflowServiceModule.cs @@ -7,12 +7,18 @@ using LINGYUN.Abp.Claims.Mapping; using LINGYUN.Abp.Data.DbMigrator; using LINGYUN.Abp.Dynamic.Definitions; using LINGYUN.Abp.ElsaNext.Agents.Blazor; +using LINGYUN.Abp.ElsaNext.BlobStoring; +using LINGYUN.Abp.ElsaNext.Email; +using LINGYUN.Abp.ElsaNext.Notifications; using LINGYUN.Abp.ElsaNext.Secrets.Blazor; using LINGYUN.Abp.ElsaNext.Server; using LINGYUN.Abp.ElsaNext.Studio.Blazor; using LINGYUN.Abp.ElsaNext.Studio.Dashboard.Blazor; using LINGYUN.Abp.ElsaNext.Studio.Diagnostics.OpenTelemetry.Blazor; using LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor; +using LINGYUN.Abp.ElsaNext.Studio.Identity.Blazor; +using LINGYUN.Abp.ElsaNext.Studio.Notifications.Blazor; +using LINGYUN.Abp.ElsaNext.Studio.Saas.Blazor; using LINGYUN.Abp.Emailing.Platform; using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling.Emailing; @@ -20,6 +26,7 @@ using LINGYUN.Abp.Http.Client.Wrapper; using LINGYUN.Abp.Identity.Session.AspNetCore; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore; +using LINGYUN.Abp.Notifications.EntityFrameworkCore; using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; @@ -38,6 +45,7 @@ using Volo.Abp.Autofac; using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Http.Client.IdentityModel.Web; +using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; @@ -52,6 +60,9 @@ namespace LINGYUN.Abp.MicroService.WorkflowService; typeof(AbpAuditLoggingElasticsearchModule), typeof(AbpAspNetCoreSerilogModule), typeof(AbpBlobStoringBlobManagementModule), + typeof(AbpElsaNextBlobStoringModule), + typeof(AbpElsaNextEmailModule), + typeof(AbpElsaNextNotificationsModule), typeof(AbpElsaNextServerModule), typeof(AbpElsaNextStudioBlazorModule), typeof(AbpElsaNextAgentsBlazorModule), @@ -59,6 +70,9 @@ namespace LINGYUN.Abp.MicroService.WorkflowService; typeof(AbpElsaNextStudioDashboardBlazorModule), typeof(AbpElsaNextStudioDiagnosticsOpenTelemetryBlazorModule), typeof(AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule), + typeof(AbpElsaNextStudioIdentityBlazorModule), + typeof(AbpElsaNextStudioNotificationsBlazorModule), + typeof(AbpElsaNextStudioSaasBlazorModule), typeof(AbpEmailingExceptionHandlingModule), typeof(AbpHttpClientIdentityModelWebModule), typeof(AbpAspNetCoreMultiTenancyModule), @@ -70,7 +84,9 @@ namespace LINGYUN.Abp.MicroService.WorkflowService; typeof(AbpPermissionManagementEntityFrameworkCoreModule), typeof(AbpSettingManagementEntityFrameworkCoreModule), typeof(AbpSaasEntityFrameworkCoreModule), + typeof(AbpIdentityEntityFrameworkCoreModule), typeof(AbpLocalizationManagementEntityFrameworkCoreModule), + typeof(AbpNotificationsEntityFrameworkCoreModule), typeof(AbpAuthorizationOrganizationUnitsModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule), typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule), @@ -117,6 +133,7 @@ public partial class WorkflowServiceModule : AbpModule ConfigureDbContext(); ConfigureLocalization(); ConfigureVirtualFileSystem(); + ConfigureNotificationsManagement(); ConfigurePermissionManagement(); ConfigureTiming(configuration); ConfigureCaching(configuration);