机器名变更时，节点名同步变更

NewLifeX · Oct 11, 2023 · 5c98259 · 5c98259
1 parent 0fd234e
commit 5c98259
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Stardust.Data/Nodes/节点.Biz.cs b/Stardust.Data/Nodes/节点.Biz.cs
@@ -535,7 +535,11 @@ public void Fill(NodeInfo di)
         if (!di.Version.IsNullOrEmpty()) node.Version = di.Version;
         if (di.Compile.Year > 2000) node.CompileTime = di.Compile;
 
-        if (!di.MachineName.IsNullOrEmpty()) node.MachineName = di.MachineName;
+        if (!di.MachineName.IsNullOrEmpty())
+        {
+            if (node.Name.IsNullOrEmpty() || node.Name == node.MachineName) node.Name = di.MachineName;
+            node.MachineName = di.MachineName;
+        }
         if (!di.UserName.IsNullOrEmpty()) node.UserName = di.UserName;
         if (!di.IP.IsNullOrEmpty()) node.IP = di.IP;
         if (!di.Product.IsNullOrEmpty()) node.Product = di.Product;

diff --git a/Stardust.Server/Services/AppOnlineService.cs b/Stardust.Server/Services/AppOnlineService.cs
@@ -189,7 +189,11 @@ public Node GetOrAddNode(AppInfo inf, String localIp, String ip)
             if (inf != null)
             {
                 node.Version = inf.Version;
-                node.MachineName = inf.MachineName;
+                if (!inf.MachineName.IsNullOrEmpty())
+                {
+                    if (node.Name.IsNullOrEmpty() || node.Name == node.MachineName) node.Name = inf.MachineName;
+                    node.MachineName = inf.MachineName;
+                }
                 node.UserName = inf.UserName;
             }
             if (node.Name.IsNullOrEmpty()) node.Name = rule.Category;

diff --git a/Stardust.Server/Services/NodeService.cs b/Stardust.Server/Services/NodeService.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Xml.Linq;
 using NewLife;
 using NewLife.Caching;
 using NewLife.Log;