From 7c62a14e9d952f60a587a4dc2b5753e2dbab6629 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: Tue, 9 Jul 2024 23:40:20 +0800 Subject: [PATCH] v8.2.2024.0709 --- XCoder/CrazyCoder.csproj | 4 +- XCoder/Program.cs | 106 +++++---------------------------------- 2 files changed, 14 insertions(+), 96 deletions(-) diff --git a/XCoder/CrazyCoder.csproj b/XCoder/CrazyCoder.csproj index 1979a3c..0c83928 100644 --- a/XCoder/CrazyCoder.csproj +++ b/XCoder/CrazyCoder.csproj @@ -5,8 +5,8 @@ 新生命码神工具 众多开发者工具,网络、串口、加解密、正则表达式、Modbus 新生命开发团队 - ©2002-2023 NewLife - 8.1 + ©2002-2024 NewLife + 8.2 $([System.DateTime]::Now.ToString(`yyyy.MMdd`)) $(VersionPrefix).$(VersionSuffix) $(Version) diff --git a/XCoder/Program.cs b/XCoder/Program.cs index 71336a1..c564427 100644 --- a/XCoder/Program.cs +++ b/XCoder/Program.cs @@ -1,14 +1,10 @@ -using System.Diagnostics; -using System.Net.NetworkInformation; +using System.Net.NetworkInformation; using System.Text; using NewLife; using NewLife.Log; -using NewLife.Remoting.Clients; -using NewLife.Remoting.Models; using NewLife.Threading; using Stardust; using Stardust.Models; -using Stardust.Services; namespace XCoder; @@ -26,9 +22,10 @@ static void Main() StartClient(); - StringHelper.EnableSpeechTip = XConfig.Current.SpeechTip; + var set = XConfig.Current; + StringHelper.EnableSpeechTip = set.SpeechTip; - if (XConfig.Current.IsNew) "学无先后达者为师,欢迎使用新生命码神工具!".SpeechTip(); + if (set.IsNew) "学无先后达者为师,欢迎使用新生命码神工具!".SpeechTip(); Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); @@ -39,6 +36,7 @@ static void Main() } static TimerX _timer; + static StarFactory _factory; static StarClient _Client; private static void StartClient() { @@ -48,11 +46,18 @@ private static void StartClient() XTrace.WriteLine("初始化服务端地址:{0}", server); + _factory = new StarFactory(server, "CrazyCoder", null) + { + Log = XTrace.Log, + }; + var client = new StarClient(server) { Code = set.Code, Secret = set.Secret, ProductCode = "CrazyCoder", + + Tracer = _factory.Tracer, Log = XTrace.Log, }; @@ -104,92 +109,5 @@ private static async Task TryConnectServer(Object state) } _timer.TryDispose(); - _timer = new TimerX(CheckUpgrade, null, 5_000, 600_000) { Async = true }; - - client.RegisterCommand("node/upgrade", s => _timer.SetNext(-1)); - } - - private static String _lastVersion; - private static async Task CheckUpgrade(Object data) - { - var client = _Client; - using var span = client.Tracer?.NewSpan("CheckUpgrade", new { _lastVersion }); - - // 运行过程中可能改变配置文件的通道 - var set = XConfig.Current; - var ug = new Upgrade { Log = XTrace.Log }; - - // 去除多余入口文件 - ug.Trim("CrazyCoder"); - - // 检查更新 - var ur = await client.Upgrade(set.Channel); - if (ur != null && ur.Version != _lastVersion) - { - client.WriteInfoEvent("Upgrade", $"准备从[{_lastVersion}]更新到[{ur.Version}],开始下载 {ur.Source}"); - try - { - ug.Url = client.BuildUrl(ur.Source); - await ug.Download(); - - // 检查文件完整性 - var checkHash = ug.CheckFileHash(ur.FileHash); - if (!ur.FileHash.IsNullOrEmpty() && !checkHash) - { - client.WriteInfoEvent("Upgrade", "下载完成,哈希校验失败"); - } - else - { - client.WriteInfoEvent("Upgrade", "下载完成,准备解压文件"); - if (!ug.Extract()) - { - client.WriteInfoEvent("Upgrade", "解压失败"); - } - else - { - if (ur is UpgradeInfo ur2 && !ur2.Preinstall.IsNullOrEmpty()) - { - client.WriteInfoEvent("Upgrade", "执行预安装脚本"); - - ug.Run(ur2.Preinstall); - } - - client.WriteInfoEvent("Upgrade", "解压完成,准备覆盖文件"); - - // 执行更新,解压缩覆盖文件 - var rs = ug.Update(); - if (rs && !ur.Executor.IsNullOrEmpty()) ug.Run(ur.Executor); - _lastVersion = ur.Version; - - // 去除多余入口文件 - ug.Trim("CrazyCoder"); - - // 强制更新时,马上重启 - if (rs && ur.Force) - { - // 重新拉起进程 - rs = ug.Run("CrazyCoder", "-run -upgrade"); - - if (rs) - { - var pid = Process.GetCurrentProcess().Id; - client.WriteInfoEvent("Upgrade", "强制更新完成,新进程已拉起,准备退出当前进程!PID=" + pid); - - ug.KillSelf(); - } - else - { - client.WriteInfoEvent("Upgrade", "强制更新完成,但拉起新进程失败"); - } - } - } - } - } - catch (Exception ex) - { - XTrace.WriteException(ex); - client.WriteErrorEvent("Upgrade", ex.ToString()); - } - } } } \ No newline at end of file