From 323ad75f8aa64aae0964fd206c5d64729e7fae81 Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Mon, 7 Apr 2025 21:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Plugins/TcpMonitor.cs                     | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs b/src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs
index 7083387..8f37fb4 100644
--- a/src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs
+++ b/src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs
@@ -24,7 +24,7 @@ namespace JiShe.CollectBus.Plugins
 {
     public partial class TcpMonitor : PluginBase, ITransientDependency, ITcpReceivedPlugin, ITcpConnectingPlugin, ITcpConnectedPlugin, ITcpClosedPlugin
     {
-        private readonly IPublishEndpoint _producerBus;
+        private readonly ICapPublisher _producerBus;
         private readonly ILogger<TcpMonitor> _logger;
         private readonly IRepository<Device, Guid> _deviceRepository;
         private readonly IDistributedCache<AmmeterInfo> _ammeterInfoCache;
@@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Plugins
         /// <param name="logger"></param>
         /// <param name="deviceRepository"></param>
         /// <param name="ammeterInfoCache"></param>
-        public TcpMonitor(IPublishEndpoint producerBus,
+        public TcpMonitor(ICapPublisher producerBus,
             ILogger<TcpMonitor> logger,
             IRepository<Device, Guid> deviceRepository,
             IDistributedCache<AmmeterInfo> ammeterInfoCache)
@@ -160,9 +160,9 @@ namespace JiShe.CollectBus.Plugins
                 DeviceNo = deviceNo,
                 MessageId = NewId.NextGuid().ToString()
             };
-            //await _producerBus.PublishAsync(ProtocolConst.SubscriberReceivedLoginEventName, messageReceivedLoginEvent);
+            await _producerBus.PublishAsync(ProtocolConst.SubscriberReceivedLoginEventName, messageReceivedLoginEvent);
 
-            await _producerBus.Publish( messageReceivedLoginEvent);
+            //await _producerBus.Publish( messageReceivedLoginEvent);
         }
 
         private async Task OnTcpHeartbeatReceived(ITcpSessionClient client, string messageHexString, string deviceNo)
@@ -199,23 +199,13 @@ namespace JiShe.CollectBus.Plugins
                 DeviceNo = deviceNo,
                 MessageId = NewId.NextGuid().ToString()
             };
-            //await _producerBus.PublishAsync(ProtocolConst.SubscriberReceivedHeartbeatEventName, messageReceivedHeartbeatEvent);
-            await _producerBus.Publish(messageReceivedHeartbeatEvent);
+            await _producerBus.PublishAsync(ProtocolConst.SubscriberReceivedHeartbeatEventName, messageReceivedHeartbeatEvent);
+            //await _producerBus.Publish(messageReceivedHeartbeatEvent);
         }
 
         private async Task OnTcpNormalReceived(ITcpSessionClient client, string messageHexString, string deviceNo)
         {
-            await _producerBus.Publish(new MessageReceived
-            {
-                ClientId = client.Id,
-                ClientIp = client.IP,
-                ClientPort = client.Port,
-                MessageHexString = messageHexString,
-                DeviceNo = deviceNo,
-                MessageId = NewId.NextGuid().ToString()
-            });
-
-            //await _producerBus.PublishAsync(ProtocolConst.SubscriberReceivedEventName, new MessageReceived
+            //await _producerBus.Publish(new MessageReceived
             //{
             //    ClientId = client.Id,
             //    ClientIp = client.IP,
@@ -224,6 +214,16 @@ namespace JiShe.CollectBus.Plugins
             //    DeviceNo = deviceNo,
             //    MessageId = NewId.NextGuid().ToString()
             //});
+
+            await _producerBus.PublishAsync(ProtocolConst.SubscriberReceivedEventName, new MessageReceived
+            {
+                ClientId = client.Id,
+                ClientIp = client.IP,
+                ClientPort = client.Port,
+                MessageHexString = messageHexString,
+                DeviceNo = deviceNo,
+                MessageId = NewId.NextGuid().ToString()
+            });
         }
     }
 }