Skip to content

Commit 23123df

Browse files
malimingmaliming
committed
Update TickerQ package versions and refactor background job management
1 parent 0d9200d commit 23123df

13 files changed

Lines changed: 43 additions & 41 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@
183183
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
184184
<PackageVersion Include="TencentCloudSDK.Sms" Version="3.0.1273" />
185185
<PackageVersion Include="TimeZoneConverter" Version="7.2.0" />
186-
<PackageVersion Include="TickerQ" Version="2.5.3" />
187-
<PackageVersion Include="TickerQ.Dashboard" Version="2.5.3" />
188-
<PackageVersion Include="TickerQ.Utilities" Version="2.5.3" />
189-
<PackageVersion Include="TickerQ.EntityFrameworkCore" Version="2.5.3" />
186+
<PackageVersion Include="TickerQ" Version="10.1.1" />
187+
<PackageVersion Include="TickerQ.Dashboard" Version="10.1.1" />
188+
<PackageVersion Include="TickerQ.Utilities" Version="10.1.1" />
189+
<PackageVersion Include="TickerQ.EntityFrameworkCore" Version="10.1.1" />
190190
<PackageVersion Include="Unidecode.NET" Version="2.1.0" />
191191
<PackageVersion Include="xunit" Version="2.9.3" />
192192
<PackageVersion Include="xunit.extensibility.execution" Version="2.9.3" />

‎framework/src/Volo.Abp.BackgroundJobs.TickerQ/Volo.Abp.BackgroundJobs.TickerQ.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
7+
<TargetFramework>net10.0</TargetFramework>
88
<Nullable>enable</Nullable>
99
<WarningsAsErrors>Nullable</WarningsAsErrors>
1010
<AssemblyName>Volo.Abp.BackgroundJobs.TickerQ</AssemblyName>

