From 24859d393b34e0d021585f856313be9c7318018f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E9=BE=99=20=E7=8E=8B?= <w15604079545@outlook.com>
Date: Wed, 20 Nov 2024 11:22:16 +0800
Subject: [PATCH] =?UTF-8?q?upgrade-package:=20=E5=8D=87=E7=BA=A7RabbitMq?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=8C=852.0.9=3D>2.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

update:调整AddRabbitBoot中的初始化相关配置
---
 .../Rabbit/TrackPushCompletedEventHandler.cs      |  7 +++++--
 .../Rabbit/TrackRefreshEventHandler.cs            |  8 +++++---
 .../SJZY.Track.Application.csproj                 |  2 +-
 .../SjzyTrackApplicationModule.cs                 | 15 ++++-----------
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs
index 348d7a4b..e55485a9 100644
--- a/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs
+++ b/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs
@@ -26,9 +26,12 @@ public class TrackPushCompletedEventHandler : ITransientDependency, IRabbitHandl
         _trackPushRecordEsRepository = trackPushRecordEsRepository;
     }
 
-    public bool Enable(ConsumeOptions options)
+    public ConsumeOptions Options()
     {
-        return options.Queue == GlobalConst.TrackPushCompletedSubscribe;
+        return new ConsumeOptions()
+        {
+            Queue = GlobalConst.TrackPushCompletedSubscribe
+        };
     }
 
     public async Task Handle(IServiceProvider sp, BasicDeliverEventArgs args, ConsumeOptions options)
diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
index ff8c6d1d..88cc1ad0 100644
--- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
+++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
@@ -39,10 +39,12 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
         _logger = logger;
     }
 
-
-    public bool Enable(ConsumeOptions options)
+    public ConsumeOptions Options()
     {
-        return options.Queue == GlobalConst.TrackRefreshSubscribe;
+       return new ConsumeOptions()
+       {
+           Queue = GlobalConst.TrackRefreshSubscribe,
+       };
     }
 
     public async Task Handle(IServiceProvider sp, BasicDeliverEventArgs args, ConsumeOptions options)
diff --git a/src/SJZY.Track.Application/SJZY.Track.Application.csproj b/src/SJZY.Track.Application/SJZY.Track.Application.csproj
index 0bcf26d3..0beb6ea8 100644
--- a/src/SJZY.Track.Application/SJZY.Track.Application.csproj
+++ b/src/SJZY.Track.Application/SJZY.Track.Application.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BSI.Stack.Rabbit" Version="2.0.9" />
+        <PackageReference Include="BSI.Stack.Rabbit" Version="2.1.3" />
         <PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="8.2.1"/>
         <PackageReference Include="SJZY.Expand.AliyunOSS" Version="7.0.17" />
         <PackageReference Include="SJZY.InterfaceRelay.Application.Contracts" Version="7.2.3"/>
diff --git a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs
index e36b86ce..9318e6ca 100644
--- a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs
+++ b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs
@@ -140,6 +140,10 @@ public class SjzyTrackApplicationModule : AbpModule
             options.ConnectionString =
                 $"amqp://{configuration["RabbitMQ:UserName"]}:{configuration["RabbitMQ:Password"]}@{configuration["RabbitMQ:HostName"]}:{configuration["RabbitMQ:Port"]}";
             options.PoolSize = configuration.GetValue<int>("RabbitMQ:PoolSize");
+            options.Declarations = new List<Action<IDeclaration>>()
+            {
+                   o=>o.ExchangeDeclare(GlobalConst.TrackChangeExchange, ExchangeType.Topic, true),
+            };
             options.Consumes = new List<ConsumeOptions>
             {
                 new()
@@ -154,17 +158,6 @@ public class SjzyTrackApplicationModule : AbpModule
                         o.QueueBind(GlobalConst.TrackRefreshSubscribe, GlobalConst.InterfaceRelayExchange,
                             GlobalConst.TrackRefreshSubscribe);
                     }
-                },
-                new()
-                {
-                    //广播轨迹
-                    Queue = GlobalConst.TrackRefreshSubscribe,
-                    FetchCount = configuration.GetValue<ushort>("TrackApp:TrackRefreshFetchCount"),
-                    FailedRequeue = false,
-                    Declaration = o =>
-                    {
-                        o.ExchangeDeclare(GlobalConst.TrackChangeExchange, ExchangeType.Topic, true);
-                    }
                 }
             };
         }, typeof(SjzyTrackApplicationModule).Assembly);