From 23c75230784d24929ca82cfbe1872f988d1bf360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=A4=A7=E7=9F=B3=E5=A4=B4?= Date: Thu, 22 May 2025 17:42:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0Remark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AntJob.Data/Ant.htm | 44 +++++++++++++------------- AntJob.Data/Entity/作业任务.Biz.cs | 2 +- AntJob.Data/Entity/作业任务.cs | 33 +++++++++---------- AntJob.Data/Entity/作业错误.Biz.cs | 8 ++--- AntJob.Data/Entity/作业错误.cs | 33 +++++++++---------- AntJob.Data/Model.xml | 4 +-- AntJob.Server/Services/JobService.cs | 6 ++-- AntJob/Data/ITaskResult.cs | 2 +- AntJob/Data/TaskResult.cs | 2 +- AntJob/Providers/NetworkJobProvider.cs | 4 +-- 10 files changed, 70 insertions(+), 68 deletions(-) diff --git a/AntJob.Data/Ant.htm b/AntJob.Data/Ant.htm index 19a94ec..f27fc8e 100644 --- a/AntJob.Data/Ant.htm +++ b/AntJob.Data/Ant.htm @@ -1393,17 +1393,6 @@ 可以是Json数据，比如StatID - - Message - 消息内容 - String - - - - - Handler内记录的异常信息或其它任务消息 - - TraceId 追踪 @@ -1458,6 +1447,17 @@ + + + Remark + 备注 + String + + + + + +

@@ -1586,17 +1586,6 @@ - - Message - 内容 - String - 2000 - - - - - - TraceId 追踪 @@ -1651,6 +1640,17 @@ + + + Remark + 备注 + String + + + + + +

