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

优化本地检测安装星尘代理的逻辑

This commit is contained in:
大石头 2021-12-05 15:03:26 +08:00
parent b2f6240b67
commit e2649d692a
6 changed files with 126 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
StarAgent/StarAgent.csproj
View File

@ -40,7 +40,7 @@
<Reference Include="System.Web.Extensions" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Agent" Version="8.8.2021.1109" />
<PackageReference Include="NewLife.Agent" Version="8.8.2021.1204" />
</ItemGroup>
<ItemGroup>

2
StarAgentTool/StarAgentTool.csproj
View File

@ -48,7 +48,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.Agent" Version="8.8.2021.1109" />
<PackageReference Include="NewLife.Agent" Version="8.8.2021.1204" />
</ItemGroup>
<ItemGroup>

2
Stardust.Server/Stardust.Server.csproj
View File

@ -40,7 +40,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Redis" Version="3.9.2021.1001" />
<PackageReference Include="NewLife.Redis" Version="3.9.2021.1204" />
</ItemGroup>
<ItemGroup>

4
Stardust.Web/Stardust.Web.csproj
View File

@ -47,8 +47,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="4.1.2021.1130-beta2" />
<PackageReference Include="NewLife.Redis" Version="3.9.2021.1001" />
<PackageReference Include="NewLife.Cube.Core" Version="4.3.2021.1204" />
<PackageReference Include="NewLife.Redis" Version="3.9.2021.1204" />
</ItemGroup>
<ItemGroup>

136
Stardust/LocalStarClient.cs
View File

@ -119,22 +119,23 @@ namespace Stardust
if (url.IsNullOrEmpty())
{
var set = NewLife.Setting.Current;
url = set.PluginServer.CombinePath("star");
url = set.PluginServer.EnsureEnd("/");
url += "star/";
if (Environment.Version.Major >= 6)
url = url.CombinePath("staragent60.zip");
url += "staragent60.zip";
else if (Environment.Version.Major >= 5)
url = url.CombinePath("staragent50.zip");
url += "staragent50.zip";
else if (Environment.Version.Major >= 4)
url = url.CombinePath("staragent45.zip");
url += "staragent45.zip";
else
url = url.CombinePath("staragent31.zip");
url += "staragent31.zip";
}
// 尝试连接，获取版本
try
{
var info = GetInfo();
if (info == null)
if (info != null)
{
// 比目标版本高，不需要安装
if (String.Compare(info.Version, version) >= 0) return true;
@ -198,16 +199,13 @@ namespace Stardust
{
// 在进程中查找
var info = Info;
var inService = info?.Arguments == "-s";
var p = info != null && info.ProcessId > 0 ?
Process.GetProcessById(info.ProcessId) :
Process.GetProcesses().FirstOrDefault(e => e.ProcessName == "StarAgent");
// 在Linux中设置执行权限
var fileName = info?.FileName ?? target.CombinePath(Runtime.Linux ? "StarAgent" : "StarAgent.exe");
if (File.Exists(fileName) && Runtime.Linux) Process.Start("chmod", $"+x {fileName}");
// 重启目标
if (p != null)
if (p != null && !inService)
{
try
{
@ -220,22 +218,108 @@ namespace Stardust
}
}
if (File.Exists(fileName))
var fileName = info?.FileName;
if (!fileName.IsNullOrEmpty() && Path.GetFullPath(fileName).EqualIgnoreCase("dotnet.exe")) fileName = info.Arguments;
var rs = false;
if (Runtime.Windows)
rs = RunAgentOnWindows(fileName, target, inService);
else if (Runtime.Linux)
rs = RunAgentOnLinux(fileName, target, inService);
if (!rs)
rs = RunAgentOnDotnet(fileName, target, inService);
}
return true;
}
private static Boolean RunAgentOnWindows(String fileName, String target, Boolean inService)
{
if (!fileName.IsNullOrEmpty() && Path.GetExtension(fileName) == ".dll") return false;
if (fileName.IsNullOrEmpty()) fileName = target.CombinePath("StarAgent.exe").GetFullPath();
if (!File.Exists(fileName)) return false;
XTrace.WriteLine("RunAgentOnWindows fileName={0}, inService={1}", fileName, inService);
if (inService)
{
Process.Start(fileName, "-stop");
Process.Start(fileName, "-start");
XTrace.WriteLine("启动服务成功");
}
else
{
var si = new ProcessStartInfo(fileName, "-run")
{
if (info?.Arguments == "-s")
{
Process.Start(fileName, "-start");
}
else
{
var si = new ProcessStartInfo(fileName, "-run")
{
WorkingDirectory = Path.GetDirectoryName(fileName),
UseShellExecute = true
};
Process.Start(si);
}
}
WorkingDirectory = Path.GetDirectoryName(fileName),
UseShellExecute = true
};
var p = Process.Start(si);
XTrace.WriteLine("启动进程成功 pid={0}", p.Id);
}
return true;
}
private static Boolean RunAgentOnLinux(String fileName, String target, Boolean inService)
{
if (!fileName.IsNullOrEmpty() && Path.GetExtension(fileName) == ".dll") return false;
if (fileName.IsNullOrEmpty()) fileName = target.CombinePath("StarAgent").GetFullPath();
if (!File.Exists(fileName)) return false;
XTrace.WriteLine("RunAgentOnLinux fileName={0}, inService={1}", fileName, inService);
// 在Linux中设置执行权限
Process.Start("chmod", $"+x {fileName}");
if (inService)
{
Process.Start(fileName, "-stop");
Process.Start(fileName, "-start");
XTrace.WriteLine("启动服务成功");
}
else
{
var si = new ProcessStartInfo(fileName, "-run")
{
WorkingDirectory = Path.GetDirectoryName(fileName),
UseShellExecute = true
};
var p = Process.Start(si);
XTrace.WriteLine("启动进程成功 pid={0}", p.Id);
}
return true;
}
private static Boolean RunAgentOnDotnet(String fileName, String target, Boolean inService)
{
if (fileName.IsNullOrEmpty()) fileName = target.CombinePath("StarAgent.dll").GetFullPath();
if (!File.Exists(fileName)) return false;
XTrace.WriteLine("RunAgentOnDotnet fileName={0}, inService={1}", fileName, inService);
if (inService)
{
Process.Start("dotnet", $"{fileName} -stop");
Process.Start("dotnet", $"{fileName} -start");
XTrace.WriteLine("启动服务成功");
}
else
{
var si = new ProcessStartInfo("dotnet", $"{fileName} -run")
{
WorkingDirectory = Path.GetDirectoryName(fileName),
UseShellExecute = true
};
var p = Process.Start(si);
XTrace.WriteLine("启动进程成功 pid={0}", p.Id);
}
return true;

13
Test/Program.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.Sockets;
@ -21,7 +22,7 @@ namespace Test
{
XTrace.UseConsole();
Test5();
Test3();
Console.WriteLine("OK!");
Console.ReadKey();
@ -103,7 +104,15 @@ namespace Test
//}
var client = new LocalStarClient();
client.ProbeAndInstall(null, "1.1");
client.ProbeAndInstall(null, "1.6");
//var p = Process.GetCurrentProcess();
//var name = p.MainModule.FileName;
//var str = name + Environment.NewLine + name.ToJson();
//str += Environment.NewLine + name.ToJson().ToJsonEntity<String>();
//XTrace.WriteLine(str);
//File.WriteAllText("aa.txt".GetFullPath(), str);
}
static void Test4()