优化展示形式

Author: 欧俊

src/azure.devops.notify.dingtalk.robots/Controllers/WebHookController.cs

@@ -131,40 +131,6 @@ public async Task<IActionResult> WorkitemUpdated([FromBody] WebHooksRequestInput
                 stringBuilder.AppendLine();
             }
 
-            var changeStatus = request.Resource.Fields.GetValueOrDefault("System.State");
-            if (changeStatus != null)
-            {
-                try
-                {
-                    var ch = changeStatus.ToValueChangeModel();
-                    if (ch.OldValue != ch.NewValue)
-                    {
-                        stringBuilder.AppendLine($"- 状态变更: {ch.OldValue} 更改为 {ch.NewValue}");
-                        stringBuilder.AppendLine();
-                    }
-                }
-                catch
-                {
-                }
-            }
-
-            var changeAssignedTo = request.Resource.Fields.GetValueOrDefault("System.AssignedTo");
-            if (changeAssignedTo != null)
-            {
-                try
-                {
-                    var ch = changeAssignedTo.ToValueChangeModel();
-                    if (ch.OldValue != ch.NewValue)
-                    {
-                        stringBuilder.AppendLine($"- 指派变更: {ch.OldValue} 更改为 @{ch.NewValue}");
-                        stringBuilder.AppendLine();
-                    }
-                }
-                catch
-                {
-                }
-            }
-
             var history = request.Resource.Revision.Fields.GetValueOrDefault("System.History");
             if (history != null)
             {
@@ -176,6 +142,8 @@ public async Task<IActionResult> WorkitemUpdated([FromBody] WebHooksRequestInput
                 stringBuilder.AppendLine();
             }
 
+            var changeStatus = request.Resource.Fields.GetValueOrDefault("System.State");
+            var changeAssignedTo = request.Resource.Fields.GetValueOrDefault("System.AssignedTo");
             var priority = request.Resource.Fields.GetValueOrDefault("Microsoft.VSTS.Common.Priority");
             var remainingWork = request.Resource.Fields.GetValueOrDefault("Microsoft.VSTS.Scheduling.RemainingWork");
             var originalEstimate = request.Resource.Fields.GetValueOrDefault("Microsoft.VSTS.Scheduling.OriginalEstimate");
@@ -198,6 +166,36 @@ public async Task<IActionResult> WorkitemUpdated([FromBody] WebHooksRequestInput
                     {
                     }
                 }
+                if (changeStatus != null)
+                {
+                    try
+                    {
+                        var ch = changeStatus.ToValueChangeModel();
+                        if (ch.OldValue != ch.NewValue)
+                        {
+                            stringBuilder.AppendLine($"> 状态变更: {ch.OldValue} 更改为 {ch.NewValue}");
+                            stringBuilder.AppendLine();
+                        }
+                    }
+                    catch
+                    {
+                    }
+                }
+                if (changeAssignedTo != null)
+                {
+                    try
+                    {
+                        var ch = changeAssignedTo.ToValueChangeModel();
+                        if (ch.OldValue != ch.NewValue)
+                        {
+                            stringBuilder.AppendLine($"> 指派变更: {$"{ch.OldValue}".Split(' ')?[0]} 更改为 @{$"{ch.NewValue}".Split(' ')?[0]}");
+                            stringBuilder.AppendLine();
+                        }
+                    }
+                    catch
+                    {
+                    }
+                }
                 if (remainingWork != null)
                 {
                     try
@@ -243,6 +241,13 @@ public async Task<IActionResult> WorkitemUpdated([FromBody] WebHooksRequestInput
                             var ch = node.ToValueChangeModel();
                             if (ch.OldValue != ch.NewValue)
                             {
+                                var o = $"{ch.OldValue}";
+                                var n = $"{ch.NewValue}";
+                                if (!string.IsNullOrWhiteSpace(setting.Format))
+                                {
+                                    o = string.Format($"{{0:{setting.Format}}}", o);
+                                    n = string.Format($"{{0:{setting.Format}}}", n);
+                                }
                                 stringBuilder.AppendLine($"> {setting.Name}: {ch.OldValue} 更改为 {ch.NewValue}");
                                 stringBuilder.AppendLine();
                             }

src/azure.devops.notify.dingtalk.robots/Dtos/RobotConfiguration.cs

@@ -29,5 +29,6 @@ public class CustomNode
     {
         public string Key { get; set; }
         public string Name { get; set; }
+        public string Format { get; set; }
     }
 }