接触Redis类对IConfigProvider的强依赖

NewLifeX · Dec 5, 2024 · 3304684 · 3304684
1 parent ee9369d
commit 3304684
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/NewLife.Redis/NewLife.Redis.csproj b/NewLife.Redis/NewLife.Redis.csproj
@@ -56,7 +56,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.0.2024.1201" />
+    <PackageReference Include="NewLife.Core" Version="11.1.2024.1205" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NewLife.Redis/Redis.cs b/NewLife.Redis/Redis.cs
@@ -149,8 +149,9 @@ public Redis(IServiceProvider provider, String name) : this()
         var log = provider.GetService<ILog>();
         if (log != null) Log = log;
 
-        var configProvider = provider.GetRequiredService<IConfigProvider>();
-        configProvider.Bind(this, true, name);
+        var config = provider.GetService<IConfigProvider>();
+        config ??= JsonConfigProvider.LoadAppSettings();
+        config.Bind(this, true, name);
     }
 
     /// <summary>实例化Redis，指定名称，支持从环境变量Redis_{Name}读取配置，或者逐个属性配置</summary>

diff --git a/NewLife.Redis/Services/RedisCacheProvider.cs b/NewLife.Redis/Services/RedisCacheProvider.cs
@@ -57,8 +57,8 @@ public void Init(IConfigProvider config, IServiceProvider? serviceProvider = nul
 
                 redis ??= new FullRedis(serviceProvider, "RedisCache")
                 {
-                    Log = serviceProvider.GetRequiredService<ILog>(),
-                    Tracer = serviceProvider.GetRequiredService<ITracer>(),
+                    Log = serviceProvider.GetService<ILog>()!,
+                    Tracer = serviceProvider.GetService<ITracer>(),
                 };
             }
             else
@@ -80,8 +80,8 @@ public void Init(IConfigProvider config, IServiceProvider? serviceProvider = nul
 
                 redis ??= new FullRedis(serviceProvider, "RedisQueue")
                 {
-                    Log = serviceProvider.GetRequiredService<ILog>(),
-                    Tracer = serviceProvider.GetRequiredService<ITracer>(),
+                    Log = serviceProvider.GetService<ILog>()!,
+                    Tracer = serviceProvider.GetService<ITracer>(),
                 };
             }
             else

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.0.2024.1201" />
+    <PackageReference Include="NewLife.Core" Version="11.1.2024.1205" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/XUnitTest/XUnitTest.csproj b/XUnitTest/XUnitTest.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NewLife.Core" Version="11.0.2024.1201" />
+    <PackageReference Include="NewLife.Core" Version="11.1.2024.1205" />
     <PackageReference Include="NewLife.UnitTest" Version="1.0.2024.1006" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">