Przeglądaj źródła

😁升级所有依赖及去掉Natasha包-修改动态作业任务创建模式

zuohuaijun 3 lat temu
rodzic
commit
7f74bd88d9

+ 4 - 5
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -19,11 +19,10 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.3.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="DotNetCore.Compile.Environment" Version="3.2.0" />
-    <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.2.2.1" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.18" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.18" />
-    <PackageReference Include="Furion.Pure" Version="4.8.8.18" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.21" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.21" />
+    <PackageReference Include="Furion.Pure" Version="4.8.8.21" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.4" />
@@ -34,7 +33,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.27.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.18.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.73" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.76" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.2" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

+ 3 - 10
Admin.NET/Admin.NET.Core/Job/DynamicJobCompiler.cs

@@ -12,17 +12,10 @@ public class DynamicJobCompiler : ISingleton
     /// <returns></returns>
     public Type BuildJob(string script)
     {
-        // 初始化
-        NatashaInitializer.Preheating();
+        var jobAssembly = Schedular.CompileCSharpClassCode(script);
 
-        // 动态创建作业
-        var builder = new AssemblyCSharpBuilder("Admin.NET.Core")
-        {
-            Domain = DomainManagement.Random()
-        };
+        var jobType = jobAssembly.GetType("Admin.NET.Core");
 
-        builder.Add(script);
-
-        return builder.GetAssembly().GetTypes().FirstOrDefault(u => typeof(IJob).IsAssignableFrom(u));
+        return jobType;
     }
 }