From ff4b635de46fe94f85e889156109c29dee7c105e Mon Sep 17 00:00:00 2001
From: cli <377476583@qq.com>
Date: Fri, 11 Oct 2024 11:27:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DependencyInjections/DependencyInjectionExtensions.cs    | 1 +
 .../ServiceCollections/ServiceCollectionExtensions.cs        | 1 +
 JiShe.CollectBus.Core/Plugins/ClosePlugin.cs                 | 2 +-
 JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs    | 5 ++---
 JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs          | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/JiShe.CollectBus.Console/Extensions/DependencyInjections/DependencyInjectionExtensions.cs b/JiShe.CollectBus.Console/Extensions/DependencyInjections/DependencyInjectionExtensions.cs
index cec77dc..482bdc7 100644
--- a/JiShe.CollectBus.Console/Extensions/DependencyInjections/DependencyInjectionExtensions.cs
+++ b/JiShe.CollectBus.Console/Extensions/DependencyInjections/DependencyInjectionExtensions.cs
@@ -3,6 +3,7 @@ using JiShe.CollectBus.Protocol.Contracts.Attributes;
 using JiShe.CollectBus.Protocol.Contracts.DependencyInjection;
 using TouchSocket.Core;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class DependencyInjectionExtensions
diff --git a/JiShe.CollectBus.Console/Extensions/ServiceCollections/ServiceCollectionExtensions.cs b/JiShe.CollectBus.Console/Extensions/ServiceCollections/ServiceCollectionExtensions.cs
index 6ca9238..685ad04 100644
--- a/JiShe.CollectBus.Console/Extensions/ServiceCollections/ServiceCollectionExtensions.cs
+++ b/JiShe.CollectBus.Console/Extensions/ServiceCollections/ServiceCollectionExtensions.cs
@@ -4,6 +4,7 @@ using Microsoft.Extensions.Configuration;
 using TouchSocket.Core;
 using TouchSocket.Sockets;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionExtensions
diff --git a/JiShe.CollectBus.Core/Plugins/ClosePlugin.cs b/JiShe.CollectBus.Core/Plugins/ClosePlugin.cs
index cc613e5..46ee464 100644
--- a/JiShe.CollectBus.Core/Plugins/ClosePlugin.cs
+++ b/JiShe.CollectBus.Core/Plugins/ClosePlugin.cs
@@ -29,7 +29,7 @@ namespace JiShe.CollectBus.Core.Plugins
 
     public class UdpClosePlugin(ILog logger) : PluginBase, IUdpReceivedPlugin
     {
-        public async Task OnUdpReceived(IUdpSessionBase client, UdpReceivedDataEventArgs e)
+        public Task OnUdpReceived(IUdpSessionBase client, UdpReceivedDataEventArgs e)
         {
             throw new NotImplementedException();
         }
diff --git a/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs b/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs
index 601c04f..fb285a1 100644
--- a/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs
+++ b/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs
@@ -12,8 +12,7 @@ namespace JiShe.CollectBus.Core.Plugins
         {
             //TODO:电表： 376.1 645-07 modbus  水表： 118 645-97
 
-            var protocolType = "TestProtocol";
-            IProtocolPlugin? protocolPlugin;
+            const string protocolType = "TestProtocol";
             switch (protocolType)
             {
                 //case "376":
@@ -23,7 +22,7 @@ namespace JiShe.CollectBus.Core.Plugins
                 //    //todo: 直接拿设备信息，根据设备信息使用不同的协议解析服务
                 //    break;
             }
-            protocolPlugin = serviceProvider.GetKeyedService<IProtocolPlugin>(protocolType);
+            var protocolPlugin = serviceProvider.GetKeyedService<IProtocolPlugin>(protocolType);
             client.Logger.Info($"{protocolPlugin?.Get().Name},{protocolPlugin?.Get().RegularExpression}");
 
 
diff --git a/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs b/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs
index b0acf7b..d90ae49 100644
--- a/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs
+++ b/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs
@@ -14,7 +14,7 @@ namespace JiShe.CollectBus.Protocol
             return new ProtocolInfo("Standard", "376.1", "TCP","376.1协议","DTS1980");
         }
 
-        public void Load()
+        public new void Load()
         {
             base.Load();
         }