GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-03-18 18:13:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Save configuration lost Server derived class's properties

Browse Source
This commit is contained in:
ChsBuffer
2021-03-01 22:42:28 +08:00
parent 046079639e
commit eab0797fb2
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Netch/Utils/Configuration.cs
View File

@@ -17,6 +17,12 @@ namespace Netch.Utils
/// 设置
/// </summary>
public static readonly string SETTINGS_JSON = $"{DATA_DIR}\\settings.json";
private static readonly JsonSerializerOptions JsonSerializerOptions = Global.NewDefaultJsonSerializerOptions;
static Configuration()
{
JsonSerializerOptions.Converters.Add(new ServerConverterWithTypeDiscriminator());
}
/// <summary>
/// 加载配置
@@ -41,9 +47,7 @@ namespace Netch.Utils
{
try
{
var jsonSerializerOptions = Global.NewDefaultJsonSerializerOptions;
jsonSerializerOptions.Converters.Add(new ServerConverterWithTypeDiscriminator());
var settings = JsonSerializer.Deserialize<Setting>(text, jsonSerializerOptions)!;
var settings = JsonSerializer.Deserialize<Setting>(text, JsonSerializerOptions)!;
#region Check Profile
@@ -73,7 +77,7 @@ namespace Netch.Utils
if (!Directory.Exists(DATA_DIR))
Directory.CreateDirectory(DATA_DIR);
File.WriteAllBytes(SETTINGS_JSON, JsonSerializer.SerializeToUtf8Bytes(Global.Settings, Global.NewDefaultJsonSerializerOptions));
File.WriteAllBytes(SETTINGS_JSON, JsonSerializer.SerializeToUtf8Bytes(Global.Settings, JsonSerializerOptions));
}
}
}

2
Netch/Utils/ServerConverterWithTypeDiscriminator.cs
View File

@@ -26,7 +26,7 @@ namespace Netch.Utils
public override void Write(Utf8JsonWriter writer, Server value, JsonSerializerOptions options)
{
JsonSerializer.Serialize(writer, value, options);
JsonSerializer.Serialize<object>(writer, value, options);
}
}
}