diff --git a/AntJob.Data/Entity/作业任务.Biz.cs b/AntJob.Data/Entity/作业任务.Biz.cs index e8f6c7e..7b910b6 100644 --- a/AntJob.Data/Entity/作业任务.Biz.cs +++ b/AntJob.Data/Entity/作业任务.Biz.cs @@ -154,7 +154,7 @@ public partial class JobTask : EntityBase if (jobid >= 0) exp &= _.JobID == jobid; if (status >= JobStatus.就绪) exp &= _.Status == status; if (!client.IsNullOrEmpty()) exp &= _.Client == client; - if (!key.IsNullOrEmpty()) exp &= _.Data.Contains(key) | _.Message.Contains(key) | _.Key == key; + if (!key.IsNullOrEmpty()) exp &= _.Data.Contains(key) | _.Remark.Contains(key) | _.Key == key; exp &= _.DataTime.Between(dataStart, dataEnd); exp &= _.UpdateTime.Between(start, end); diff --git a/AntJob.Data/Entity/作业任务.cs b/AntJob.Data/Entity/作业任务.cs index d9ad2ff..eb42e88 100644 --- a/AntJob.Data/Entity/作业任务.cs +++ b/AntJob.Data/Entity/作业任务.cs @@ -185,14 +185,6 @@ public partial class JobTask [BindColumn("Data", "数据。可以是Json数据，比如StatID", "")] public String Data { get => _Data; set { if (OnPropertyChanging("Data", value)) { _Data = value; OnPropertyChanged("Data"); } } } - private String _Message; - /// 消息内容。Handler内记录的异常信息或其它任务消息 - [DisplayName("消息内容")] - [Description("消息内容。Handler内记录的异常信息或其它任务消息")] - [DataObjectField(false, false, true, -1)] - [BindColumn("Message", "消息内容。Handler内记录的异常信息或其它任务消息", "")] - public String Message { get => _Message; set { if (OnPropertyChanging("Message", value)) { _Message = value; OnPropertyChanged("Message"); } } } - private String _TraceId; /// 追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链 [Category("扩展")] @@ -237,6 +229,15 @@ public partial class JobTask [DataObjectField(false, false, true, 0)] [BindColumn("UpdateTime", "更新时间", "")] public DateTime UpdateTime { get => _UpdateTime; set { if (OnPropertyChanging("UpdateTime", value)) { _UpdateTime = value; OnPropertyChanged("UpdateTime"); } } } + + private String _Remark; + /// 备注 + [Category("扩展")] + [DisplayName("备注")] + [Description("备注")] + [DataObjectField(false, false, true, -1)] + [BindColumn("Remark", "备注", "")] + public String Remark { get => _Remark; set { if (OnPropertyChanging("Remark", value)) { _Remark = value; OnPropertyChanged("Remark"); } } } #endregion #region 获取/设置 字段值 @@ -267,12 +268,12 @@ public partial class JobTask "ProcessID" => _ProcessID, "Key" => _Key, "Data" => _Data, - "Message" => _Message, "TraceId" => _TraceId, "CreateIP" => _CreateIP, "CreateTime" => _CreateTime, "UpdateIP" => _UpdateIP, "UpdateTime" => _UpdateTime, + "Remark" => _Remark, _ => base[name] }; set @@ -299,12 +300,12 @@ public partial class JobTask case "ProcessID": _ProcessID = value.ToInt(); break; case "Key": _Key = Convert.ToString(value); break; case "Data": _Data = Convert.ToString(value); break; - case "Message": _Message = Convert.ToString(value); break; case "TraceId": _TraceId = Convert.ToString(value); break; case "CreateIP": _CreateIP = Convert.ToString(value); break; case "CreateTime": _CreateTime = value.ToDateTime(); break; case "UpdateIP": _UpdateIP = Convert.ToString(value); break; case "UpdateTime": _UpdateTime = value.ToDateTime(); break; + case "Remark": _Remark = Convert.ToString(value); break; default: base[name] = value; break; } } @@ -439,9 +440,6 @@ public partial class JobTask /// 数据。可以是Json数据，比如StatID public static readonly Field Data = FindByName("Data"); - /// 消息内容。Handler内记录的异常信息或其它任务消息 - public static readonly Field Message = FindByName("Message"); - /// 追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链 public static readonly Field TraceId = FindByName("TraceId"); @@ -457,6 +455,9 @@ public partial class JobTask /// 更新时间 public static readonly Field UpdateTime = FindByName("UpdateTime"); + /// 备注 + public static readonly Field Remark = FindByName("Remark"); + static Field FindByName(String name) => Meta.Table.FindByName(name); } @@ -523,9 +524,6 @@ public partial class JobTask /// 数据。可以是Json数据，比如StatID public const String Data = "Data"; - /// 消息内容。Handler内记录的异常信息或其它任务消息 - public const String Message = "Message"; - /// 追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链 public const String TraceId = "TraceId"; @@ -540,6 +538,9 @@ public partial class JobTask /// 更新时间 public const String UpdateTime = "UpdateTime"; + + /// 备注 + public const String Remark = "Remark"; } #endregion } diff --git a/AntJob.Data/Entity/作业错误.Biz.cs b/AntJob.Data/Entity/作业错误.Biz.cs index 7f3eca5..4eaf50a 100644 --- a/AntJob.Data/Entity/作业错误.Biz.cs +++ b/AntJob.Data/Entity/作业错误.Biz.cs @@ -26,9 +26,9 @@ public partial class JobError : EntityBase // 如果没有脏数据，则不需要进行任何处理 if (!HasDirty) return; - // 截断错误信息，避免过长 - var len = _.Message.Length; - if (!Message.IsNullOrEmpty() && len > 0 && Message.Length > len) Message = Message.Substring(0, len); + //// 截断错误信息，避免过长 + //var len = _.Message.Length; + //if (!Message.IsNullOrEmpty() && len > 0 && Message.Length > len) Message = Message.Substring(0, len); } #endregion @@ -115,7 +115,7 @@ public partial class JobError : EntityBase if (appid > 0) exp &= _.AppID == appid; if (jobid > 0) exp &= _.JobID == jobid; if (!client.IsNullOrEmpty()) exp &= _.Client == client; - if (!key.IsNullOrEmpty()) exp &= _.Message.Contains(key); + if (!key.IsNullOrEmpty()) exp &= _.Remark.Contains(key); exp &= _.DataTime.Between(start, end); return FindAll(exp, p); diff --git a/AntJob.Data/Entity/作业错误.cs b/AntJob.Data/Entity/作业错误.cs index 31396f0..691caeb 100644 --- a/AntJob.Data/Entity/作业错误.cs +++ b/AntJob.Data/Entity/作业错误.cs @@ -103,14 +103,6 @@ public partial class JobError [BindColumn("ProcessID", "进程", "")] public Int32 ProcessID { get => _ProcessID; set { if (OnPropertyChanging("ProcessID", value)) { _ProcessID = value; OnPropertyChanged("ProcessID"); } } } - private String _Message; - /// 内容 - [DisplayName("内容")] - [Description("内容")] - [DataObjectField(false, false, true, 2000)] - [BindColumn("Message", "内容", "")] - public String Message { get => _Message; set { if (OnPropertyChanging("Message", value)) { _Message = value; OnPropertyChanged("Message"); } } } - private String _TraceId; /// 追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链 [Category("扩展")] @@ -155,6 +147,15 @@ public partial class JobError [DataObjectField(false, false, true, 0)] [BindColumn("UpdateTime", "更新时间", "")] public DateTime UpdateTime { get => _UpdateTime; set { if (OnPropertyChanging("UpdateTime", value)) { _UpdateTime = value; OnPropertyChanged("UpdateTime"); } } } + + private String _Remark; + /// 备注 + [Category("扩展")] + [DisplayName("备注")] + [Description("备注")] + [DataObjectField(false, false, true, -1)] + [BindColumn("Remark", "备注", "")] + public String Remark { get => _Remark; set { if (OnPropertyChanging("Remark", value)) { _Remark = value; OnPropertyChanged("Remark"); } } } #endregion #region 获取/设置 字段值 @@ -175,12 +176,12 @@ public partial class JobError "Data" => _Data, "Server" => _Server, "ProcessID" => _ProcessID, - "Message" => _Message, "TraceId" => _TraceId, "CreateIP" => _CreateIP, "CreateTime" => _CreateTime, "UpdateIP" => _UpdateIP, "UpdateTime" => _UpdateTime, + "Remark" => _Remark, _ => base[name] }; set @@ -197,12 +198,12 @@ public partial class JobError case "Data": _Data = Convert.ToString(value); break; case "Server": _Server = Convert.ToString(value); break; case "ProcessID": _ProcessID = value.ToInt(); break; - case "Message": _Message = Convert.ToString(value); break; case "TraceId": _TraceId = Convert.ToString(value); break; case "CreateIP": _CreateIP = Convert.ToString(value); break; case "CreateTime": _CreateTime = value.ToDateTime(); break; case "UpdateIP": _UpdateIP = Convert.ToString(value); break; case "UpdateTime": _UpdateTime = value.ToDateTime(); break; + case "Remark": _Remark = Convert.ToString(value); break; default: base[name] = value; break; } } @@ -273,9 +274,6 @@ public partial class JobError /// 进程 public static readonly Field ProcessID = FindByName("ProcessID"); - /// 内容 - public static readonly Field Message = FindByName("Message"); - /// 追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链 public static readonly Field TraceId = FindByName("TraceId"); @@ -291,6 +289,9 @@ public partial class JobError /// 更新时间 public static readonly Field UpdateTime = FindByName("UpdateTime"); + /// 备注 + public static readonly Field Remark = FindByName("Remark"); + static Field FindByName(String name) => Meta.Table.FindByName(name); } @@ -327,9 +328,6 @@ public partial class JobError /// 进程 public const String ProcessID = "ProcessID"; - /// 内容 - public const String Message = "Message"; - /// 追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链 public const String TraceId = "TraceId"; @@ -344,6 +342,9 @@ public partial class JobError /// 更新时间 public const String UpdateTime = "UpdateTime"; + + /// 备注 + public const String Remark = "Remark"; } #endregion } diff --git a/AntJob.Data/Model.xml b/AntJob.Data/Model.xml index 03c5f7c..e49ed6a 100644 --- a/AntJob.Data/Model.xml +++ b/AntJob.Data/Model.xml @@ -187,12 +187,12 @@ - + @@ -213,12 +213,12 @@ - + diff --git a/AntJob.Server/Services/JobService.cs b/AntJob.Server/Services/JobService.cs index 66ed1bc..38b8b3f 100644 --- a/AntJob.Server/Services/JobService.cs +++ b/AntJob.Server/Services/JobService.cs @@ -440,7 +440,7 @@ public class JobService(AppService appService, ICacheProvider cacheProvider, ITr task.Success = result.Success; task.Cost = (Int32)Math.Round(result.Cost / 1000d); task.Key = result.Key; - task.Message = result.Message; + task.Remark = result.Remark; var traceId = result.TraceId ?? DefaultSpan.Current + ""; // 已终结的任务，汇总统计 @@ -549,9 +549,9 @@ public class JobService(AppService appService, ICacheProvider cacheProvider, ITr UpdateTime = DateTime.Now, }; - var msg = task.Message; + var msg = task.Remark; if (!msg.IsNullOrEmpty() && msg.Contains("Exception:")) msg = msg.Substring("Exception:").Trim(); - err.Message = msg; + err.Remark = msg; err.Insert(); diff --git a/AntJob/Data/ITaskResult.cs b/AntJob/Data/ITaskResult.cs index 4929d5b..cda1c90 100644 --- a/AntJob/Data/ITaskResult.cs +++ b/AntJob/Data/ITaskResult.cs @@ -10,5 +10,5 @@ public interface ITaskResult JobStatus Status { get; set; } /// 消息内容。异常信息或其它任务消息 - String Message { get; set; } + String Remark { get; set; } } \ No newline at end of file diff --git a/AntJob/Data/TaskResult.cs b/AntJob/Data/TaskResult.cs index b0c2fd7..b65600a 100644 --- a/AntJob/Data/TaskResult.cs +++ b/AntJob/Data/TaskResult.cs @@ -38,6 +38,6 @@ public partial class TaskResult : ITaskResult public String TraceId { get; set; } /// 消息内容。异常信息或其它任务消息 - public String Message { get; set; } + public String Remark { get; set; } #endregion } \ No newline at end of file diff --git a/AntJob/Providers/NetworkJobProvider.cs b/AntJob/Providers/NetworkJobProvider.cs index b81d3d0..6e77eb2 100644 --- a/AntJob/Providers/NetworkJobProvider.cs +++ b/AntJob/Providers/NetworkJobProvider.cs @@ -281,7 +281,7 @@ public class NetworkJobProvider(AntSetting setting) : JobProvider var msg = ctx.Error.GetMessage(); var p = msg.IndexOf("Exception:"); if (p >= 0) msg = msg.Substring(p + "Exception:".Length).Trim(); - task.Message = msg; + task.Remark = msg; } } else if (ctx.Status == JobStatus.延迟) @@ -294,7 +294,7 @@ public class NetworkJobProvider(AntSetting setting) : JobProvider } task.Cost = (Int32)Math.Round(ctx.Cost); - if (task.Message.IsNullOrEmpty()) task.Message = ctx.Remark; + if (task.Remark.IsNullOrEmpty()) task.Remark = ctx.Remark; task.Key = ctx.Key;