修复执行策略ExecutorBlockStrategy.DISCARD_LATER的逻辑错误

build/releasenotes.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<DotXxlJobPackageNotes>
-		1. 修复回调一次过多的问题
+		1. 修复执行策略ExecutorBlockStrategy.DISCARD_LATER的逻辑错误
 		</DotXxlJobPackageNotes> 
 		<HessianPackageNotes>
 		1. 实现基本的Hessian协议

build/version.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<DotXxlJobPackageVersion>1.0.8</DotXxlJobPackageVersion>	
+		<DotXxlJobPackageVersion>1.0.9</DotXxlJobPackageVersion>	
 		<HessianPackageVersion>1.0.1</HessianPackageVersion>		
 	</PropertyGroup>
 </Project>

scripts/nuget.sh

@@ -13,6 +13,6 @@ mkdir -p $artifactsFolder
 
 dotnet build ./src/DotXxlJob.Core/DotXxlJob.Core.csproj -c Release
 
-dotnet pack ./src/DotXxlJob.Core/DotXxlJob.Core.csproj -c Release -o ../../$artifactsFolder
+dotnet pack ./src/DotXxlJob.Core/DotXxlJob.Core.csproj -c Release -o $artifactsFolder
 
-dotnet nuget push ./$artifactsFolder/DotXxlJob.Core.*.nupkg -k $NUGET_KEY -s https://www.nuget.org
+dotnet nuget push $artifactsFolder/DotXxlJob.Core.*.nupkg -k $NUGET_KEY -s https://www.nuget.org

src/DotXxlJob.Core/JobDispatcher.cs

@@ -81,9 +81,13 @@ namespace DotXxlJob.Core
             {
                 //丢弃后续的
                 if (Constants.ExecutorBlockStrategy.DISCARD_LATER == triggerParam.ExecutorBlockStrategy)
+                {
+                    if (taskQueue.IsRunning())
                     {
                         return ReturnT.Failed($"block strategy effect：{triggerParam.ExecutorBlockStrategy}");
                     }
+                    
+                }
                 //覆盖较早的
                 if (Constants.ExecutorBlockStrategy.COVER_EARLY == triggerParam.ExecutorBlockStrategy)
                 {

src/DotXxlJob.Core/Queue/JobTaskQueue.cs

@@ -29,7 +29,10 @@ namespace DotXxlJob.Core
         public event EventHandler<HandleCallbackParam> CallBack;
 
 
-
+        public bool IsRunning()
+        {
+            return _cancellationTokenSource != null;
+        }
         /// <summary>
         /// 覆盖之前的队列
         /// </summary>
@@ -151,5 +154,7 @@ namespace DotXxlJob.Core
            
           
        }
+
+       
     }
 }