‎framework/src/Volo.Abp.BackgroundJobs.TickerQ/Volo/Abp/BackgroundJobs/TickerQ/AbpBackgroundJobsTickerQModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private static TickerFunctionDelegate GetTickerFunctionDelegate<TArgs>(Type args
6565
using (var scope = serviceProvider.CreateScope())
6666
{
6767
var jobExecuter = serviceProvider.GetRequiredService<IBackgroundJobExecuter>();
68-
var args = await TickerRequestProvider.GetRequestAsync<TArgs>(serviceProvider, context.Id, context.Type);
68+
var args = await TickerRequestProvider.GetRequestAsync<TArgs>(context, cancellationToken);
6969
var jobType = options.GetJob(typeof(TArgs)).JobType;
7070
var jobExecutionContext = new JobExecutionContext(scope.ServiceProvider, jobType, args!, cancellationToken: cancellationToken);
7171
await jobExecuter.ExecuteAsync(jobExecutionContext);

‎framework/src/Volo.Abp.BackgroundJobs.TickerQ/Volo/Abp/BackgroundJobs/TickerQ/AbpBackgroundJobsTimeTickerConfiguration.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System;
21
using TickerQ.Utilities.Enums;
32

43
namespace Volo.Abp.BackgroundJobs.TickerQ;
@@ -11,7 +10,5 @@ public class AbpBackgroundJobsTimeTickerConfiguration
1110

1211
public TickerTaskPriority? Priority { get; set; }
1312

14-
public Guid? BatchParent { get; set; }
15-
16-
public BatchRunCondition? BatchRunCondition { get; set; }
13+
public RunCondition? RunCondition { get; set; }
1714
}

‎framework/src/Volo.Abp.BackgroundJobs.TickerQ/Volo/Abp/BackgroundJobs/TickerQ/AbpTickerQBackgroundJobManager.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
using System.Threading.Tasks;
33
using Microsoft.Extensions.Options;
44
using TickerQ.Utilities;
5+
using TickerQ.Utilities.Entities;
56
using TickerQ.Utilities.Interfaces.Managers;
6-
using TickerQ.Utilities.Models.Ticker;
77
using Volo.Abp.DependencyInjection;
88

99
namespace Volo.Abp.BackgroundJobs.TickerQ;
1010

1111
[Dependency(ReplaceServices = true)]
1212
public class AbpTickerQBackgroundJobManager : IBackgroundJobManager, ITransientDependency
1313
{
14-
protected ITimeTickerManager<TimeTicker> TimeTickerManager { get; }
14+
protected ITimeTickerManager<TimeTickerEntity> TimeTickerManager { get; }
1515
protected AbpBackgroundJobOptions Options { get; }
1616
protected AbpBackgroundJobsTickerQOptions TickerQOptions { get; }
1717

1818
public AbpTickerQBackgroundJobManager(
19-
ITimeTickerManager<TimeTicker> timeTickerManager,
19+
ITimeTickerManager<TimeTickerEntity> timeTickerManager,
2020
IOptions<AbpBackgroundJobOptions> options,
2121
IOptions<AbpBackgroundJobsTickerQOptions> tickerQOptions)
2222
{
@@ -28,7 +28,7 @@ public AbpTickerQBackgroundJobManager(
2828
public virtual async Task<string> EnqueueAsync<TArgs>(TArgs args, BackgroundJobPriority priority = BackgroundJobPriority.Normal, TimeSpan? delay = null)
2929
{
3030
var job = Options.GetJob(typeof(TArgs));
31-
var timeTicker = new TimeTicker
31+
var timeTicker = new TimeTickerEntity
3232
{
3333
Id = Guid.NewGuid(),
3434
Function = job.JobName,
@@ -41,11 +41,10 @@ public virtual async Task<string> EnqueueAsync<TArgs>(TArgs args, BackgroundJobP
4141
{
4242
timeTicker.Retries = config.Retries ?? timeTicker.Retries;
4343
timeTicker.RetryIntervals = config.RetryIntervals ?? timeTicker.RetryIntervals;
44-
timeTicker.BatchParent = config.BatchParent ?? timeTicker.BatchParent;
45-
timeTicker.BatchRunCondition = config.BatchRunCondition ?? timeTicker.BatchRunCondition;
44+
timeTicker.RunCondition = config.RunCondition ?? timeTicker.RunCondition;
4645
}
4746

4847
var result = await TimeTickerManager.AddAsync(timeTicker);
49-
return !result.IsSucceded ? timeTicker.Id.ToString() : result.Result.Id.ToString();
48+
return !result.IsSucceeded ? timeTicker.Id.ToString() : result.Result.Id.ToString();
5049
}
5150
}

‎framework/src/Volo.Abp.BackgroundWorkers.TickerQ/Volo.Abp.BackgroundWorkers.TickerQ.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
7+
<TargetFramework>net10.0</TargetFramework>
88
<Nullable>enable</Nullable>
99
<WarningsAsErrors>Nullable</WarningsAsErrors>
1010
<AssemblyName>Volo.Abp.BackgroundWorkers.TickerQ</AssemblyName>

‎framework/src/Volo.Abp.BackgroundWorkers.TickerQ/Volo/Abp/BackgroundWorkers/TickerQ/AbpBackgroundWorkersTickerQModule.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Threading.Tasks;
22
using Microsoft.Extensions.DependencyInjection;
33
using Microsoft.Extensions.Options;
4+
using TickerQ.Utilities.Entities;
45
using TickerQ.Utilities.Interfaces.Managers;
5-
using TickerQ.Utilities.Models.Ticker;
66
using Volo.Abp.Modularity;
77
using Volo.Abp.TickerQ;
88

@@ -14,11 +14,11 @@ public class AbpBackgroundWorkersTickerQModule : AbpModule
1414
public override async Task OnPostApplicationInitializationAsync(ApplicationInitializationContext context)
1515
{
1616
var abpTickerQBackgroundWorkersProvider = context.ServiceProvider.GetRequiredService<AbpTickerQBackgroundWorkersProvider>();
17-
var cronTickerManager = context.ServiceProvider.GetRequiredService<ICronTickerManager<CronTicker>>();
17+
var cronTickerManager = context.ServiceProvider.GetRequiredService<ICronTickerManager<CronTickerEntity>>();
1818
var abpBackgroundWorkersTickerQOptions = context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundWorkersTickerQOptions>>().Value;
1919
foreach (var backgroundWorker in abpTickerQBackgroundWorkersProvider.BackgroundWorkers)
2020
{
21-
var cronTicker = new CronTicker
21+
var cronTicker = new CronTickerEntity
2222
{
2323
Function = backgroundWorker.Value.Function,
2424
Expression = backgroundWorker.Value.CronExpression

‎framework/src/Volo.Abp.BackgroundWorkers.TickerQ/Volo/Abp/BackgroundWorkers/TickerQ/AbpTickerQPeriodicBackgroundWorkerInvoker.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Reflection;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using TickerQ.Utilities.Models;
6+
using TickerQ.Utilities.Base;
77

88
namespace Volo.Abp.BackgroundWorkers.TickerQ;
99

framework/src/Volo.Abp.TickerQ/Microsoft/AspNetCore/Builder/AbpTickerQApplicationBuilderExtensions.cs renamed to framework/src/Volo.Abp.TickerQ/Microsoft/Extensions/Hosting/AbpTickerQApplicationBuilderExtensions.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
using Microsoft.Extensions.DependencyInjection;
2+
using Microsoft.Extensions.Hosting;
23
using TickerQ.DependencyInjection;
34
using TickerQ.Utilities;
45
using TickerQ.Utilities.Enums;
56
using Volo.Abp.TickerQ;
67

7-
namespace Microsoft.AspNetCore.Builder;
8+
namespace Microsoft.Extensions.Hosting;
89

910
public static class AbpTickerQApplicationBuilderExtensions
1011
{
11-
public static IApplicationBuilder UseAbpTickerQ(this IApplicationBuilder app, TickerQStartMode qStartMode = TickerQStartMode.Immediate)
12+
public static IHost UseAbpTickerQ(this IHost app, TickerQStartMode qStartMode = TickerQStartMode.Immediate)
1213
{
13-
var abpTickerQFunctionProvider = app.ApplicationServices.GetRequiredService<AbpTickerQFunctionProvider>();
14+
var abpTickerQFunctionProvider = app.Services.GetRequiredService<AbpTickerQFunctionProvider>();
1415
TickerFunctionProvider.RegisterFunctions(abpTickerQFunctionProvider.Functions);
1516
TickerFunctionProvider.RegisterRequestType(abpTickerQFunctionProvider.RequestTypes);
1617

‎framework/src/Volo.Abp.TickerQ/Volo.Abp.TickerQ.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
7+
<TargetFramework>net10.0</TargetFramework>
88
<Nullable>enable</Nullable>
99
<WarningsAsErrors>Nullable</WarningsAsErrors>
1010
<AssemblyName>Volo.Abp.TickerQ</AssemblyName>

0 commit comments

Comments
 (0)