Merge remote-tracking branch 'origin/feature/mongo-index-cleanup' into feature/mongo-index-cleanup

Author: otemnov

build/version.props

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>8</VersionMajor>
 		<VersionMinor>4</VersionMinor>
-		<VersionPatch>0</VersionPatch>
+		<VersionPatch>1</VersionPatch>
 		<VersionQuality></VersionQuality>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>

src/DotNetCore.CAP.PostgreSql/IDataStorage.PostgreSql.cs

@@ -234,7 +234,7 @@ public async Task<IEnumerable<MediumMessage>> GetReceivedMessagesOfNeedRetry(Tim
 
     public async Task<int> DeleteReceivedMessageAsync(long id)
     {
-        var sql = $@"DELETE FROM {_recName} WHERE ""Id""={id} FOR DELETE SKIP LOCKED";
+        var sql = $@"DELETE FROM {_recName} WHERE ""Id""={id}";
 
         var connection = _options.Value.CreateConnection();
         await using var _ = connection.ConfigureAwait(false);
@@ -244,7 +244,7 @@ public async Task<int> DeleteReceivedMessageAsync(long id)
 
     public async Task<int> DeletePublishedMessageAsync(long id)
     {
-        var sql = $@"DELETE FROM {_pubName} WHERE ""Id""={id} FOR DELETE SKIP LOCKED";
+        var sql = $@"DELETE FROM {_pubName} WHERE ""Id""={id}";
 
         var connection = _options.Value.CreateConnection();
         await using var _ = connection.ConfigureAwait(false);

src/DotNetCore.CAP.RabbitMQ/IConnectionChannelPool.Default.cs

@@ -109,8 +109,12 @@ private static Func<Task<IConnection>> CreateConnection(RabbitMQOptions options)
         if (options.HostName.Contains(","))
         {
             options.ConnectionFactoryOptions?.Invoke(factory);
-
-            return () => factory.CreateConnectionAsync(AmqpTcpEndpoint.ParseMultiple(options.HostName));
+            var endpoints = AmqpTcpEndpoint.ParseMultiple(options.HostName);
+            foreach (var endpoint in endpoints)
+            {
+                endpoint.Ssl = factory.Ssl;
+            }
+            return () => factory.CreateConnectionAsync(endpoints);
         }
 
         factory.HostName = options.HostName;
@@ -161,4 +165,4 @@ public virtual bool Return(IChannel channel)
 
         return false;
     }
-}
+}

src/DotNetCore.CAP.RabbitMQ/ITransport.RabbitMQ.cs

@@ -36,6 +36,7 @@ public async Task<OperateResult> SendAsync(TransportMessage message)
 
             var props = new BasicProperties
             {
+                MessageId = message.GetId(),
                 DeliveryMode = DeliveryModes.Persistent,
                 Headers = message.Headers.ToDictionary(x => x.Key, object? (x) => x.Value)
             };