所有都用SimApiUitl.Json,增加了Gate,auth增加了获取所有token
This commit is contained in:
@@ -17,8 +17,9 @@ public partial class Synapse
|
||||
}
|
||||
else
|
||||
{
|
||||
paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
|
||||
paramJson = SimApiUtil.Json(param);
|
||||
}
|
||||
|
||||
var topic = $"{Options.SysName}/event/{Options.AppName}/{eventName}";
|
||||
var message = new MqttApplicationMessageBuilder()
|
||||
.WithTopic(topic)
|
||||
|
||||
@@ -50,7 +50,7 @@ public partial class Synapse
|
||||
}
|
||||
else
|
||||
{
|
||||
paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
|
||||
paramJson = SimApiUtil.Json(param);
|
||||
}
|
||||
|
||||
var topic = $"{Options.SysName}/{app}/rpc/server/{action}";
|
||||
@@ -73,7 +73,7 @@ public partial class Synapse
|
||||
Client.PublishAsync(message, CancellationToken.None).Wait();
|
||||
logger.LogDebug(
|
||||
"Synapse RPC Client Request: ({PropsMessageId}) {OptionsAppName} -> {Action}@{App}\n{ParamJson}\nHeaders: {Headers}",
|
||||
messageId, Options.AppName, action, app, paramJson, JsonSerializer.Serialize(headers));
|
||||
messageId, Options.AppName, action, app, paramJson, SimApiUtil.Json(headers));
|
||||
|
||||
string response;
|
||||
try
|
||||
@@ -88,13 +88,12 @@ public partial class Synapse
|
||||
}
|
||||
else
|
||||
{
|
||||
response = JsonSerializer.Serialize(new SimApiBaseResponse(502, "timeout"), SimApiUtil.JsonOption);
|
||||
response = SimApiUtil.Json(new SimApiBaseResponse(502, "timeout"));
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
response = JsonSerializer.Serialize(new SimApiBaseResponse(500, "Synapse RPC Client Error"),
|
||||
SimApiUtil.JsonOption);
|
||||
response = SimApiUtil.Json(new SimApiBaseResponse(500, "Synapse RPC Client Error"));
|
||||
}
|
||||
|
||||
return response;
|
||||
|
||||
@@ -10,7 +10,7 @@ using MQTTnet.Protocol;
|
||||
using SimApi.Communications;
|
||||
using SimApi.Exceptions;
|
||||
using SimApi.Helpers;
|
||||
using JsonSerializer = System.Text.Json.JsonSerializer;
|
||||
using System.Text.Json;
|
||||
|
||||
namespace SimApi;
|
||||
|
||||
@@ -96,7 +96,7 @@ public partial class Synapse
|
||||
}
|
||||
}
|
||||
|
||||
var returnJson = JsonSerializer.Serialize((object)res, SimApiUtil.JsonOption);
|
||||
var returnJson = SimApiUtil.Json(res);
|
||||
var reply = $"{Options.SysName}/{appInfo[0]}/rpc/client/{appInfo[1]}/{appInfo[2]}";
|
||||
var message = new MqttApplicationMessageBuilder()
|
||||
.WithTopic(reply)
|
||||
|
||||
+1
-1
@@ -101,7 +101,7 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge
|
||||
else
|
||||
{
|
||||
var data = FireRpc(appName, method, param, headers, timeout);
|
||||
res = JsonSerializer.Deserialize<SimApiBaseResponse<T>>(data, SimApiUtil.JsonOption);
|
||||
res = SimApiUtil.FromJson<SimApiBaseResponse<T>>(data);
|
||||
}
|
||||
|
||||
return (res as SimApiBaseResponse<T>)!;
|
||||
|
||||
Reference in New Issue
Block a user