Use File change expiration token.

SeriaWei · Aug 6, 2023 · b49bde7 · b49bde7
1 parent 0960aeb
commit b49bde7
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/src/EasyFrameWork/Modules/MutiLanguage/LanguageService.cs b/src/EasyFrameWork/Modules/MutiLanguage/LanguageService.cs
@@ -80,10 +80,9 @@ private static void SaveLocalizeTextToFile(string localeFile, Dictionary<string,
             return _cacheManager.GetOrCreate("AllLanguageEntry", factory =>
             {
                 factory.AddExpirationToken(_signals.When(LanguageChanged));
+                factory.AddExpirationToken(_webHostEnvironment.ContentRootFileProvider.Watch("Locale/*.yml"));
 
-                ExpireCacheOnFileChanged();
-
-                ConcurrentDictionary<string, ConcurrentDictionary<string, LanguageEntity>> result = new ConcurrentDictionary<string, ConcurrentDictionary<string, LanguageEntity>>(StringComparer.OrdinalIgnoreCase);
+                var result = new ConcurrentDictionary<string, ConcurrentDictionary<string, LanguageEntity>>(StringComparer.OrdinalIgnoreCase);
                 foreach (var item in GetAllFromLocaleFile())
                 {
                     if (!result.TryGetValue(item.LanKey, out ConcurrentDictionary<string, LanguageEntity> cultureDic))
@@ -105,16 +104,6 @@ private static void SaveLocalizeTextToFile(string localeFile, Dictionary<string,
             });
         }
 
-        private void ExpireCacheOnFileChanged()
-        {
-            if (!_webHostEnvironment.IsDevelopment()) return;
-
-            _webHostEnvironment.ContentRootFileProvider.Watch("Locale/*.yml").RegisterChangeCallback(signals =>
-            {
-                (signals as ISignals).Trigger(LanguageChanged);
-            }, _signals);
-        }
-
         private ServiceResult<LanguageEntity> Save(LanguageEntity item)
         {
             var result = new ServiceResult<LanguageEntity>();