Merge branch 'master' into permission-revision

framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs

@@ -8,6 +8,16 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionCommonExtensions
     {
+        public static bool IsAdded<T>(this IServiceCollection services)
+        {
+            return services.IsAdded(typeof(T));
+        }
+
+        public static bool IsAdded(this IServiceCollection services, Type type)
+        {
+            return services.Any(d => d.ServiceType == type);
+        }
+
         public static T GetSingletonInstanceOrNull<T>(this IServiceCollection services)
         {
             return (T)services

framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/AbpRabbitMqModule.cs

@@ -11,6 +11,12 @@ namespace Volo.Abp.RabbitMQ
         )]
     public class AbpRabbitMqModule : AbpModule
     {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            var configuration = context.Services.GetConfiguration();
+            Configure<AbpRabbitMqOptions>(configuration.GetSection("RabbitMQ"));
+        }
+
         public override void OnApplicationShutdown(ApplicationShutdownContext context)
         {
             context.ServiceProvider

framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/AbpRabbitMqOptions.cs

@@ -2,11 +2,11 @@
 {
     public class AbpRabbitMqOptions
     {
-        public RabbitMqConnections ConnectionFactories { get; }
+        public RabbitMqConnections Connections { get; }
 
         public AbpRabbitMqOptions()
         {
-            ConnectionFactories = new RabbitMqConnections();
+            Connections = new RabbitMqConnections();
         }
     }
 }

framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ConnectionPool.cs

@@ -28,7 +28,7 @@ namespace Volo.Abp.RabbitMQ
             return Connections.GetOrAdd(
                 connectionName,
                 () => Options
-                    .ConnectionFactories
+                    .Connections
                     .GetOrDefault(connectionName)
                     .CreateConnection()
             );