上传Remark

AntJob.Data/Ant.htm

@@ -1393,17 +1393,6 @@
             <td>可以是Json数据，比如StatID</td>
         </tr>
 
-        <tr>
-            <td>Message</td>
-            <td>消息内容</td>
-            <td>String</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>Handler内记录的异常信息或其它任务消息</td>
-        </tr>
-
         <tr>
             <td>TraceId</td>
             <td>追踪</td>
@@ -1458,6 +1447,17 @@
             <td></td>
             <td></td>
         </tr>
+
+        <tr>
+            <td>Remark</td>
+            <td>备注</td>
+            <td>String</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+        </tr>
     </tbody>
 </table>
 <br></br>
@@ -1586,17 +1586,6 @@
             <td></td>
         </tr>
 
-        <tr>
-            <td>Message</td>
-            <td>内容</td>
-            <td>String</td>
-            <td>2000</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-        </tr>
-
         <tr>
             <td>TraceId</td>
             <td>追踪</td>
@@ -1651,6 +1640,17 @@
             <td></td>
             <td></td>
         </tr>
+
+        <tr>
+            <td>Remark</td>
+            <td>备注</td>
+            <td>String</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+        </tr>
     </tbody>
 </table>
 <br></br>

AntJob.Data/Entity/作业任务.Biz.cs

@@ -154,7 +154,7 @@ public partial class JobTask : EntityBase<JobTask>
         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);

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;
-    /// <summary>消息内容。Handler内记录的异常信息或其它任务消息</summary>
-    [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;
     /// <summary>追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链</summary>
     [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;
+    /// <summary>备注</summary>
+    [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
         /// <summary>数据。可以是Json数据，比如StatID</summary>
         public static readonly Field Data = FindByName("Data");
 
-        /// <summary>消息内容。Handler内记录的异常信息或其它任务消息</summary>
-        public static readonly Field Message = FindByName("Message");
-
         /// <summary>追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链</summary>
         public static readonly Field TraceId = FindByName("TraceId");
 
@@ -457,6 +455,9 @@ public partial class JobTask
         /// <summary>更新时间</summary>
         public static readonly Field UpdateTime = FindByName("UpdateTime");
 
+        /// <summary>备注</summary>
+        public static readonly Field Remark = FindByName("Remark");
+
         static Field FindByName(String name) => Meta.Table.FindByName(name);
     }
 
@@ -523,9 +524,6 @@ public partial class JobTask
         /// <summary>数据。可以是Json数据，比如StatID</summary>
         public const String Data = "Data";
 
-        /// <summary>消息内容。Handler内记录的异常信息或其它任务消息</summary>
-        public const String Message = "Message";
-
         /// <summary>追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链</summary>
         public const String TraceId = "TraceId";
 
@@ -540,6 +538,9 @@ public partial class JobTask
 
         /// <summary>更新时间</summary>
         public const String UpdateTime = "UpdateTime";
+
+        /// <summary>备注</summary>
+        public const String Remark = "Remark";
     }
     #endregion
 }

AntJob.Data/Entity/作业错误.Biz.cs

@@ -26,9 +26,9 @@ public partial class JobError : EntityBase<JobError>
         // 如果没有脏数据，则不需要进行任何处理
         if (!HasDirty) return;
 
-        // 截断错误信息，避免过长
+        //// 截断错误信息，避免过长
-        var len = _.Message.Length;
+        //var len = _.Message.Length;
-        if (!Message.IsNullOrEmpty() && len > 0 && Message.Length > len) Message = Message.Substring(0, len);
+        //if (!Message.IsNullOrEmpty() && len > 0 && Message.Length > len) Message = Message.Substring(0, len);
     }
     #endregion
 
