Resolved #4411, Resolved #4410

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AbpDistributedEntityEventOptions.cs

@@ -0,0 +1,15 @@
+namespace Volo.Abp.Domain.Entities.Events.Distributed
+{
+    public class AbpDistributedEntityEventOptions
+    {
+        public IAutoEntityDistributedEventSelectorList AutoEventSelectors { get; }
+        
+        public EtoMappingDictionary EtoMappings { get; set; }
+
+        public AbpDistributedEntityEventOptions()
+        {
+            AutoEventSelectors = new AutoEntityDistributedEventSelectorList();
+            EtoMappings = new EtoMappingDictionary();
+        }
+    }
+}

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorList.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Domain.Entities.Events.Distributed
+{
+    public class AutoEntityDistributedEventSelectorList : List<NamedTypeSelector>, IAutoEntityDistributedEventSelectorList
+    {
+        public bool RemoveByName(string name)
+        {
+            return RemoveAll(s => s.Name == name) > 0;
+        }
+    }
+}

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Linq;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Domain.Entities.Events.Distributed
+{
+    public static class AutoEntityDistributedEventSelectorListExtensions
+    {
+        public const string AllEntitiesSelectorName = "All";
+
+        public static void AddNamespace([NotNull] this IAutoEntityDistributedEventSelectorList selectors, [NotNull] string namespaceName)
+        {
+            Check.NotNull(selectors, nameof(selectors));
+
+            var selectorName = "Namespace:" + namespaceName;
+            if (selectors.Any(s => s.Name == selectorName))
+            {
+                return;
+            }
+
+            selectors.Add(
+                new NamedTypeSelector(
+                    selectorName,
+                    t => t.FullName?.StartsWith(namespaceName) ?? false
+                )
+            );
+        }
+        
+        /// <summary>
+        /// Adds a specific entity type and the types derived from that entity type.
+        /// </summary>
+        /// <typeparam name="TEntity">Type of the entity</typeparam>
+        public static void Add<TEntity>([NotNull] this IAutoEntityDistributedEventSelectorList selectors)
+            where TEntity : IEntity
+        {
+            Check.NotNull(selectors, nameof(selectors));
+
+            var selectorName = "Entity:" + typeof(TEntity).FullName;
+            if (selectors.Any(s => s.Name == selectorName))
+            {
+                return;
+            }
+
+            selectors.Add(
+                new NamedTypeSelector(
+                    selectorName,
+                    t => typeof(TEntity).IsAssignableFrom(t)
+                )
+            );
+        }
+        
+        /// <summary>
+        /// Adds all entity types.
+        /// </summary>
+        public static void AddAll([NotNull] this IAutoEntityDistributedEventSelectorList selectors)
+        {
+            Check.NotNull(selectors, nameof(selectors));
+            
+            if (selectors.Any(s => s.Name == AllEntitiesSelectorName))
+            {
+                return;
+            }
+
+            selectors.Add(
+                new NamedTypeSelector(
+                    AllEntitiesSelectorName,
+                    t => typeof(IEntity).IsAssignableFrom(t)
+                )
+            );
+        }
+
+        public static bool IsMatch([NotNull] this IAutoEntityDistributedEventSelectorList selectors, Type entityType)
+        {
+            Check.NotNull(selectors, nameof(selectors));
+            return selectors.Any(s => s.Predicate(entityType));
+        }
+    }
+}

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.DynamicProxy;
-using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.ObjectMapping;
 
 namespace Volo.Abp.Domain.Entities.Events.Distributed
