library/simapi-net
1
0
Fork 0
Code Pull Requests Activity

优化了Exception报错

Browse Source
This commit is contained in:
xrain
2023-10-20 15:29:32 +08:00
parent caeb697421
commit a3fff03ff6
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Synapse/EventServer.cs
+1 -1
View File
@@ -46,7 +46,7 @@ public partial class Synapse
} }
catch (Exception e) catch (Exception e)
{ {
Logger.LogError("Event Processor Error: {Err}", e.Message); Logger.LogError("Event Processor Error: {Err}", e.InnerException);
EventServerChannel.BasicNack(ea.DeliveryTag, false, false); EventServerChannel.BasicNack(ea.DeliveryTag, false, false);
} }
}; };
Synapse/RpcServer.cs
+17 -9
View File
@@ -1,5 +1,6 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text; using System.Text;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Text.Json; using System.Text.Json;
@@ -37,13 +38,13 @@ public partial class Synapse
{ {
var callClass = Sp.CreateScope().ServiceProvider.GetRequiredService(method.Class); var callClass = Sp.CreateScope().ServiceProvider.GetRequiredService(method.Class);
var mt = callClass.GetType().GetMethod(method.Method); var mt = callClass.GetType().GetMethod(method.Method);
var param = Array.Empty<object>();
try try
{ {
var pt = mt.GetParameters()[0].ParameterType; var pt = mt.GetParameters()[0].ParameterType;
if (pt == typeof(string)) if (pt == typeof(string))
{ {
var ret = mt.Invoke(callClass, new[] { reqBody }); param = new[] { reqBody };
res = new SimApiBaseResponse<object>(ret);
} }
else else
{ {
@@ -51,14 +52,23 @@ public partial class Synapse
{ {
PropertyNamingPolicy = JsonNamingPolicy.CamelCase PropertyNamingPolicy = JsonNamingPolicy.CamelCase
}); });
var ret = mt.Invoke(callClass, new[] { paramObj }); param = new[] { paramObj };
}
var ret = mt.Invoke(callClass, param);
res = new SimApiBaseResponse<object>(ret); res = new SimApiBaseResponse<object>(ret);
} }
} catch (TargetInvocationException e)
catch (SimApiException e)
{ {
Logger.LogDebug("RPC错误: {Err}", e.Message); if (e.InnerException is SimApiException)
res = new SimApiBaseResponse(e.Code, e.Message); {
var ie = e.InnerException as SimApiException;
Logger.LogDebug("RPC调用错误: {Err}", ie.Message);
res = new SimApiBaseResponse(ie.Code, ie.Message);
}
else
{
res = new SimApiBaseResponse(500, e.Message);
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -67,13 +77,11 @@ public partial class Synapse
} }
} }
var returnJson = JsonSerializer.Serialize((object)res, new JsonSerializerOptions var returnJson = JsonSerializer.Serialize((object)res, new JsonSerializerOptions
{ {
Encoder = JavaScriptEncoder.Create(UnicodeRanges.All), Encoder = JavaScriptEncoder.Create(UnicodeRanges.All),
PropertyNamingPolicy = JsonNamingPolicy.CamelCase, PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
}); });
Console.WriteLine(returnJson);
var reply = $"client.{ea.BasicProperties.ReplyTo}.{ea.BasicProperties.AppId}"; var reply = $"client.{ea.BasicProperties.ReplyTo}.{ea.BasicProperties.AppId}";
var props = RpcServerChannel.CreateBasicProperties(); var props = RpcServerChannel.CreateBasicProperties();
props.AppId = Options.AppId; props.AppId = Options.AppId;