am-wd/common
1
0
Fork 0
Code Actions Activity

Merge branch 'main' into cmd

Browse Source
This commit is contained in:
Andreas Müller
2023-08-09 06:52:02 +02:00
parent 0d7e5912b8 28377a89eb
commit 885fc3f1a5
20 changed files with 412 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
AMWD.Common/Extensions/JsonExtensions.cs
View File

@@ -146,13 +146,26 @@ namespace Newtonsoft.Json
if (lvlObj == null)
return defaultValue;
lvlObj = lvlObj[level];
string lvl = level;
if (lvlObj.Type == JTokenType.Object)
{
foreach (var prop in ((JObject)lvlObj).Properties())
{
if (prop.Name.Equals(lvl, System.StringComparison.OrdinalIgnoreCase))
{
lvl = prop.Name;
break;
}
}
}
lvlObj = lvlObj[lvl];
}
if (lvlObj == null)
return defaultValue;
return DeepConvert.ChangeType<T>(lvlObj is JValue ? ((JValue)lvlObj).Value : lvlObj.Value<object>());
return DeepConvert.ChangeType<T>(lvlObj is JValue lvlValue ? lvlValue.Value : lvlObj.Value<object>());
}
/// <summary>