From 8d9e3e09f8046ab71114103a67e7d9669e4bc717 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Mon, 29 Jan 2024 09:37:42 +0800
Subject: [PATCH] Improve

---
 .../PermissionValueProviderManager.cs           | 17 ++++++++---------
 .../Abp/Features/FeatureValueProviderManager.cs | 17 ++++++++---------
 .../Abp/Settings/SettingValueProviderManager.cs | 17 ++++++++---------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs
index 09b2da2acb..aebd14f36e 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs
@@ -9,29 +9,28 @@ namespace Volo.Abp.Authorization.Permissions;
 
 public class PermissionValueProviderManager : IPermissionValueProviderManager, ISingletonDependency
 {
-    public IReadOnlyList<IPermissionValueProvider> ValueProviders => GetProviders();
+    public IReadOnlyList<IPermissionValueProvider> ValueProviders => _lazyProviders.Value;
     private readonly Lazy<List<IPermissionValueProvider>> _lazyProviders;
 
     protected AbpPermissionOptions Options { get; }
+    protected IServiceProvider ServiceProvider { get; }
 
     public PermissionValueProviderManager(
         IServiceProvider serviceProvider,
         IOptions<AbpPermissionOptions> options)
     {
         Options = options.Value;
+        ServiceProvider = serviceProvider;
 
-        _lazyProviders = new Lazy<List<IPermissionValueProvider>>(
-            () => Options
-                .ValueProviders
-                .Select(c => serviceProvider.GetRequiredService(c) as IPermissionValueProvider)
-                .ToList()!,
-            true
-        );
+        _lazyProviders = new Lazy<List<IPermissionValueProvider>>(GetProviders, true);
     }
     
     protected virtual List<IPermissionValueProvider> GetProviders()
     {
-        var providers = _lazyProviders.Value;
+        var providers = Options
+            .ValueProviders
+            .Select(type => (ServiceProvider.GetRequiredService(type) as IPermissionValueProvider)!)
+            .ToList();
         
         var multipleProviders = providers.GroupBy(p => p.Name).FirstOrDefault(x => x.Count() > 1);
         if(multipleProviders != null)
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureValueProviderManager.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureValueProviderManager.cs
index 98d73dd4e4..c793ee8ce5 100644
--- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureValueProviderManager.cs
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureValueProviderManager.cs
@@ -9,29 +9,28 @@ namespace Volo.Abp.Features;
 
 public class FeatureValueProviderManager : IFeatureValueProviderManager, ISingletonDependency
 {
-    public IReadOnlyList<IFeatureValueProvider> ValueProviders => GetProviders();
+    public IReadOnlyList<IFeatureValueProvider> ValueProviders => _lazyProviders.Value;
     private readonly Lazy<List<IFeatureValueProvider>> _lazyProviders;
 
     protected AbpFeatureOptions Options { get; }
+    protected IServiceProvider ServiceProvider { get; }
 
     public FeatureValueProviderManager(
         IServiceProvider serviceProvider,
         IOptions<AbpFeatureOptions> options)
     {
         Options = options.Value;
+        ServiceProvider = serviceProvider;
 
-        _lazyProviders = new Lazy<List<IFeatureValueProvider>>(
-            () => Options
-                .ValueProviders
-                .Select(c => serviceProvider.GetRequiredService(c) as IFeatureValueProvider)
-                .ToList()!,
-            true
-        );
+        _lazyProviders = new Lazy<List<IFeatureValueProvider>>(GetProviders, true);
     }
     
     protected virtual List<IFeatureValueProvider> GetProviders()
     {
-        var providers = _lazyProviders.Value;
+        var providers = Options
+            .ValueProviders
+            .Select(type => (ServiceProvider.GetRequiredService(type) as IFeatureValueProvider)!)
+            .ToList();
         
         var multipleProviders = providers.GroupBy(p => p.Name).FirstOrDefault(x => x.Count() > 1);
         if(multipleProviders != null)
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs
index c13f884e98..116fae5643 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs
@@ -9,9 +9,10 @@ namespace Volo.Abp.Settings;
 
 public class SettingValueProviderManager : ISettingValueProviderManager, ISingletonDependency
 {
-    public List<ISettingValueProvider> Providers => GetProviders();
+    public List<ISettingValueProvider> Providers => _lazyProviders.Value;
 
     protected AbpSettingOptions Options { get; }
+    protected IServiceProvider ServiceProvider { get; }
     private readonly Lazy<List<ISettingValueProvider>> _lazyProviders;
 
     public SettingValueProviderManager(
@@ -20,19 +21,17 @@ public class SettingValueProviderManager : ISettingValueProviderManager, ISingle
     {
 
         Options = options.Value;
+        ServiceProvider = serviceProvider;
 
-        _lazyProviders = new Lazy<List<ISettingValueProvider>>(
-            () => Options
-                .ValueProviders
-                .Select(type => serviceProvider.GetRequiredService(type) as ISettingValueProvider)
-                .ToList()!,
-            true
-        );
+        _lazyProviders = new Lazy<List<ISettingValueProvider>>(GetProviders, true);
     }
     
     protected virtual List<ISettingValueProvider> GetProviders()
     {
-        var providers = _lazyProviders.Value;
+        var providers = Options
+            .ValueProviders
+            .Select(type => (ServiceProvider.GetRequiredService(type) as ISettingValueProvider)!)
+            .ToList();
         
         var multipleProviders = providers.GroupBy(p => p.Name).FirstOrDefault(x => x.Count() > 1);
         if(multipleProviders != null)