Merge branch 'abpframework:dev' into dev

framework/src/Volo.Abp.EventBus.Azure/Volo/Abp/EventBus/Azure/AzureDistributedEventBus.cs

@@ -108,9 +108,17 @@ public class AzureDistributedEventBus : DistributedEventBusBase, ISingletonDepen
 
         foreach (var outgoingEvent in outgoingEventArray)
         {
-            if (!messageBatch.TryAddMessage(new ServiceBusMessage(outgoingEvent.EventData) { Subject = outgoingEvent.EventName }))
+            var message = new ServiceBusMessage(outgoingEvent.EventData) { Subject = outgoingEvent.EventName };
+
+            if (message.MessageId.IsNullOrWhiteSpace())
+            {
+                message.MessageId = outgoingEvent.Id.ToString();
+            }
+
+            if (!messageBatch.TryAddMessage(message))
             {
-                throw new AbpException("The message is too large to fit in the batch. Set AbpEventBusBoxesOptions.OutboxWaitingEventMaxCount to reduce the number");
+                throw new AbpException(
+                    "The message is too large to fit in the batch. Set AbpEventBusBoxesOptions.OutboxWaitingEventMaxCount to reduce the number");
             }
         }