gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎升级Furion v4.9.4.2

Browse Source
This commit is contained in:
zuohuaijun 2024-06-21 19:38:59 +08:00
parent 1aa84f0b00
commit b59780ae4e
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -18,9 +18,9 @@
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" /> <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.14.3" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.14.3" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.4.1" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.4.2" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.4.1" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.4.2" />
<PackageReference Include="Furion.Pure" Version="4.9.4.1" /> <PackageReference Include="Furion.Pure" Version="4.9.4.2" />
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />
<PackageReference Include="IPTools.International" Version="1.6.0" /> <PackageReference Include="IPTools.International" Version="1.6.0" />
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" /> <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />
@ -36,8 +36,8 @@
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.5.0" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.5.0" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.158" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.158" />
<PackageReference Include="SSH.NET" Version="2024.0.0" /> <PackageReference Include="SSH.NET" Version="2024.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.0" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.1" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1030" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1031" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

9
Admin.NET/Admin.NET.Core/Service/Job/DbJobPersistence.cs
View File

@ -128,6 +128,7 @@ public class DbJobPersistence : IJobPersistence
/// 作业计划Scheduler的JobDetail变化时 /// 作业计划Scheduler的JobDetail变化时
/// </summary> /// </summary>
/// <param name="context"></param> /// <param name="context"></param>
/// <returns></returns>
public async Task OnChangedAsync(PersistenceContext context) public async Task OnChangedAsync(PersistenceContext context)
{ {
using (var scope = _serviceScopeFactory.CreateScope()) using (var scope = _serviceScopeFactory.CreateScope())
@ -156,6 +157,7 @@ public class DbJobPersistence : IJobPersistence
/// 作业计划Scheduler的触发器Trigger变化时 /// 作业计划Scheduler的触发器Trigger变化时
/// </summary> /// </summary>
/// <param name="context"></param> /// <param name="context"></param>
/// <returns></returns>
public async Task OnTriggerChangedAsync(PersistenceTriggerContext context) public async Task OnTriggerChangedAsync(PersistenceTriggerContext context)
{ {
using (var scope = _serviceScopeFactory.CreateScope()) using (var scope = _serviceScopeFactory.CreateScope())
@ -183,14 +185,15 @@ public class DbJobPersistence : IJobPersistence
/// <summary> /// <summary>
/// 作业触发器运行记录 /// 作业触发器运行记录
/// </summary> /// </summary>
/// <param name="timeline"></param> /// <param name="context"></param>
public async Task OnExecutionRecordAsync(TriggerTimeline timeline) /// <returns></returns>
public async Task OnExecutionRecordAsync(PersistenceExecutionRecordContext context)
{ {
using (var scope = _serviceScopeFactory.CreateScope()) using (var scope = _serviceScopeFactory.CreateScope())
{ {
var db = scope.ServiceProvider.GetRequiredService<ISqlSugarClient>().CopyNew(); var db = scope.ServiceProvider.GetRequiredService<ISqlSugarClient>().CopyNew();
var jobTriggerRecord = timeline.Adapt<SysJobTriggerRecord>(); var jobTriggerRecord = context.Timeline.Adapt<SysJobTriggerRecord>();
await db.Insertable(jobTriggerRecord).ExecuteCommandAsync(); await db.Insertable(jobTriggerRecord).ExecuteCommandAsync();
} }
} }