Merge remote-tracking branch 'origin/main'

OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Model.mqtt
                 handlers,
                 server: "175.27.168.120",
                 port: 6011,
-                clientId: "mqtt_client_1581",
+                clientId: "mqtt_client_1582",
                 username: "sdhc",
                 password: ""
             );
@@ -42,6 +42,8 @@ namespace OpenAuth.WebApi.Model.mqtt
                     $"thing/product/{gateway}/events",
                     $"thing/product/{gateway}/requests",
                     $"thing/product/{gateway}/services_reply",
+                    $"thing/product/{gateway}/drc/up",
+                    $"thing/product/{gateway}/drc/down",
                     $"thing/product/{gateway}/state"
                 });
             }

OpenAuth.WebApi/Model/mqtt/ThingDrcHandler.cs

@@ -0,0 +1,27 @@
+using Infrastructure.CloudSdk.mqttmessagecenter;
+using OpenAuth.App.ServiceApp;
+using OpenAuth.WebApi.Model.mqtt.ModelResponse;
+
+namespace OpenAuth.WebApi.Model.mqtt
+{
+    public class ThingDrcHandler : IMqttMessageHandler
+    {
+        private readonly ILogger<ThingDrcHandler> _logger; 
+        public ThingDrcHandler(ILogger<ThingDrcHandler> logger)
+        {
+            _logger = logger; 
+        }
+
+        public bool CanHandle(string topic)
+        {
+            return topic.Contains("/drc");
+        }
+
+        public Task HandleAsync(string topic, string payload)
+        {
+            _logger.LogError($"[osd] Topic={topic}, Payload={payload}");
+            Console.WriteLine($"[osd] Topic={topic}, Payload={payload}");
+            return Task.CompletedTask;
+        }
+    }
+}

OpenAuth.WebApi/Model/mqtt/ThingEventHandler.cs

@@ -24,7 +24,7 @@ namespace OpenAuth.WebApi.Model.mqtt
 
         public bool CanHandle(string topic)
         {
-            return topic.Contains("/events1");
+            return topic.Contains("/events");
         }
 
         public Task HandleAsync(string topic, string payload)

OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs

@@ -175,6 +175,7 @@ namespace OpenAuth.WebApi.Model.mqtt
                         }
                     }
                 }
+                uavsn = uavsn == "" ? "1581F8HGX254V00A0BUY" : uavsn;
                 _manageApp.AddDronePort(lasaDronePort);
                 _manageApp.AddLasaUav(lasaUav);
                 var requestData = new
@@ -188,12 +189,12 @@ namespace OpenAuth.WebApi.Model.mqtt
                             {
                                 new
                                 {
-                                    err_code = 210231,
+                                    err_code = 0,
                                     sn = dronesn
                                 },
                                 new
                                 {
-                                    err_code = 210231,
+                                    err_code = 0,
                                     sn = uavsn
                                 }
                             }

OpenAuth.WebApi/Startup.cs

@@ -331,6 +331,7 @@ namespace OpenAuth.WebApi
             services.AddSingleton<IMqttMessageHandler, ThingServiceHandler>();
             services.AddSingleton<IMqttMessageHandler, ThingOsdHandler>();
             services.AddSingleton<IMqttMessageHandler, ThingEventHandler>();
+            services.AddSingleton<IMqttMessageHandler, ThingDrcHandler>();
             services.AddHostedService<MqttHostedService>();