From 0a76761bcacc2be1a34c6f9e76c5b34a79742e4c Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Mon, 30 Jun 2025 15:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.WebApi/Startup.cs | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/OpenAuth.WebApi/Startup.cs b/OpenAuth.WebApi/Startup.cs
index 11cd4c6..f95a239 100644
--- a/OpenAuth.WebApi/Startup.cs
+++ b/OpenAuth.WebApi/Startup.cs
@@ -66,6 +66,7 @@ namespace OpenAuth.WebApi
 
             #endregion
 
+
             #region identityServer
 
             var identityServer =
@@ -166,6 +167,16 @@ namespace OpenAuth.WebApi
 
             #endregion
 
+            #region mqtt
+            services.AddSingleton<MqttMessageCenter>();
+            services.AddSingleton<IMqttMessageHandler, ThingRequestHandler>();
+            services.AddSingleton<IMqttMessageHandler, ThingServiceHandler>();
+            services.AddSingleton<IMqttMessageHandler, ThingOsdHandler>();
+            services.AddSingleton<IMqttMessageHandler, ThingEventHandler>();
+            //services.AddSingleton<IMqttMessageHandler, ThingDrcHandler>();
+            services.AddHostedService<MqttHostedService>();
+            #endregion
+
             #region AppSetting
 
             services.Configure<AppSetting>(Configuration.GetSection("AppSetting"));
@@ -327,25 +338,7 @@ namespace OpenAuth.WebApi
 
             #endregion
 
-            #region mqtt
-            //services.AddSingleton<MqttMessageCenter>();
-            services.AddSingleton<MqttMessageCenter>(sp =>
-            {
-                var mqtt = new MqttMessageCenter();
-                var handlers = sp.GetServices<IMqttMessageHandler>();
-                mqtt.InitializeAsync(handlers, "175.27.168.120", 6011, "mqtt_client_15821").GetAwaiter().GetResult();
-                return mqtt;
-            });
-            services.AddSingleton<IMqttMessageHandler, ThingRequestHandler>();
-            services.AddSingleton<IMqttMessageHandler, ThingServiceHandler>();
-            services.AddSingleton<IMqttMessageHandler, ThingOsdHandler>();
-            services.AddSingleton<IMqttMessageHandler, ThingEventHandler>();
-            //services.AddSingleton<IMqttMessageHandler, ThingDrcHandler>();
-            services.AddHostedService<MqttHostedService>();
-
-
-
-            #endregion
+            
         }
 
         public void ConfigureContainer(ContainerBuilder builder)