From f6478ebb5ecb184e7b75a108f86c9fc5df68d5d7 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, 29 Aug 2024 21:54:25 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E5=8D=87=E7=BA=A7=E6=A0=B8=E5=BF=83?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=AF=B9GetProcessName2?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plugins/MySqlAgent/MySqlAgent.csproj | 2 +- Samples/TestA/TestA.csproj | 2 +- Samples/TestB/TestB.csproj | 2 +- StarAgent/StarAgent.csproj | 18 +++++++++--------- Stardust.Data/Stardust.Data.csproj | 2 +- Stardust.Server/Stardust.Server.csproj | 4 ++-- Stardust.Web/Stardust.Web.csproj | 6 +++--- Stardust/Models/AppInfo.cs | 2 +- Stardust/StarClient.cs | 2 +- Stardust/Stardust.csproj | 4 ++-- Test/Test.csproj | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Plugins/MySqlAgent/MySqlAgent.csproj b/Plugins/MySqlAgent/MySqlAgent.csproj index 53965ebc..241aa212 100644 --- a/Plugins/MySqlAgent/MySqlAgent.csproj +++ b/Plugins/MySqlAgent/MySqlAgent.csproj @@ -20,7 +20,7 @@ - + diff --git a/Samples/TestA/TestA.csproj b/Samples/TestA/TestA.csproj index 2de5d57d..ec0c32d2 100644 --- a/Samples/TestA/TestA.csproj +++ b/Samples/TestA/TestA.csproj @@ -18,7 +18,7 @@ - + diff --git a/Samples/TestB/TestB.csproj b/Samples/TestB/TestB.csproj index c324fe7d..c707bde7 100644 --- a/Samples/TestB/TestB.csproj +++ b/Samples/TestB/TestB.csproj @@ -18,7 +18,7 @@ - + diff --git a/StarAgent/StarAgent.csproj b/StarAgent/StarAgent.csproj index 025ce79c..27101270 100644 --- a/StarAgent/StarAgent.csproj +++ b/StarAgent/StarAgent.csproj @@ -42,8 +42,8 @@ - - + + @@ -52,43 +52,43 @@ - 10.10.2024.809-beta0600 + 10.10.2024.825-beta0722 - 10.10.2024.809-beta0600 + 10.10.2024.825-beta0722 - 10.10.2024.809-beta0600 + 10.10.2024.825-beta0722 - 10.10.2024.809-beta0600 + 10.10.2024.825-beta0722 - 10.10.2024.809-beta0600 + 10.10.2024.825-beta0722 - 10.10.2024.809-beta0600 + 10.10.2024.825-beta0722 - 10.10.2024.809-beta0600 + 10.10.2024.825-beta0722 diff --git a/Stardust.Data/Stardust.Data.csproj b/Stardust.Data/Stardust.Data.csproj index f056a48f..2c119184 100644 --- a/Stardust.Data/Stardust.Data.csproj +++ b/Stardust.Data/Stardust.Data.csproj @@ -41,7 +41,7 @@ - + diff --git a/Stardust.Server/Stardust.Server.csproj b/Stardust.Server/Stardust.Server.csproj index bb694047..3bdb7405 100644 --- a/Stardust.Server/Stardust.Server.csproj +++ b/Stardust.Server/Stardust.Server.csproj @@ -44,9 +44,9 @@ - + - + diff --git a/Stardust.Web/Stardust.Web.csproj b/Stardust.Web/Stardust.Web.csproj index f9d13773..a5efec85 100644 --- a/Stardust.Web/Stardust.Web.csproj +++ b/Stardust.Web/Stardust.Web.csproj @@ -50,10 +50,10 @@ - - + + - + diff --git a/Stardust/Models/AppInfo.cs b/Stardust/Models/AppInfo.cs index 077c3c6a..5fba9007 100644 --- a/Stardust/Models/AppInfo.cs +++ b/Stardust/Models/AppInfo.cs @@ -91,7 +91,7 @@ public AppInfo(Process process) try { Id = process.Id; - Name = process.GetProcessName2(); + Name = process.GetProcessName(); //StartTime = process.StartTime; //ProcessorTime = (Int64)process.TotalProcessorTime.TotalMilliseconds; diff --git a/Stardust/StarClient.cs b/Stardust/StarClient.cs index 6d937ba8..33c8fff4 100644 --- a/Stardust/StarClient.cs +++ b/Stardust/StarClient.cs @@ -298,7 +298,7 @@ public override IPingRequest BuildPingRequest() { if (Runtime.Linux && item.SessionId == 0) continue; - var name = item.GetProcessName2(); + var name = item.GetProcessName(); if (name.EqualIgnoreCase(_excludes) || exs.Any(e => e.IsMatch(name))) continue; if (!pcs.Contains(name)) pcs.Add(name); diff --git a/Stardust/Stardust.csproj b/Stardust/Stardust.csproj index 1a8167a0..7e05bd5d 100644 --- a/Stardust/Stardust.csproj +++ b/Stardust/Stardust.csproj @@ -112,10 +112,10 @@ - + - + diff --git a/Test/Test.csproj b/Test/Test.csproj index 48c7a2d9..8761552d 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -30,7 +30,7 @@ - +