From 1debba1829e270c6b426da27c15ad56c0a880e53 Mon Sep 17 00:00:00 2001
From: GameBelial <243387971@qq.com>
Date: Mon, 1 Mar 2021 22:32:37 +0800
Subject: [PATCH 1/3] Add support for RabbitMQ cluster.

---
 .../Volo/Abp/RabbitMQ/ConnectionPool.cs               | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ConnectionPool.cs b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ConnectionPool.cs
index 5856f7bb16..7ca8346d11 100644
--- a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ConnectionPool.cs
+++ b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ConnectionPool.cs
@@ -26,10 +26,13 @@ namespace Volo.Abp.RabbitMQ
 
             return Connections.GetOrAdd(
                 connectionName,
-                () => Options
-                    .Connections
-                    .GetOrDefault(connectionName)
-                    .CreateConnection()
+                () =>
+                {
+                    var connection = Options.Connections.GetOrDefault(connectionName);
+                    var hostnames = connection.HostName.TrimEnd(';').Split(';');
+                    // Handle Rabbit MQ Cluster.
+                    return hostnames.Length == 1 ? connection.CreateConnection() : connection.CreateConnection(hostnames);
+                }
             );
         }
 

From cf8986a13d4fcef4bd784c6754171c78ace6fac9 Mon Sep 17 00:00:00 2001
From: Zony <zony@myzony.com>
Date: Tue, 2 Mar 2021 21:21:32 +0800
Subject: [PATCH 2/3] Improve the RabbitMQ documentation.

---
 docs/en/Background-Jobs-RabbitMq.md           | 20 +++++++++++++++++
 ...tributed-Event-Bus-RabbitMQ-Integration.md | 22 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/docs/en/Background-Jobs-RabbitMq.md b/docs/en/Background-Jobs-RabbitMq.md
index 2ee478ed17..16b8b0981a 100644
--- a/docs/en/Background-Jobs-RabbitMq.md
+++ b/docs/en/Background-Jobs-RabbitMq.md
@@ -66,6 +66,26 @@ Defining multiple connections is allowed. In this case, you can use different co
 }
 ````
 
+If you need to connect to the RabbitMQ cluster, you can use the `;` character to separate the host names.
+
+**Example: Connect to the RabbitMQ cluster**
+
+```json
+{
+  "RabbitMQ": {
+    "Connections": {
+      "Default": {
+        "HostName": "123.123.123.123;234.234.234.234"
+      }
+    },
+    "EventBus": {
+      "ClientName": "MyClientName",
+      "ExchangeName": "MyExchangeName"
+    }
+  }
+}
+```
+
 #### AbpRabbitMqOptions
 
 `AbpRabbitMqOptions` class can be used to configure the connection strings for the RabbitMQ. You can configure this options inside the `ConfigureServices` of your [module](Module-Development-Basics.md).
diff --git a/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md b/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md
index 9587a111bf..3d99e1e3cf 100644
--- a/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md
+++ b/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md
@@ -90,7 +90,7 @@ You can use any of the [ConnectionFactry](http://rabbitmq.github.io/rabbitmq-dot
 
 **Example: Specify the connection port**
 
-````csharp
+````json
 {
   "RabbitMQ": {
     "Connections": {
@@ -103,6 +103,26 @@ You can use any of the [ConnectionFactry](http://rabbitmq.github.io/rabbitmq-dot
 }
 ````
 
+If you need to connect to the RabbitMQ cluster, you can use the `;` character to separate the host names.
+
+**Example: Connect to the RabbitMQ cluster**
+
+```json
+{
+  "RabbitMQ": {
+    "Connections": {
+      "Default": {
+        "HostName": "123.123.123.123;234.234.234.234"
+      }
+    },
+    "EventBus": {
+      "ClientName": "MyClientName",
+      "ExchangeName": "MyExchangeName"
+    }
+  }
+}
+```
+
 ### The Options Classes
 
 `AbpRabbitMqOptions` and `AbpRabbitMqEventBusOptions` classes can be used to configure the connection strings and event bus options for the RabbitMQ.

From 12da9394e6932c972d50c6693da4bdc523ca98df Mon Sep 17 00:00:00 2001
From: Zony <zony@myzony.com>
Date: Tue, 2 Mar 2021 22:47:03 +0800
Subject: [PATCH 3/3] Improve RabbitMQ Chinese documentation.

---
 ...tributed-Event-Bus-RabbitMQ-Integration.md | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md b/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md
index 2a1810e309..ab7cb68bd7 100644
--- a/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md
+++ b/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md
@@ -103,6 +103,26 @@
 }
 ````
 
+如果需要连接到 RabbitMQ 集群，你可以指定多个 HostName。
+
+**示例: 连接到 RabbitMQ 集群**
+
+```json
+{
+  "RabbitMQ": {
+    "Connections": {
+      "Default": {
+        "HostName": "123.123.123.123;234.234.234.234"
+      }
+    },
+    "EventBus": {
+      "ClientName": "MyClientName",
+      "ExchangeName": "MyExchangeName"
+    }
+  }
+}
+```
+
 ### 选项类
 
 `AbpRabbitMqOptions` 和 `AbpRabbitMqEventBusOptions` 类用于配置RabbitMQ的连接字符串和事件总线选项.