@@ -115,7 +115,7 @@ public partial class JobError : EntityBase<JobError>
         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);

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;
-    /// <summary>内容</summary>
-    [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;
     /// <summary>追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链</summary>
     [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;
+    /// <summary>备注</summary>
+    [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
         /// <summary>进程</summary>
         public static readonly Field ProcessID = FindByName("ProcessID");
 
-        /// <summary>内容</summary>
-        public static readonly Field Message = FindByName("Message");
-
         /// <summary>追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链</summary>
         public static readonly Field TraceId = FindByName("TraceId");
 
@@ -291,6 +289,9 @@ public partial class JobError
         /// <summary>更新时间</summary>
         public static readonly Field UpdateTime = FindByName("UpdateTime");
 
+        /// <summary>备注</summary>
+        public static readonly Field Remark = FindByName("Remark");
+
         static Field FindByName(String name) => Meta.Table.FindByName(name);
     }
 
@@ -327,9 +328,6 @@ public partial class JobError
         /// <summary>进程</summary>
         public const String ProcessID = "ProcessID";
 
-        /// <summary>内容</summary>
-        public const String Message = "Message";
-
         /// <summary>追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链</summary>
         public const String TraceId = "TraceId";
 
@@ -344,6 +342,9 @@ public partial class JobError
 
         /// <summary>更新时间</summary>
         public const String UpdateTime = "UpdateTime";
+
+        /// <summary>备注</summary>
+        public const String Remark = "Remark";
     }
     #endregion
 }

AntJob.Data/Model.xml

@@ -187,12 +187,12 @@
         <Column Name="ProcessID" DataType="Int32" Description="进程" />
         <Column Name="Key" DataType="String" Description="最后键。Handler内记录作为样本的数据" />
         <Column Name="Data" DataType="String" Length="-1" Description="数据。可以是Json数据，比如StatID" />
-        <Column Name="Message" DataType="String" Length="-1" Description="消息内容。Handler内记录的异常信息或其它任务消息" />
         <Column Name="TraceId" DataType="String" Length="200" Description="追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链" Category="扩展" />
         <Column Name="CreateIP" DataType="String" Description="创建地址" Category="扩展" />
         <Column Name="CreateTime" DataType="DateTime" Description="创建时间" Category="扩展" />
         <Column Name="UpdateIP" DataType="String" Description="更新地址" Category="扩展" />
         <Column Name="UpdateTime" DataType="DateTime" Description="更新时间" Category="扩展" />
+        <Column Name="Remark" DataType="String" Length="-1" Description="备注" Category="扩展" />
       </Columns>
       <Indexes>
         <Index Columns="JobID,DataTime" />
@@ -213,12 +213,12 @@
         <Column Name="Data" DataType="String" Length="2000" Description="数据" />
         <Column Name="Server" DataType="String" Description="服务器" />
         <Column Name="ProcessID" DataType="Int32" Description="进程" />
-        <Column Name="Message" DataType="String" Length="2000" Description="内容" />
         <Column Name="TraceId" DataType="String" Length="200" Description="追踪。链路追踪，用于APM性能追踪定位，还原该事件的调用链" Category="扩展" />
         <Column Name="CreateIP" DataType="String" Description="创建地址" Category="扩展" />
         <Column Name="CreateTime" DataType="DateTime" Description="创建时间" Category="扩展" />
         <Column Name="UpdateIP" DataType="String" Description="更新地址" Category="扩展" />
         <Column Name="UpdateTime" DataType="DateTime" Description="更新时间" Category="扩展" />
+        <Column Name="Remark" DataType="String" Length="-1" Description="备注" Category="扩展" />
       </Columns>
       <Indexes>
         <Index Columns="AppID,ID" />

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();
 

AntJob/Data/ITaskResult.cs

@@ -10,5 +10,5 @@ public interface ITaskResult
     JobStatus Status { get; set; }
 
     /// <summary>消息内容。异常信息或其它任务消息</summary>
-    String Message { get; set; }
+    String Remark { get; set; }
 }

AntJob/Data/TaskResult.cs

@@ -38,6 +38,6 @@ public partial class TaskResult : ITaskResult
     public String TraceId { get; set; }
 
     /// <summary>消息内容。异常信息或其它任务消息</summary>
-    public String Message { get; set; }
+    public String Remark { get; set; }
     #endregion
 }

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;