ソースを参照

注释MQTT ,格灵深瞳对接

devin.zhu@doverfs.com 7 ヶ月 前
コミット
bb65af14b5

+ 2 - 2
Ai.AgentServer/Program.cs

@@ -45,8 +45,8 @@ app.MapControllers();
 //    Console.WriteLine("sub:" + "/ToServer/34322113 =>" + e.Topic + ":" + e.Payload.ToStr());
 //});
 CommonMessageHandle.init(builder.Configuration.GetSection("Sysurl").Value.ToString());
-var client = new MqttClientService();
-client.MqttClientStart(config);
+//var client = new MqttClientService();
+//client.MqttClientStart(config);
 
 
 app.Run();

+ 20 - 6
Ai.AgentServer/Server/FuelDto/FuelReponse.cs

@@ -1,15 +1,17 @@
 namespace Ai.AgentServer.Server.Fuel
 {
-
-    /// <summary>
-    /// 响应结构
-    /// </summary>
-    public class FuelReponse
-    {
+    public class BaseFuelReponse {
         public int Code { get; set; }
         public string Message { get; set; }
         public Data Data { get; set; }
         public string Type { get; set; }
+    }
+    /// <summary>
+    /// 响应结构
+    /// </summary>
+    public class FuelReponse: BaseFuelReponse
+    {
+     
 
         /// <summary>
         /// 讯飞AIID
@@ -24,6 +26,18 @@
         public bool MQTT_Public { get; set; }
 
         public object DataJson { get; set; }
+        public FuelReponse()
+        {
+            
+        }
+
+        public FuelReponse(BaseFuelReponse baseFuelReponse)
+        {
+            Code = baseFuelReponse.Code;
+            Data = baseFuelReponse.Data;
+            Message = baseFuelReponse.Message;
+            Type = baseFuelReponse.Type;
+        }
 
         /// <summary>
         /// 给响应结构赋值应用id 和 命令类型

+ 6 - 3
Ai.AgentServer/Server/HttpServer.cs

@@ -33,6 +33,7 @@ namespace Ai.AgentServer.Server
                 xunfeiUrl = configuration1.GetSection("XunFei").Value;
             }
 
+
             client.BaseAddress = new Uri(xunfeiUrl);
             var requestJson = JsonConvert.SerializeObject(request.BuildDto());
             _logger.LogInformation($"讯飞request:{DateTime.Now}-{requestJson}");
@@ -44,8 +45,9 @@ namespace Ai.AgentServer.Server
                 if (response != null && response.IsSuccessStatusCode)
                 {
                     Console.WriteLine("xunfei Success");
-                    var fuelreponse = JsonConvert.DeserializeObject<FuelReponse>(await response.Content.ReadAsStringAsync());
-                    return fuelreponse.SetID(request);
+                    Console.WriteLine(await response.Content.ReadAsStringAsync());
+                    var basefuelreponse = JsonConvert.DeserializeObject<BaseFuelReponse>(await response.Content.ReadAsStringAsync());
+                    return new FuelReponse(basefuelreponse).SetID(request);
                 }
 
             }
@@ -55,8 +57,9 @@ namespace Ai.AgentServer.Server
                 _logger.LogError($"讯飞reponse:{DateTime.Now}-{ex.Message} \r\n {requestJson}");
 
                 return new FuelReponse(5001, request);
+
             }
-            return new FuelReponse(5000, request);
+            return new FuelReponse(5001, request);
         }
 
         /// <summary>