@@ -11,10 +10,11 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed
     public class EntityToEtoMapper : IEntityToEtoMapper, ITransientDependency
     {
         protected IHybridServiceScopeFactory HybridServiceScopeFactory { get; }
-        protected AbpDistributedEventBusOptions Options { get; }
+        
+        protected AbpDistributedEntityEventOptions Options { get; }
 
         public EntityToEtoMapper(
-            IOptions<AbpDistributedEventBusOptions> options,
+            IOptions<AbpDistributedEntityEventOptions> options,
             IHybridServiceScopeFactory hybridServiceScopeFactory)
         {
             HybridServiceScopeFactory = hybridServiceScopeFactory;

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/EtoMappingDictionary.cs → framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionary.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
+using Volo.Abp.EventBus.Distributed;
 
-namespace Volo.Abp.EventBus.Distributed
+namespace Volo.Abp.Domain.Entities.Events.Distributed
 {
     public class EtoMappingDictionary : Dictionary<Type, EtoMappingDictionaryItem>
     {

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/EtoMappingDictionaryItem.cs → framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionaryItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.Abp.EventBus.Distributed
+namespace Volo.Abp.Domain.Entities.Events.Distributed
 {
     public class EtoMappingDictionaryItem
     {

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IAutoEntityDistributedEventSelectorList.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Domain.Entities.Events.Distributed
+{
+    public interface IAutoEntityDistributedEventSelectorList : IList<NamedTypeSelector>
+    {
+        bool RemoveByName(string name);
+    }
+}

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
 using Volo.Abp.Auditing;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities.Events.Distributed;
@@ -22,13 +23,16 @@ namespace Volo.Abp.Domain.Entities.Events
 
         protected IUnitOfWorkManager UnitOfWorkManager { get; }
         protected IEntityToEtoMapper EntityToEtoMapper { get; }
+        protected AbpDistributedEntityEventOptions DistributedEntityEventOptions { get; }
 
         public EntityChangeEventHelper(
             IUnitOfWorkManager unitOfWorkManager,
-            IEntityToEtoMapper entityToEtoMapper)
+            IEntityToEtoMapper entityToEtoMapper,
+            IOptions<AbpDistributedEntityEventOptions> distributedEntityEventOptions)
         {
             UnitOfWorkManager = unitOfWorkManager;
             EntityToEtoMapper = entityToEtoMapper;
+            DistributedEntityEventOptions = distributedEntityEventOptions.Value;
 
             LocalEventBus = NullLocalEventBus.Instance;
             DistributedEventBus = NullDistributedEventBus.Instance;
@@ -65,18 +69,32 @@ namespace Volo.Abp.Domain.Entities.Events
                 false
             );
 
-            var eto = EntityToEtoMapper.Map(entity);
+            if (ShouldPublishDistributedEventForEntity(entity))
-            if (eto != null)
             {
-                await TriggerEventWithEntity(
+                var eto = EntityToEtoMapper.Map(entity);
-                    DistributedEventBus,
+                if (eto != null)
-                    typeof(EntityCreatedEto<>),
+                {
-                    eto,
+                    await TriggerEventWithEntity(
-                    false
+                        DistributedEventBus,
-                );
+                        typeof(EntityCreatedEto<>),
+                        eto,
+                        false
+                    );
+                }
             }
         }
 
+        private bool ShouldPublishDistributedEventForEntity(object entity)
+        {
+            return DistributedEntityEventOptions
+                .AutoEventSelectors
+                .IsMatch(
+                    ProxyHelper
+                        .UnProxy(entity)
+                        .GetType()
+                );
+        }
+
         public virtual async Task TriggerEntityUpdatingEventAsync(object entity)
         {
             await TriggerEventWithEntity(
@@ -96,15 +114,18 @@ namespace Volo.Abp.Domain.Entities.Events
                 false
             );
 
-            var eto = EntityToEtoMapper.Map(entity);
+            if (ShouldPublishDistributedEventForEntity(entity))
-            if (eto != null)
             {
-                await TriggerEventWithEntity(
+                var eto = EntityToEtoMapper.Map(entity);
-                    DistributedEventBus,
+                if (eto != null)
-                    typeof(EntityUpdatedEto<>),
+                {
-                    eto,
+                    await TriggerEventWithEntity(
-                    false
+                        DistributedEventBus,
-                );
+                        typeof(EntityUpdatedEto<>),
+                        eto,
+                        false
+                    );
+                }
             }
         }
 
@@ -127,15 +148,18 @@ namespace Volo.Abp.Domain.Entities.Events
                 false
             );
 
-            var eto = EntityToEtoMapper.Map(entity);
+            if (ShouldPublishDistributedEventForEntity(entity))
-            if (eto != null)
             {
-                await TriggerEventWithEntity(
+                var eto = EntityToEtoMapper.Map(entity);
-                    DistributedEventBus,
+                if (eto != null)
-                    typeof(EntityDeletedEto<>),
+                {
-                    eto,
+                    await TriggerEventWithEntity(
-                    false
+                        DistributedEventBus,
-                );
+                        typeof(EntityDeletedEto<>),
+                        eto,
+                        false
+                    );
+                }
             }
         }
 

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusOptions.cs

@@ -5,12 +5,10 @@ namespace Volo.Abp.EventBus.Distributed
     public class AbpDistributedEventBusOptions
     {
         public ITypeList<IEventHandler> Handlers { get; }
-        public EtoMappingDictionary EtoMappings { get; set; }
 
         public AbpDistributedEventBusOptions()
         {
             Handlers = new TypeList<IEventHandler>();
-            EtoMappings = new EtoMappingDictionary();
         }
     }
 }

framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs

@@ -4,7 +4,7 @@ using Volo.Abp.Autofac;
 using Volo.Abp.Modularity;
 using Volo.Abp.TestApp.Domain;
 using Volo.Abp.AutoMapper;
-using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.TestApp.Application.Dto;
 using Volo.Abp.Threading;
 
@@ -45,8 +45,9 @@ namespace Volo.Abp.TestApp
 
         private void ConfigureDistributedEventBus()
         {
-           Configure<AbpDistributedEventBusOptions>(options =>
+           Configure<AbpDistributedEntityEventOptions>(options =>
            {
+               options.AutoEventSelectors.Add<Person>();
                options.EtoMappings.Add<Person, PersonEto>();
            });
         }

modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Domain;
-using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.Modularity;
 using Volo.Blogging.Blogs;
 using Volo.Blogging.Comments;
@@ -25,7 +25,7 @@ namespace Volo.Blogging
                 options.AddProfile<BloggingDomainMappingProfile>(validate: true);
             });
 
