Merge pull request #167 from Bonnie2980/master

maikebing · web-flow · commit 484f1eb0b3b6 · 2025-05-22T09:58:23.000+08:00
fix issue: Manual Job not be added into Scheduler
diff --git a/sample/Jobs/HelloJobAuto.cs b/sample/Jobs/HelloJobAuto.cs
@@ -8,7 +8,7 @@
 namespace SilkierQuartz.Example.Jobs
 {
 
-    [SilkierQuartz(5, Group = "example", Desciption = "this e sq test", TriggerDescription = "_hellojobauto", TriggerGroup = "SilkierQuartz")]
+    [SilkierQuartz(5, Group = "example", Description = "this e sq test", TriggerDescription = "_hellojobauto", TriggerGroup = "SilkierQuartz")]
     public class HelloJobAuto : IJob
     {
         public Task Execute(IJobExecutionContext context)
diff --git a/sample/Startup.cs b/sample/Startup.cs
@@ -61,11 +61,11 @@ public void ConfigureServices(IServiceCollection services)
             services.AddOptions();
             services.Configure<AppSettings>(Configuration);
             services.Configure<InjectProperty>(options => { options.WriteText = "This is inject string"; });
-            services.AddQuartzJob<HelloJob>(nameof(HelloJob), "example")
-                    .AddQuartzJob<InjectSampleJob>(nameof(InjectSampleJob), "example")
-                    .AddQuartzJob<HelloJobSingle>(nameof(HelloJobSingle), "example")
-                    .AddQuartzJob<InjectSampleJobSingle>(nameof(InjectSampleJobSingle), "example")
-                    .AddQuartzJob<LongRunningJob>(nameof(LongRunningJob), "example");
+            services.AddQuartzJob<HelloJob>(nameof(HelloJob))
+                    .AddQuartzJob<InjectSampleJob>(nameof(InjectSampleJob))
+                    .AddQuartzJob<HelloJobSingle>(nameof(HelloJobSingle))
+                    .AddQuartzJob<InjectSampleJobSingle>(nameof(InjectSampleJobSingle))
+                    .AddQuartzJob<LongRunningJob>(nameof(LongRunningJob));
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/sample2/Jobs/HelloJobAuto.cs b/sample2/Jobs/HelloJobAuto.cs
@@ -7,7 +7,7 @@
 
 namespace SilkierQuartz.Example.Jobs
 {
-    [SilkierQuartz(5, Group = "sample", Desciption = "this e sq test", TriggerDescription = "_hellojobauto")]
+    [SilkierQuartz(5, Group = "sample", Description = "this e sq test", TriggerDescription = "_hellojobauto")]
     public class HelloJobAuto : IJob
     {
         public Task Execute(IJobExecutionContext context)
@@ -18,7 +18,7 @@ public Task Execute(IJobExecutionContext context)
     }
 
     [DisallowConcurrentExecution]
-    [SilkierQuartz(5, 0, 0, Group = "sample", Desciption = "自动下载欢迎信息")]
+    [SilkierQuartz(5, 0, 0, Group = "sample", Description = "自动下载欢迎信息")]
     public class HelloJobAuto1 : IJob
     {
         public Task Execute(IJobExecutionContext context)
diff --git a/sample2/Program.cs b/sample2/Program.cs
@@ -57,11 +57,11 @@
 services.AddOptions();
 services.Configure<AppSettings>(configuration);
 services.Configure<InjectProperty>(options => { options.WriteText = "This is inject string"; });
-services.AddQuartzJob<HelloJob>(nameof(HelloJob), "sample")
-        .AddQuartzJob<InjectSampleJob>(nameof(InjectSampleJob), "sample")
-        .AddQuartzJob<HelloJobSingle>(nameof(HelloJobSingle), "sample")
-        .AddQuartzJob<InjectSampleJobSingle>(nameof(InjectSampleJobSingle), "sample")
-        .AddQuartzJob<LongRunningJob>(nameof(LongRunningJob), "sample");
+services.AddQuartzJob<HelloJob>(nameof(HelloJob))
+        .AddQuartzJob<InjectSampleJob>(nameof(InjectSampleJob))
+        .AddQuartzJob<HelloJobSingle>(nameof(HelloJobSingle))
+        .AddQuartzJob<InjectSampleJobSingle>(nameof(InjectSampleJobSingle))
+        .AddQuartzJob<LongRunningJob>(nameof(LongRunningJob));
 
 
 var app = builder.Build();
diff --git a/src/SilkierQuartz/Configuration/ServiceCollectionExtensions.cs b/src/SilkierQuartz/Configuration/ServiceCollectionExtensions.cs
@@ -59,7 +59,7 @@ public static IServiceCollection AddSilkierQuartz(
             types.ForEach(t =>
             {
                 var so = t.GetCustomAttribute<SilkierQuartzAttribute>();
-                services.AddQuartzJob(t, so.Identity ?? t.Name, so.Group, so.Desciption ?? t.FullName);
+                services.AddQuartzJob(t, so.Identity ?? t.Name, so.Manual ? true : false, so.Group, so.Description ?? t.FullName);
             });
             return services;
         }
diff --git a/src/SilkierQuartz/HostedService/IJobRegistratorExtensions.cs b/src/SilkierQuartz/HostedService/IJobRegistratorExtensions.cs
@@ -35,23 +35,18 @@ public static IServiceCollection AddQuartzJobDetail(this IServiceCollection serv
             return services;
         }
 
-        public static IServiceCollection AddQuartzJob<TJob>(this IServiceCollection services, string identity, string? group) where TJob : class
+        public static IServiceCollection AddQuartzJob<TJob>(this IServiceCollection services, string identity, bool durability = false, string? group = null, string? description = null) where TJob : class
         {
-            return services.AddQuartzJob<TJob>(identity, group, null);
+            return services.AddQuartzJob(typeof(TJob), identity, durability, group, description);
         }
 
-        public static IServiceCollection AddQuartzJob<TJob>(this IServiceCollection services, string identity, string? group, string description) where TJob : class
-        {
-            return services.AddQuartzJob(typeof(TJob), identity, group, description);
-        }
-
-        public static IServiceCollection AddQuartzJob(this IServiceCollection services, Type t, string identity, string? group, string description)
+        public static IServiceCollection AddQuartzJob(this IServiceCollection services, Type t, string identity, bool durability = false, string ? group = null, string? description = null)
         {
             if (!services.Any(sd => sd.ServiceType == t))
             {
                 services.AddTransient(t);
             }
-            var jobDetail = JobBuilder.Create(t).WithIdentity(identity, group).WithDescription(description).Build();
+            var jobDetail = JobBuilder.Create(t).StoreDurably(durability).WithIdentity(identity, group).WithDescription(description).Build();
             services.AddSingleton<IScheduleJob>(provider => new ScheduleJob(jobDetail, new List<ITrigger>()));
             return services;
         }
diff --git a/src/SilkierQuartz/HostedService/QuartzHostedService.cs b/src/SilkierQuartz/HostedService/QuartzHostedService.cs
@@ -43,25 +43,32 @@ public async Task StartAsync(CancellationToken cancellationToken)
 
             foreach (var scheduleJob in _scheduleJobs)
             {
-                var isNewJob = true;
-                foreach (var trigger in scheduleJob.Triggers)
+                if (scheduleJob.Triggers != null && scheduleJob.Triggers.Any())
                 {
-
-                    if (isNewJob)
+                    var isNewJob = true;
+                    foreach (var trigger in scheduleJob.Triggers)
                     {
-                        if (!(await _scheduler.CheckExists(scheduleJob.JobDetail.Key, cancellationToken) ))
+
+                        if (isNewJob)
                         {
-                            await _scheduler.ScheduleJob(scheduleJob.JobDetail, trigger, cancellationToken);
+                            if (!(await _scheduler.CheckExists(scheduleJob.JobDetail.Key, cancellationToken)))
+                            {
+                                await _scheduler.ScheduleJob(scheduleJob.JobDetail, trigger, cancellationToken);
+                            }
                         }
-                    }
-                    else
-                    {
-                        if (!( await _scheduler.CheckExists(trigger.Key, cancellationToken)))
+                        else
                         {
-                            await _scheduler.ScheduleJob(trigger, cancellationToken);
+                            if (!(await _scheduler.CheckExists(trigger.Key, cancellationToken)))
+                            {
+                                await _scheduler.ScheduleJob(trigger, cancellationToken);
+                            }
                         }
+                        isNewJob = false;
                     }
-                    isNewJob = false;
+                }
+                else
+                {
+                    await _scheduler.AddJob(scheduleJob.JobDetail, true, cancellationToken);
                 }
             }
         }
diff --git a/src/SilkierQuartz/SilkierQuartzAttribute.cs b/src/SilkierQuartz/SilkierQuartzAttribute.cs
@@ -11,19 +11,19 @@ public SilkierQuartzAttribute()
         {
         }
 
-        public SilkierQuartzAttribute(double days, double hours, double minutes, double seconds, double milliseconds, string _identity, string? _group, string _desciption) : this(days, hours, minutes, seconds, milliseconds, 0, _identity, _group, _desciption)
+        public SilkierQuartzAttribute(double days, double hours, double minutes, double seconds, double milliseconds, string _identity, string? _group = null, string _description = null) : this(days, hours, minutes, seconds, milliseconds, 0, _identity, _group, _description)
         {
         }
 
-        public SilkierQuartzAttribute(double hours, double minutes, double seconds, string _identity, string? _group, string _desciption) : this(0, hours, minutes, seconds, 0, 0, _identity, _group, _desciption)
+        public SilkierQuartzAttribute(double hours, double minutes, double seconds, string _identity, string? _group = null, string _description = null) : this(0, hours, minutes, seconds, 0, 0, _identity, _group, _description)
         {
         }
 
-        public SilkierQuartzAttribute(double minutes, double seconds, string _identity, string? _group, string _desciption) : this(0, 0, minutes, seconds, 0, 0, _identity, _group, _desciption)
+        public SilkierQuartzAttribute(double minutes, double seconds, string _identity, string? _group = null, string _description = null) : this(0, 0, minutes, seconds, 0, 0, _identity, _group, _description)
         {
         }
 		
-        public SilkierQuartzAttribute(double seconds, string _identity, string? _group, string _desciption) : this(0, 0, 0, seconds, 0, 0, _identity, _group, _desciption)
+        public SilkierQuartzAttribute(double seconds, string _identity, string? _group = null, string _description = null) : this(0, 0, 0, seconds, 0, 0, _identity, _group, _description)
         {
         }
 
@@ -48,8 +48,11 @@ public SilkierQuartzAttribute(bool Manual) : this(0, 0, 0, 0, 0, 0, null, null,
             this.Manual = true;
         }
 
-        public SilkierQuartzAttribute(double days, double hours, double minutes, double seconds, double milliseconds, long ticks, string _identity, string? _group, string _desciption)
+        public SilkierQuartzAttribute(double days, double hours, double minutes, double seconds, double milliseconds, long ticks, string _identity, string? _group, string _description)
         {
+            Identity = _identity;
+            Group = _group;
+            Description = _description;
 
             WithInterval = TimeSpan.FromTicks(ticks + (long)(days * TimeSpan.TicksPerDay
                                              + hours * TimeSpan.TicksPerHour
@@ -58,7 +61,7 @@ public SilkierQuartzAttribute(double days, double hours, double minutes, double
                                              + milliseconds + TimeSpan.TicksPerMillisecond));
         }
 		
-        public string Desciption { get; set; } = null;
+        public string Description { get; set; } = null;
         public string Identity { get; set; } = null;
         public string Group { get; set; } = null;
         public TimeSpan WithInterval { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace SilkierQuartz.Example.Jobs`
`9`	`9`	`{`
`10`	`10`
`11`		`- [SilkierQuartz(5, Group = "example", Desciption = "this e sq test", TriggerDescription = "_hellojobauto", TriggerGroup = "SilkierQuartz")]`
	`11`	`+ [SilkierQuartz(5, Group = "example", Description = "this e sq test", TriggerDescription = "_hellojobauto", TriggerGroup = "SilkierQuartz")]`
`12`	`12`	`public class HelloJobAuto : IJob`
`13`	`13`	`{`
`14`	`14`	`public Task Execute(IJobExecutionContext context)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace SilkierQuartz.Example.Jobs`
`9`	`9`	`{`
`10`		`- [SilkierQuartz(5, Group = "sample", Desciption = "this e sq test", TriggerDescription = "_hellojobauto")]`
	`10`	`+ [SilkierQuartz(5, Group = "sample", Description = "this e sq test", TriggerDescription = "_hellojobauto")]`
`11`	`11`	`public class HelloJobAuto : IJob`
`12`	`12`	`{`
`13`	`13`	`public Task Execute(IJobExecutionContext context)`
`@@ -18,7 +18,7 @@ public Task Execute(IJobExecutionContext context)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`[DisallowConcurrentExecution]`
`21`		`- [SilkierQuartz(5, 0, 0, Group = "sample", Desciption = "自动下载欢迎信息")]`
	`21`	`+ [SilkierQuartz(5, 0, 0, Group = "sample", Description = "自动下载欢迎信息")]`
`22`	`22`	`public class HelloJobAuto1 : IJob`
`23`	`23`	`{`
`24`	`24`	`public Task Execute(IJobExecutionContext context)`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public static IServiceCollection AddSilkierQuartz(`
`59`	`59`	`types.ForEach(t =>`
`60`	`60`	`{`
`61`	`61`	`var so = t.GetCustomAttribute<SilkierQuartzAttribute>();`
`62`		`- services.AddQuartzJob(t, so.Identity ?? t.Name, so.Group, so.Desciption ?? t.FullName);`
	`62`	`+ services.AddQuartzJob(t, so.Identity ?? t.Name, so.Manual ? true : false, so.Group, so.Description ?? t.FullName);`
`63`	`63`	`});`
`64`	`64`	`return services;`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,23 +35,18 @@ public static IServiceCollection AddQuartzJobDetail(this IServiceCollection serv`
`35`	`35`	`return services;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public static IServiceCollection AddQuartzJob<TJob>(this IServiceCollection services, string identity, string? group) where TJob : class`
	`38`	`+ public static IServiceCollection AddQuartzJob<TJob>(this IServiceCollection services, string identity, bool durability = false, string? group = null, string? description = null) where TJob : class`
`39`	`39`	`{`
`40`		`- return services.AddQuartzJob<TJob>(identity, group, null);`
	`40`	`+ return services.AddQuartzJob(typeof(TJob), identity, durability, group, description);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public static IServiceCollection AddQuartzJob<TJob>(this IServiceCollection services, string identity, string? group, string description) where TJob : class`
`44`		`- {`
`45`		`- return services.AddQuartzJob(typeof(TJob), identity, group, description);`
`46`		`- }`
`47`		`-`
`48`		`- public static IServiceCollection AddQuartzJob(this IServiceCollection services, Type t, string identity, string? group, string description)`
	`43`	`+ public static IServiceCollection AddQuartzJob(this IServiceCollection services, Type t, string identity, bool durability = false, string ? group = null, string? description = null)`
`49`	`44`	`{`
`50`	`45`	`if (!services.Any(sd => sd.ServiceType == t))`
`51`	`46`	`{`
`52`	`47`	`services.AddTransient(t);`
`53`	`48`	`}`
`54`		`- var jobDetail = JobBuilder.Create(t).WithIdentity(identity, group).WithDescription(description).Build();`
	`49`	`+ var jobDetail = JobBuilder.Create(t).StoreDurably(durability).WithIdentity(identity, group).WithDescription(description).Build();`
`55`	`50`	`services.AddSingleton<IScheduleJob>(provider => new ScheduleJob(jobDetail, new List<ITrigger>()));`
`56`	`51`	`return services;`
`57`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,25 +43,32 @@ public async Task StartAsync(CancellationToken cancellationToken)`
`43`	`43`
`44`	`44`	`foreach (var scheduleJob in _scheduleJobs)`
`45`	`45`	`{`
`46`		`- var isNewJob = true;`
`47`		`- foreach (var trigger in scheduleJob.Triggers)`
	`46`	`+ if (scheduleJob.Triggers != null && scheduleJob.Triggers.Any())`
`48`	`47`	`{`
`49`		`-`
`50`		`- if (isNewJob)`
	`48`	`+ var isNewJob = true;`
	`49`	`+ foreach (var trigger in scheduleJob.Triggers)`
`51`	`50`	`{`
`52`		`- if (!(await _scheduler.CheckExists(scheduleJob.JobDetail.Key, cancellationToken) ))`
	`51`	`+`
	`52`	`+ if (isNewJob)`
`53`	`53`	`{`
`54`		`- await _scheduler.ScheduleJob(scheduleJob.JobDetail, trigger, cancellationToken);`
	`54`	`+ if (!(await _scheduler.CheckExists(scheduleJob.JobDetail.Key, cancellationToken)))`
	`55`	`+ {`
	`56`	`+ await _scheduler.ScheduleJob(scheduleJob.JobDetail, trigger, cancellationToken);`
	`57`	`+ }`
`55`	`58`	`}`
`56`		`- }`
`57`		`- else`
`58`		`- {`
`59`		`- if (!( await _scheduler.CheckExists(trigger.Key, cancellationToken)))`
	`59`	`+ else`
`60`	`60`	`{`
`61`		`- await _scheduler.ScheduleJob(trigger, cancellationToken);`
	`61`	`+ if (!(await _scheduler.CheckExists(trigger.Key, cancellationToken)))`
	`62`	`+ {`
	`63`	`+ await _scheduler.ScheduleJob(trigger, cancellationToken);`
	`64`	`+ }`
`62`	`65`	`}`
	`66`	`+ isNewJob = false;`
`63`	`67`	`}`
`64`		`- isNewJob = false;`
	`68`	`+ }`
	`69`	`+ else`
	`70`	`+ {`
	`71`	`+ await _scheduler.AddJob(scheduleJob.JobDetail, true, cancellationToken);`
`65`	`72`	`}`
`66`	`73`	`}`
`67`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,19 +11,19 @@ public SilkierQuartzAttribute()`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`		`- public SilkierQuartzAttribute(double days, double hours, double minutes, double seconds, double milliseconds, string _identity, string? _group, string _desciption) : this(days, hours, minutes, seconds, milliseconds, 0, _identity, _group, _desciption)`
	`14`	`+ public SilkierQuartzAttribute(double days, double hours, double minutes, double seconds, double milliseconds, string _identity, string? _group = null, string _description = null) : this(days, hours, minutes, seconds, milliseconds, 0, _identity, _group, _description)`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
`18`		`- public SilkierQuartzAttribute(double hours, double minutes, double seconds, string _identity, string? _group, string _desciption) : this(0, hours, minutes, seconds, 0, 0, _identity, _group, _desciption)`
	`18`	`+ public SilkierQuartzAttribute(double hours, double minutes, double seconds, string _identity, string? _group = null, string _description = null) : this(0, hours, minutes, seconds, 0, 0, _identity, _group, _description)`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`
`22`		`- public SilkierQuartzAttribute(double minutes, double seconds, string _identity, string? _group, string _desciption) : this(0, 0, minutes, seconds, 0, 0, _identity, _group, _desciption)`
	`22`	`+ public SilkierQuartzAttribute(double minutes, double seconds, string _identity, string? _group = null, string _description = null) : this(0, 0, minutes, seconds, 0, 0, _identity, _group, _description)`
`23`	`23`	`{`
`24`	`24`	`}`
`25`	`25`
`26`		`- public SilkierQuartzAttribute(double seconds, string _identity, string? _group, string _desciption) : this(0, 0, 0, seconds, 0, 0, _identity, _group, _desciption)`
	`26`	`+ public SilkierQuartzAttribute(double seconds, string _identity, string? _group = null, string _description = null) : this(0, 0, 0, seconds, 0, 0, _identity, _group, _description)`
`27`	`27`	`{`
`28`	`28`	`}`
`29`	`29`
`@@ -48,8 +48,11 @@ public SilkierQuartzAttribute(bool Manual) : this(0, 0, 0, 0, 0, 0, null, null,`
`48`	`48`	`this.Manual = true;`
`49`	`49`	`}`
`50`	`50`
`51`		`- public SilkierQuartzAttribute(double days, double hours, double minutes, double seconds, double milliseconds, long ticks, string _identity, string? _group, string _desciption)`
	`51`	`+ public SilkierQuartzAttribute(double days, double hours, double minutes, double seconds, double milliseconds, long ticks, string _identity, string? _group, string _description)`
`52`	`52`	`{`
	`53`	`+ Identity = _identity;`
	`54`	`+ Group = _group;`
	`55`	`+ Description = _description;`
`53`	`56`
`54`	`57`	`WithInterval = TimeSpan.FromTicks(ticks + (long)(days * TimeSpan.TicksPerDay`
`55`	`58`	`+ hours * TimeSpan.TicksPerHour`
`@@ -58,7 +61,7 @@ public SilkierQuartzAttribute(double days, double hours, double minutes, double`
`58`	`61`	`+ milliseconds + TimeSpan.TicksPerMillisecond));`
`59`	`62`	`}`
`60`	`63`
`61`		`- public string Desciption { get; set; } = null;`
	`64`	`+ public string Description { get; set; } = null;`
`62`	`65`	`public string Identity { get; set; } = null;`
`63`	`66`	`public string Group { get; set; } = null;`
`64`	`67`	`public TimeSpan WithInterval { get; set; }`