Compare commits

..
2 Commits
Author SHA1 Message Date
xrain 1ee8d941e9 fix eventserver bug 2024-07-26 19:18:59 +08:00
xrain 1d474f596a config fix 2024-07-26 08:56:01 +08:00
3 changed files with 9 additions and 8 deletions
+5 -5
View File
@@ -224,11 +224,11 @@ public static class SimApiExtensions
/// </summary> /// </summary>
/// <param name="builder"></param> /// <param name="builder"></param>
/// <returns></returns> /// <returns></returns>
public static IApplicationBuilder UseSimApi(this IApplicationBuilder builder) public static WebApplication UseSimApi(this WebApplication builder)
{ {
var options = builder.ApplicationServices.GetRequiredService<SimApiOptions>(); var options = builder.Services.GetRequiredService<SimApiOptions>();
var logger = builder.ApplicationServices.GetRequiredService<ILogger<SimApiOptions>>(); var logger = builder.Services.GetRequiredService<ILogger<SimApiOptions>>();
logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id); logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id);
if (options.EnableForwardHeaders) if (options.EnableForwardHeaders)
@@ -277,7 +277,7 @@ public static class SimApiExtensions
if (options.EnableSimApiStorage) if (options.EnableSimApiStorage)
{ {
logger.LogInformation("开始配置SimApiStorage..."); logger.LogInformation("开始配置SimApiStorage...");
builder.ApplicationServices.GetService<SimApiStorage>(); builder.Services.GetService<SimApiStorage>();
} }
if (options.EnableLowerUrl) if (options.EnableLowerUrl)
@@ -287,7 +287,7 @@ public static class SimApiExtensions
if (options.EnableSynapse) if (options.EnableSynapse)
{ {
var synapse = builder.ApplicationServices.GetRequiredService<Synapse>(); var synapse = builder.Services.GetRequiredService<Synapse>();
synapse.Init(); synapse.Init();
} }
+2 -1
View File
@@ -15,6 +15,7 @@ public partial class Synapse
private bool FireSetConfig(string key, string value) private bool FireSetConfig(string key, string value)
{ {
if (key.Contains('#') || key.Contains('+')) return false;
var topic = $"{Options.SysName}/synapse-config-store/{key}"; var topic = $"{Options.SysName}/synapse-config-store/{key}";
var message = new MqttApplicationMessageBuilder() var message = new MqttApplicationMessageBuilder()
.WithTopic(topic) .WithTopic(topic)
@@ -37,7 +38,7 @@ public partial class Synapse
var csTopicPrefix = $"{Options.SysName}/synapse-config-store/"; var csTopicPrefix = $"{Options.SysName}/synapse-config-store/";
var eventSubOpts = MqttFactory.CreateSubscribeOptionsBuilder() var eventSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
.WithTopicFilter(o => .WithTopicFilter(o =>
o.WithTopic($"{csTopicPrefix}+").WithRetainHandling(MqttRetainHandling.SendAtSubscribe)) o.WithTopic($"{csTopicPrefix}#").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
.Build(); .Build();
Client!.ApplicationMessageReceivedAsync += e => Client!.ApplicationMessageReceivedAsync += e =>
{ {
+2 -2
View File
@@ -33,7 +33,7 @@ public partial class Synapse
{ {
if (mt!.GetParameters().Length == 2) if (mt!.GetParameters().Length == 2)
{ {
var pt = mt!.GetParameters()[0].ParameterType; var pt = mt.GetParameters()[1].ParameterType;
mt.Invoke(callClass, pt == typeof(string) mt.Invoke(callClass, pt == typeof(string)
? [eventName, reqBody] ? [eventName, reqBody]
: [eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption)]); : [eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption)]);
@@ -45,7 +45,7 @@ public partial class Synapse
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.LogError("Synapse Event Processor Error: {Err}", ex.InnerException); logger.LogError("Synapse Event Processor Error: {Err}\n{Stack}", ex.Message,ex.StackTrace);
} }
} }