Merge branch 'develop/v2' into feature/remove-database-cache-client

mixcore · Sep 12, 2024 · 1b70466 · 1b70466
2 parents 7a81c78 + 221b5ba
commit 1b70466
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/mix.heart/Enums/MixCacheMode.cs b/src/mix.heart/Enums/MixCacheMode.cs
@@ -3,7 +3,6 @@
     public enum MixCacheMode
     {
         JSON,
-        DATABASE,
         REDIS
     }
 }
diff --git a/src/mix.heart/Services/ConfigurationServiceBase.cs b/src/mix.heart/Services/ConfigurationServiceBase.cs
@@ -47,8 +47,11 @@ public ConfigurationServiceBase(string filePath, bool isEncrypt)
 
         public TValue GetConfig<TValue>(string name, TValue defaultValue = default)
         {
-            var result = RawSettings[name];
-            return result != null ? result.Value<TValue>() : defaultValue;
+            if(RawSettings.TryGetValue(name, StringComparison.OrdinalIgnoreCase, out var result))
+            {
+                return result.Value<TValue>();
+            }
+            return defaultValue;
         }
 
         public TValue GetConfig<TValue>(string culture, string name, TValue defaultValue = default)
@@ -69,7 +72,7 @@ public TValue GetEnumConfig<TValue>(string name)
 
         public void SetConfig<TValue>(string name, TValue value)
         {
-            RawSettings[name] = value != null ? JToken.FromObject(value) : null;
+            RawSettings[RawSettings.Property(name, StringComparison.OrdinalIgnoreCase).Name] = value != null ? JToken.FromObject(value) : null;
             AppSettings = RawSettings.ToObject<T>();
         }
 
@@ -117,7 +120,7 @@ protected virtual void LoadAppSettings()
             }
 
             var rawSettings = JObject.Parse(content);
-            RawSettings = !string.IsNullOrEmpty(SectionName) 
+            RawSettings = !string.IsNullOrEmpty(SectionName)
                 ? rawSettings[SectionName] as JObject
                 : rawSettings;
             AppSettings = RawSettings.ToObject<T>();