-            Configure<AbpDistributedEventBusOptions>(options =>
+            Configure<AbpDistributedEntityEventOptions>(options =>
             {
                 options.EtoMappings.Add<Blog, BlogEto>(typeof(BloggingDomainModule));
                 options.EtoMappings.Add<Comment, CommentEto>(typeof(BloggingDomainModule));

modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs

@@ -4,7 +4,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Domain;
-using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.Threading;
@@ -34,7 +34,7 @@ namespace Volo.Docs
                 options.AddProfile<DocsDomainMappingProfile>(validate: true);
             });
 
-            Configure<AbpDistributedEventBusOptions>(options =>
+            Configure<AbpDistributedEntityEventOptions>(options =>
             {
                 options.EtoMappings.Add<Document, DocumentEto>(typeof(DocsDomainModule));
                 options.EtoMappings.Add<Project, ProjectEto>(typeof(DocsDomainModule));

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs

@@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Domain;
-using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.ObjectExtending.Modularity;
@@ -29,7 +29,7 @@ namespace Volo.Abp.Identity
                 options.AddProfile<IdentityDomainMappingProfile>(validate: true);
             });
 
-            Configure<AbpDistributedEventBusOptions>(options =>
+            Configure<AbpDistributedEntityEventOptions>(options =>
             {
                 options.EtoMappings.Add<IdentityUser, UserEto>(typeof(AbpIdentityDomainModule));
                 options.EtoMappings.Add<IdentityClaimType, IdentityClaimTypeEto>(typeof(AbpIdentityDomainModule));

modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/AbpIdentityDomainTestModule.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.Identity.EntityFrameworkCore;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.Identity;
@@ -14,6 +15,14 @@ namespace Volo.Abp.Identity
         )]
     public class AbpIdentityDomainTestModule : AbpModule
     {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpDistributedEntityEventOptions>(options =>
+            {
+                options.AutoEventSelectors.Add<IdentityUser>();
+            });
+        }
+
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             SeedTestData(context);

modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/Distributed_User_Change_Event_Tests.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 using Shouldly;
+using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.Testing.Utils;
 using Volo.Abp.Uow;
@@ -28,11 +29,17 @@ namespace Volo.Abp.Identity
         }
 
         [Fact]
-        public async Task Should_Register_Handler()
+        public void Should_Register_Handler()
         {
-            var options = GetRequiredService<IOptions<AbpDistributedEventBusOptions>>().Value;
+            GetRequiredService<IOptions<AbpDistributedEntityEventOptions>>()
-            options.EtoMappings.ShouldContain(m => m.Key == typeof(IdentityUser) && m.Value.EtoType == typeof(UserEto));
+                .Value
-            options.Handlers.ShouldContain(h => h == typeof(DistributedUserUpdateHandler));
+                .EtoMappings
+                .ShouldContain(m => m.Key == typeof(IdentityUser) && m.Value.EtoType == typeof(UserEto));
+            
+            GetRequiredService<IOptions<AbpDistributedEventBusOptions>>()
+                .Value
+                .Handlers
+                .ShouldContain(h => h == typeof(DistributedUserUpdateHandler));
         }
 
         [Fact]

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs

@@ -6,7 +6,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.BackgroundWorkers;
 using Volo.Abp.Caching;
-using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.Identity;
 using Volo.Abp.IdentityServer.ApiResources;
 using Volo.Abp.IdentityServer.Clients;
@@ -41,7 +41,7 @@ namespace Volo.Abp.IdentityServer
                 options.AddProfile<IdentityServerAutoMapperProfile>(validate: true);
             });
 
