向调度器添加处理器时，即时从ioc解析对象，支持处理器的构造函数注入。#15

NewLifeX · Oct 29, 2024 · 0093c48 · 0093c48
1 parent 09c0217
commit 0093c48
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 16 deletions.
diff --git a/AntJob.Agent/AntJob.Agent.csproj b/AntJob.Agent/AntJob.Agent.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Stardust" Version="3.1.2024.1004" />
+    <PackageReference Include="NewLife.Stardust" Version="3.1.2024.1025-beta1552" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AntJob.Data/AntJob.Data.csproj b/AntJob.Data/AntJob.Data.csproj
@@ -37,7 +37,7 @@
     <None Remove="Build.tt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1005" />
+    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1027-beta0304" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Build.log">

diff --git a/AntJob.Extensions/AntJob.Extensions.csproj b/AntJob.Extensions/AntJob.Extensions.csproj
@@ -43,7 +43,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1005" />
+    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1027-beta0304" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AntJob\AntJob.csproj" />

diff --git a/AntJob.Server/AntJob.Server.csproj b/AntJob.Server/AntJob.Server.csproj
@@ -29,7 +29,7 @@
     <Content Include="favicon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Redis" Version="6.0.2024.1006" />
+    <PackageReference Include="NewLife.Redis" Version="6.0.2024.1022-beta1409" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

diff --git a/AntJob.Web/AntJob.Web.csproj b/AntJob.Web/AntJob.Web.csproj
@@ -44,9 +44,9 @@
     <Content Include="favicon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.1005" />
-    <PackageReference Include="NewLife.Remoting.Extensions" Version="3.0.2024.1002" />
-    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.1.2024.1004" />
+    <PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.1025-beta1556" />
+    <PackageReference Include="NewLife.Remoting.Extensions" Version="3.0.2024.1025-beta1552" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.1.2024.1025-beta1552" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

diff --git a/AntJob/AntJob.csproj b/AntJob/AntJob.csproj
@@ -49,9 +49,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.0.2024.1001" />
-    <PackageReference Include="NewLife.Remoting" Version="3.1.2024.1002" />
-    <PackageReference Include="NewLife.Stardust" Version="3.1.2024.1004" />
+    <PackageReference Include="NewLife.Core" Version="11.0.2024.1029-beta0215" />
+    <PackageReference Include="NewLife.Remoting" Version="3.1.2024.1025-beta1552" />
+    <PackageReference Include="NewLife.Stardust" Version="3.1.2024.1025-beta1552" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AntJob/Scheduler.cs b/AntJob/Scheduler.cs
@@ -47,11 +47,18 @@ protected override void Dispose(Boolean disposing)
     /// <typeparam name="T"></typeparam>
     public void AddHandler<T>() where T : Handler
     {
-        var services = ObjectContainer.Current;
-        var prv = ObjectContainer.Provider;
-        services.AddTransient<T>();
+        var prv = ServiceProvider;
+        if (prv == null)
+        {
+            var services = ObjectContainer.Current;
+            prv = ObjectContainer.Provider;
+            services.AddTransient<T>();
+        }
+
+        // 马上实例化
+        var handler = prv.GetService<T>() ?? prv.CreateInstance(typeof(T)) as T;
 
-        Handlers.Add(prv.GetService<T>());
+        Handlers.Add(handler);
     }
     #endregion
 

diff --git a/Samples/HisData/HisData.csproj b/Samples/HisData/HisData.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1005" />
+    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1027-beta0304" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/HisWeb/HisWeb.csproj b/Samples/HisWeb/HisWeb.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.1005" />
+    <PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.1025-beta1556" />
   </ItemGroup>
 
   <ItemGroup>