NewLife
/
Stardust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修正Remoting的bug

This commit is contained in:
大石头 2023-09-09 07:19:15 +08:00
parent 782fd64933
commit 7becd1bb21
7 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ClientTest/ClientTest.csproj
View File

@ -20,9 +20,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="NewLife.Redis" Version="5.5.2023.828-beta1607" />
<PackageReference Include="NewLife.UnitTest" Version="1.0.2023.718" />
<PackageReference Include="NewLife.UnitTest" Version="1.0.2023.905" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PrivateAssets>all</PrivateAssets>

2
Stardust.ServerTests/Stardust.ServerTests.csproj
View File

@ -21,7 +21,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">

10
Stardust/LocalStarClient.cs
View File

@ -447,15 +447,6 @@ public class LocalStarClient
var rs = new DefaultMessage();
IPEndPoint ep = null;
buf = udp.Receive(ref ep);
#if NET40
if (buf != null && rs.Read(buf) && encoder.Decode(rs, out var action, out _, out var data))
{
var js = encoder.DecodeResult(action, data, rs);
var info = (AgentInfo)encoder.Convert(js, typeof(AgentInfo));
yield return info;
}
#else
if (buf != null && rs.Read(buf))
{
var msg = encoder.Decode(rs);
@ -467,7 +458,6 @@ public class LocalStarClient
yield return info;
}
}
#endif
}
}
#endregion

4
Stardust/Models/AppInfo.cs
View File

@ -132,11 +132,7 @@ public class AppInfo
try
{
// 调用WindowApi获取进程的连接数
#if NET40
var tcps = NetHelper.GetAllTcpConnections();
#else
var tcps = NetHelper.GetAllTcpConnections(-1);
#endif
if (tcps != null && tcps.Length > 0)
{
Connections = tcps.Count(e => e.ProcessId == Id);

2
Stardust/StarClient.cs
View File

@ -221,9 +221,7 @@ public class StarClient : ApiHttpClient, ICommandClient, IEventProvider
DriveInfo = drives.Join(",", e => $"{e.Name}[{e.DriveFormat}]={e.AvailableFreeSpace.ToGMK()}/{e.TotalSize.ToGMK()}"),
Product = mi.Product,
#if !NET40
Vendor = mi.Vendor,
#endif
Processor = mi.Processor,
CpuRate = mi.CpuRate,
UUID = mi.UUID,

6
Stardust/Stardust.csproj
View File

@ -86,11 +86,11 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='net40'">
<PackageReference Include="NewLife.Core" Version="10.5.2023.903-beta0058" />
<PackageReference Include="NewLife.Remoting" Version="2.3.2023.902-beta1701" />
<PackageReference Include="NewLife.Core" Version="10.5.2023.903" />
<PackageReference Include="NewLife.Remoting" Version="2.3.2023.907" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
<PackageReference Include="NewLife.Core" Version="10.5.2023.801-net40" />
<PackageReference Include="NewLife.Core" Version="10.5.2023.904-net40" />
</ItemGroup>
</Project>

2
Test/Test.csproj
View File

@ -25,7 +25,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.5.2023.903-beta0058" />
<PackageReference Include="NewLife.Core" Version="10.5.2023.906-beta0624" />
<PackageReference Include="SSH.NET" Version="2020.0.2" />
</ItemGroup>