重构

IoTSharp/Extensions/MqttExtension.cs

@@ -8,7 +8,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Builder;
 using MQTTnet.AspNetCore;
 using MQTTnet.Diagnostics;
-using IoTSharp.Handlers;
 using IoTSharp.Services;
 using MQTTnet.Server;
 using System.Diagnostics;
@@ -51,11 +50,11 @@ namespace IoTSharp
             }).AddMqttConnectionHandler()
                     .AddConnections(); 
             services.AddMqttWebSocketServerAdapter();
-            services.AddSingleton<MQTTServerHandler>();
+            services.AddSingleton<MQTTService>();
         }
         public static void UseIotSharpMqttServer(this IApplicationBuilder app)
         {
-            var mqttEvents = app.ApplicationServices.CreateScope().ServiceProvider.GetService<MQTTServerHandler>();
+            var mqttEvents = app.ApplicationServices.CreateScope().ServiceProvider.GetService<MQTTService>();
             app.UseMqttServer(server =>
                 {
                     server.ClientConnectedAsync +=  mqttEvents.Server_ClientConnectedAsync;

IoTSharp/IoTSharp.csproj

@@ -211,6 +211,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<Folder Include="ClientApp\" />
+		<Folder Include="Services\MQTTControllers\" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">

IoTSharp/Services/CoAPService.cs

@@ -2,6 +2,7 @@
 using DotNetCore.CAP;
 using IoTSharp.Data;
 using IoTSharp.Handlers;
+using IoTSharp.Services.CoApResources;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;

IoTSharp/Handlers/CoAPResource.cs → IoTSharp/Services/CoApResources/CoAPResource.cs

@@ -10,7 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace IoTSharp.Handlers
+namespace IoTSharp.Services.CoApResources
 {
     public class CoApResource : Resource
     {
@@ -114,12 +114,12 @@ namespace IoTSharp.Handlers
                             switch (_res)
                             {
                                 case CoApRes.Attributes:
-                                    _eventBus.PublishAttributeData(new PlayloadData() {  MsgBody = keyValues, DataCatalog = DataCatalog.AttributeData, DataSide = DataSide.ClientSide, DeviceId = dev.Id });
+                                    _eventBus.PublishAttributeData(new PlayloadData() { MsgBody = keyValues, DataCatalog = DataCatalog.AttributeData, DataSide = DataSide.ClientSide, DeviceId = dev.Id });
                                     exchange.Respond(StatusCode.Changed, $"OK");
                                     break;
 
                                 case CoApRes.Telemetry:
-                                    _eventBus.PublishTelemetryData(new PlayloadData() {  MsgBody = keyValues, DataCatalog = DataCatalog.AttributeData, DataSide = DataSide.ClientSide, DeviceId = dev.Id });
+                                    _eventBus.PublishTelemetryData(new PlayloadData() { MsgBody = keyValues, DataCatalog = DataCatalog.AttributeData, DataSide = DataSide.ClientSide, DeviceId = dev.Id });
                                     exchange.Respond(StatusCode.Created, $"OK");
                                     break;