修正TriggerParam类中logId的类型和admin 不一致的问题

build/releasenotes.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<DotXxlJobPackageNotes>
-		1. 修改接口方式为Restful方式，适配xxl-jobv2.2以上版本
+		1. 修正TriggerParam类中logId的类型和admin 不一致的问题
 		</DotXxlJobPackageNotes> 		
 	</PropertyGroup>
 </Project>

build/version.props

@@ -1,5 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<DotXxlJobPackageVersion>2.0.0</DotXxlJobPackageVersion>	
+		<DotXxlJobPackageVersion>2.0.1</DotXxlJobPackageVersion>	
 	</PropertyGroup>
 </Project>

src/DotXxlJob.Core/Logger/IJobLogger.cs

@@ -6,7 +6,7 @@ namespace DotXxlJob.Core
     public interface IJobLogger
     {
 
-        void SetLogFile(long logTime, int logId);
+        void SetLogFile(long logTime, long logId);
         
         void Log(string pattern, params object[] format);
 
@@ -14,10 +14,10 @@ namespace DotXxlJob.Core
         void LogError(Exception ex);
 
 
-        LogResult ReadLog(long logTime, int logId, int fromLine);
+        LogResult ReadLog(long logTime, long logId, int fromLine);
 
         
-        void LogSpecialFile(long logTime, int logId, string pattern, params object[] format);
+        void LogSpecialFile(long logTime, long logId, string pattern, params object[] format);
 
     }
 }

src/DotXxlJob.Core/Logger/JobLogger.cs

@@ -25,7 +25,7 @@ namespace DotXxlJob.Core
             this._options = optionsAccessor.Value;
         }
 
-        public void SetLogFile(long logTime, int logId)
+        public void SetLogFile(long logTime, long logId)
         {
             try
             {
@@ -67,7 +67,7 @@ namespace DotXxlJob.Core
             LogDetail(GetLogFileName(), callInfo, ex.Message + ex.StackTrace);
         }
 
-        public LogResult ReadLog(long logTime, int logId, int fromLine)
+        public LogResult ReadLog(long logTime, long logId, int fromLine)
         {
             var filePath = MakeLogFileName(logTime, logId);
             if (string.IsNullOrEmpty(filePath))
@@ -107,7 +107,7 @@ namespace DotXxlJob.Core
             return logResult;
         }
 
-        public void LogSpecialFile(long logTime, int logId, string pattern, params object[] format)
+        public void LogSpecialFile(long logTime, long logId, string pattern, params object[] format)
         {
             var filePath = MakeLogFileName(logTime, logId);
             var callInfo = new StackTrace(true).GetFrame(1);
@@ -120,7 +120,7 @@ namespace DotXxlJob.Core
         {
             return LogFileName.Value;
         }
-        private string MakeLogFileName(long logDateTime, int logId)
+        private string MakeLogFileName(long logDateTime, long logId)
         {
             //log fileName like: logPath/HandlerLogs/yyyy-MM-dd/9999.log
             return Path.Combine(this._options.LogPath, Constants.HandleLogsDirectory,

src/DotXxlJob.Core/Model/HandleCallbackParam.cs

@@ -20,7 +20,7 @@ namespace DotXxlJob.Core.Model
         public int CallbackRetryTimes { get; set; }
         
         [DataMember(Name = "logId",Order = 1)]
-        public int LogId { get; set; }
+        public long LogId { get; set; }
         [DataMember(Name = "logDateTim",Order = 2)]
         public long LogDateTime { get; set; }
         [DataMember(Name = "executeResult",Order = 3)]

src/DotXxlJob.Core/Model/TriggerParam.cs

@@ -23,7 +23,7 @@ namespace DotXxlJob.Core.Model
         public int ExecutorTimeout{ get; set; }
         
         [DataMember(Name = "logId",Order = 5)]
-        public int LogId{ get; set; }
+        public long LogId { get; set; }
         [DataMember(Name = "logDateTime", Order = 6)]
         public long LogDateTime{ get; set; }
         

src/DotXxlJob.Core/Queue/JobTaskQueue.cs

@@ -13,7 +13,7 @@ namespace DotXxlJob.Core
         private readonly IJobLogger _jobLogger;
         private readonly ILogger<JobTaskQueue> _logger;
         private readonly ConcurrentQueue<TriggerParam> TASK_QUEUE = new ConcurrentQueue<TriggerParam>();
-        private readonly ConcurrentDictionary<int, byte> ID_IN_QUEUE = new ConcurrentDictionary<int, byte>();
+        private readonly ConcurrentDictionary<long, byte> ID_IN_QUEUE = new ConcurrentDictionary<long, byte>();
         private CancellationTokenSource _cancellationTokenSource;
         private Task _runTask;
         public JobTaskQueue(ITaskExecutor executor,IJobLogger jobLogger,ILogger<JobTaskQueue> logger)