From a3a656d06f4411200675710f367bccc0cdab9b8f Mon Sep 17 00:00:00 2001
From: KevinWG <1985088337@qq.com>
Date: Sat, 16 Jan 2021 10:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Job/OSS.Tools.TimerJob/BaseTimerTrigger.cs       | 7 +++++--
 Job/OSS.Tools.TimerJob/OSS.Tools.TimerJob.csproj | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Job/OSS.Tools.TimerJob/BaseTimerTrigger.cs b/Job/OSS.Tools.TimerJob/BaseTimerTrigger.cs
index a0f7783..e5ff9e1 100644
--- a/Job/OSS.Tools.TimerJob/BaseTimerTrigger.cs
+++ b/Job/OSS.Tools.TimerJob/BaseTimerTrigger.cs
@@ -15,7 +15,7 @@ namespace OSS.Tools.TimerJob
         private readonly TimeSpan _periodTime;
         
         private readonly IJobExecutor _jobExcutor;
-        private CancellationToken _cancellationToken;
+        private CancellationToken _cancellationToken=CancellationToken.None;
 
         /// <summary>
         /// 构造函数
@@ -79,7 +79,10 @@ namespace OSS.Tools.TimerJob
         /// <returns></returns>
         private Task StartTimerTrigger(CancellationToken cancellationToken)
         {
-            _cancellationToken = cancellationToken;
+            if (cancellationToken!=CancellationToken.None)
+            {
+                _cancellationToken = cancellationToken;
+            }
 
             if (_timer == null)
                 _timer = new Timer(ExcuteJob, null, _dueTime, _periodTime);
diff --git a/Job/OSS.Tools.TimerJob/OSS.Tools.TimerJob.csproj b/Job/OSS.Tools.TimerJob/OSS.Tools.TimerJob.csproj
index 9b4580c..9bfbc64 100644
--- a/Job/OSS.Tools.TimerJob/OSS.Tools.TimerJob.csproj
+++ b/Job/OSS.Tools.TimerJob/OSS.Tools.TimerJob.csproj
@@ -7,8 +7,9 @@
     <PackageIconUrl>http://img1.osscore.cn/static/oss_net.png</PackageIconUrl>
     <Authors>OSSCore</Authors>
     <Description>Timer Job 基础类封装实现</Description>
-    <Version>1.0.1.7</Version>
-    <PackageReleaseNotes>完善任务的运行状态监控</PackageReleaseNotes>
+    <Version>1.0.1.8</Version>
+    <PackageReleaseNotes></PackageReleaseNotes>
+    <AssemblyVersion>1.0.1.8</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">