-            Configure<AbpDistributedEventBusOptions>(options =>
+            Configure<AbpDistributedEntityEventOptions>(options =>
             {
                 options.EtoMappings.Add<ApiResource, ApiResourceEto>(typeof(AbpIdentityServerDomainModule));
                 options.EtoMappings.Add<Client, ClientEto>(typeof(AbpIdentityServerDomainModule));

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainModule.cs

@@ -2,7 +2,7 @@
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Data;
 using Volo.Abp.Domain;
-using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.UI;
@@ -26,7 +26,7 @@ namespace Volo.Abp.TenantManagement
                 options.AddProfile<AbpTenantManagementDomainMappingProfile>(validate: true);
             });
 
-            Configure<AbpDistributedEventBusOptions>(options =>
+            Configure<AbpDistributedEntityEventOptions>(options =>
             {
                 options.EtoMappings.Add<Tenant, TenantEto>();
             });

samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs

@@ -8,7 +8,6 @@ using ProductManagement;
 using StackExchange.Redis;
 using Microsoft.OpenApi.Models;
 using MsDemo.Shared;
-using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Authentication.OAuth;
 using Volo.Abp.AspNetCore.Mvc.Client;

samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs

@@ -13,6 +13,7 @@ using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.Auditing;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Autofac;
+using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.SqlServer;
 using Volo.Abp.EventBus.RabbitMq;
@@ -77,6 +78,11 @@ namespace IdentityService.Host
             {
                 options.UseSqlServer();
             });
+            
+            Configure<AbpDistributedEntityEventOptions>(options =>
+            {
+                options.AutoEventSelectors.Add<IdentityUser>();
+            });
 
             context.Services.AddStackExchangeRedisCache(options =>
             {