From 6748f3e89baa32050a08cd7b4ffb1c5bc4a2e2a9 Mon Sep 17 00:00:00 2001 From: oufu99 Date: Sun, 13 Nov 2022 19:37:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=81=97=E6=BC=8F=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/UpdateController.cs | 153 ++++++++++++++++++ example/fileserver/fileserver/Program.cs | 26 +++ example/fileserver/fileserver/Startup.cs | 42 +++++ .../testwinforms.metadata.v5.1 | Bin 228751 -> 252604 bytes .../testwinforms.projects.v5.1 | Bin 308531 -> 874814 bytes .../winform/TestWinForms/Form1.Designer.cs | 99 ++++++++++++ example/winform/TestWinForms/Form1.cs | 106 ++++++++++++ example/winform/TestWinForms/Program.cs | 17 ++ .../TestWinForms/TestWinForms.csproj.user | 8 + example/winform/TestWinForms/TestWinForms.sln | 37 +++++ 10 files changed, 488 insertions(+) create mode 100644 example/fileserver/fileserver/Controllers/UpdateController.cs create mode 100644 example/fileserver/fileserver/Program.cs create mode 100644 example/fileserver/fileserver/Startup.cs create mode 100644 example/winform/TestWinForms/Form1.Designer.cs create mode 100644 example/winform/TestWinForms/Form1.cs create mode 100644 example/winform/TestWinForms/Program.cs create mode 100644 example/winform/TestWinForms/TestWinForms.csproj.user create mode 100644 example/winform/TestWinForms/TestWinForms.sln diff --git a/example/fileserver/fileserver/Controllers/UpdateController.cs b/example/fileserver/fileserver/Controllers/UpdateController.cs new file mode 100644 index 0000000..776d839 --- /dev/null +++ b/example/fileserver/fileserver/Controllers/UpdateController.cs @@ -0,0 +1,153 @@ +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Web; +using GeneralUpdate.AspNetCore.Hubs; +using static System.Net.Mime.MediaTypeNames; +using GeneralUpdate.AspNetCore.Services; +using GeneralUpdate.Core.Domain.DTO; +using GeneralUpdate.Core.Domain.Enum; +using GeneralUpdate.Core.Utils; +using GeneralUpdate.AspNetCore.DTO; +using Microsoft.Extensions.Options; +using Newtonsoft.Json; + +namespace GPDI.UpdateService.Controllers +{ + [ApiController] + [Route("api/[controller]/[action]")] + public class UpdateController : ControllerBase + { + private IWebHostEnvironment _webHostEvironment; + private IHttpContextAccessor _accessor; + private IUpdateService _updateService; + private IHubContext _hubContext; + + public UpdateController(IWebHostEnvironment webHostEvironment, IHttpContextAccessor accessor, IUpdateService updateService, IHubContext hubContext) + { + _webHostEvironment = webHostEvironment; + _accessor = accessor; + _updateService = updateService; + _hubContext = hubContext; + } + + //http://localhost:5008/api/Update/test + [HttpGet] + public string Test() + { + return "success"; + } + + + /// + /// 推送强制更新命令给App + /// + /// + [HttpGet] + public async Task Push() + { + //http://localhost:5008/api/Update/push 测试路径 + + await _hubContext.SendMessage("versionhub", "update"); + return "ok"; + } + + [HttpGet] + [Route("/api/update/Versions/{clientType}/{clientVersion}/{clientAppKey}")] + public string Versions(int clientType, string clientVersion, string clientAppKey) + { + //如果是更新程序,直接返回不需要更新,这个不会更新 + if (clientType == AppType.UpgradeApp) + { + return GetUpgradeInfo(clientType, clientVersion); + } + + var versions = new List(); + //生成好的更新包文件的MD5码，因为返回给客户端的时候需要同这个来验证是否可用 + //这个md5可以使用单元测试里面的生成md5获取 + var md5 = "cc9f7189676613b906bd7680ea518f0e"; + var pubTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds(); + //这里只会是更新主程序,因为升级程序已经在上面直接返回了 + string version = "1.0.0.9";//这里设置为9是让程序认为需要更新 + + var url = $"http://127.0.0.1:5008/{version}.zip";//更新包的下载地址 + var name = version; + versions.Add(new VersionDTO(md5, pubTime, version, url, name)); + return _updateService.Update(clientType, clientVersion, version, clientAppKey, "B8A7FADD-386C-46B0-B283-C9F963420C7C", false, versions); + + } + + /// + /// 当更新程序来请求时 返回一个不需要更新的对象回去 + /// + /// + /// + private string GetUpgradeInfo(int clientType, string clientVersion) + { + var response = new VersionRespDTO() { }; + response.Body = new VersionBodyDTO() { ClientType = clientType, IsUpdate = false, IsForcibly = false, Versions = new List() { new VersionDTO("111", 0, clientVersion, "http://127.0.0.1:5008/test/", "111") } }; + response.Code = HttpStatus.OK; + response.Message = RespMessage.RequestSucceeded; + return JsonConvert.SerializeObject(response); + } + + /// + /// 上传文件 + /// 重写这个方法里面的插入数据库,就能和旧的联动了 + /// 打包工具上填的地址 http://localhost:5008/api/Update/Upload + /// + /// + [HttpPost] + public async Task Upload() + { + var uploadReapDTO = new UploadReapDTO(); + try + { + //只要调用了此方法,都是工具调用的,必然不可能为null + var request = _accessor.HttpContext.Request; + if (!request.HasFormContentType) throw new Exception("ContentType was not included in the request !"); + var form = await request.ReadFormAsync(); + + var formFile = form.Files["file"]; + + if (formFile is null || formFile.Length == 0) throw new ArgumentNullException("Uploaded update package file not found !"); + await using var stream = formFile.OpenReadStream(); + byte[] buffer = new byte[stream.Length]; + stream.Read(buffer, 0, buffer.Length); + //TODO:save to file server. + string localPath = $"E:\\{formFile.FileName}"; + await using var fileStream = new FileStream(localPath, FileMode.CreateNew, FileAccess.Write); + fileStream.Write(buffer, 0, buffer.Length); + + //TODO oujl 将数据存储到mysql + int.TryParse(request.Form["clientType"], out int clientType); + var fileName = formFile.FileName; + var version = request.Form["version"].ToString(); + var clientAppKey = request.Form["clientAppKey"].ToString(); + var md5 = request.Form["md5"].ToString(); + + + + uploadReapDTO.Code = HttpStatus.OK; + uploadReapDTO.Body = "Published successfully."; + uploadReapDTO.Message = RespMessage.RequestSucceeded; + return JsonConvert.SerializeObject(uploadReapDTO); + } + catch (Exception ex) + { + uploadReapDTO.Code = HttpStatus.BAD_REQUEST; + uploadReapDTO.Body = $"Failed to publish ! Because : {ex.Message}"; + uploadReapDTO.Message = RespMessage.RequestFailed; + return JsonConvert.SerializeObject(uploadReapDTO); + } + } + } +} diff --git a/example/fileserver/fileserver/Program.cs b/example/fileserver/fileserver/Program.cs new file mode 100644 index 0000000..77bde95 --- /dev/null +++ b/example/fileserver/fileserver/Program.cs @@ -0,0 +1,26 @@ +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace fileserver +{ + public class Program + { + public static void Main(string[] args) + { + CreateHostBuilder(args).Build().Run(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + } +} \ No newline at end of file diff --git a/example/fileserver/fileserver/Startup.cs b/example/fileserver/fileserver/Startup.cs new file mode 100644 index 0000000..263eb79 --- /dev/null +++ b/example/fileserver/fileserver/Startup.cs @@ -0,0 +1,42 @@ +using GeneralUpdate.AspNetCore.Hubs; +using Microsoft.Extensions.DependencyInjection.Extensions; +using GeneralUpdate.AspNetCore.Services; + +namespace fileserver +{ + public class Startup + { + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } + + public void ConfigureServices(IServiceCollection services) + { + services.AddSignalR(); + services.AddControllers(); + services.TryAddSingleton(); + services.TryAddSingleton(); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.UseStaticFiles(); + app.UseRouting(); + + app.UseEndpoints(endpoints => + { + endpoints.MapHub($"/versionhub"); + endpoints.MapControllers(); + }); + } + } +} diff --git a/example/winform/TestWinForms/.vs/ProjectEvaluation/testwinforms.metadata.v5.1 b/example/winform/TestWinForms/.vs/ProjectEvaluation/testwinforms.metadata.v5.1 index 6c3065cf1b806627cc5e59ed6ba6df2c2c9e492b..b46ac873ed9c8ae3ea13b9b87f32261ee89ca645 100644 GIT binary patch delta 7217 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 Ta3e+{^9Sz>O#jP-8jW892{8Go delta 89 zcmdn9mB0TtFVhabMy6IK##Sb#txU}RW{fVA8QCnS@7vDIz5PKKbB;9&GXn#|^u*)L s;nNi^F$-?rag6ydyP#?YNSJ{^4v1y8acq&CzUCCO_V$nGm|rjf0MBw8tpET3 diff --git a/example/winform/TestWinForms/.vs/ProjectEvaluation/testwinforms.projects.v5.1 b/example/winform/TestWinForms/.vs/ProjectEvaluation/testwinforms.projects.v5.1 index cb40908093dd9a07c6791861d5190523a2cafb8e..61959b023b72ed8c2fa0c38d584a5a45f84ddb1d 100644 GIT binary patch delta 12161 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 delta 17 YcmdnD$#nB8p@tU57N!>FEiA@c0Y_^G2LJ#7 diff --git a/example/winform/TestWinForms/Form1.Designer.cs b/example/winform/TestWinForms/Form1.Designer.cs new file mode 100644 index 0000000..5915d4b --- /dev/null +++ b/example/winform/TestWinForms/Form1.Designer.cs @@ -0,0 +1,99 @@ +namespace TestWinForms +{ + partial class Form1 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.button1 = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.button2 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(140, 287); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(94, 29); + this.button1.TabIndex = 0; + this.button1.Text = "版本测试"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(87, 117); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(88, 20); + this.label1.TabIndex = 1; + this.label1.Text = "当前版本是:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(181, 117); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(53, 20); + this.label2.TabIndex = 2; + this.label2.Text = "label2"; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(309, 287); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(94, 29); + this.button2.TabIndex = 3; + this.button2.Text = "新增的按钮"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click_1); + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(924, 478); + this.Controls.Add(this.button2); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.button1); + this.Name = "Form1"; + this.Text = "Form1"; + this.Load += new System.EventHandler(this.Form1_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Button button1; + private Label label1; + private Label label2; + private Button button2; + } +} \ No newline at end of file diff --git a/example/winform/TestWinForms/Form1.cs b/example/winform/TestWinForms/Form1.cs new file mode 100644 index 0000000..a3ecad4 --- /dev/null +++ b/example/winform/TestWinForms/Form1.cs @@ -0,0 +1,106 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Security.AccessControl; +using System.Text; +using GeneralUpdate.ClientCore; +using GeneralUpdate.Core.Bootstrap; +using GeneralUpdate.Core.Domain.Entity; +using GeneralUpdate.Core.Domain.Enum; +using GeneralUpdate.Core.Strategys.PlatformWindows; + +namespace TestWinForms +{ + public partial class Form1 : Form + { + public Form1() + { + InitializeComponent(); + } + + private void Form1_Load(object sender, EventArgs e) + { + //֮ǰDemoһЩص,֮дwinform, ¿ͻ˵,ҵĿͻ˻,Բһ + Upgrade(); + } + + private string mainAppName = "TestWinForms"; + public void Upgrade() + { + var version = GetDllVersion(AppDomain.CurrentDomain.BaseDirectory + $@"{mainAppName}.dll"); + this.label2.Text = version; + + //첽,Ӱ + Task.Run(async () => + { + //öͻ֮佻õĶ + var config = new Configinfo(); + //Ŀͻ˳Ӧõַ + config.InstallPath = AppDomain.CurrentDomain.BaseDirectory; + + //³ĵǰ汾,Ҫ,ֱд + config.ClientVersion = "1.0.0.0"; + //ͻͣ1.ͻ 2. + config.AppType = AppType.ClientApp; + //ָӦԿֿͻӦ Ҫfileserverеһ + config.AppSecretKey = "B8A7FADD-386C-46B0-B283-C9F963420C7C"; + + var updateHost = "http://127.0.0.1:5008/api/update"; + //°صַ Ǽ³url + config.UpdateUrl = $"{updateHost}/Versions/{AppType.UpgradeApp}/{config.ClientVersion}/{config.AppSecretKey}"; + //³exe + config.AppName = "GeneralUpdate.Upgrad"; + //ͻexe + config.MainAppName = mainAppName; + //汾Ϣ ͨǰ򼯻ȡ ÿҪ汾ʱ,һwinformij򼯰汾žͿ,apiԶжǷҪ + var mainVersion = GetDllVersion(AppDomain.CurrentDomain.BaseDirectory + $@"{mainAppName}.dll"); + //¹ҳ + config.UpdateLogUrl = $"{updateHost}/UpdateLog.html"; + //url + config.MainUpdateUrl = $"{updateHost}/Versions/{AppType.ClientApp}/{mainVersion}/{config.AppSecretKey}"; + + // + var generalClientBootstrap = new GeneralClientBootstrap(); + + generalClientBootstrap.Config(config).Option(UpdateOption.DownloadTimeOut, 60).Option(UpdateOption.Encoding, Encoding.Default).Option(UpdateOption.Format, Format.ZIP). + //עһfuncûǷθ£ǿƸЧ + SetCustomOption(() => false).Strategy(); + await generalClientBootstrap.LaunchTaskAsync(); + }); + } + + /// + /// ȡӦ·dllİ汾 + /// + /// + /// + /// + public string GetDllVersion(string filePath) + { + try + { + var fileInfo = new FileInfo(filePath); + if (fileInfo != null && fileInfo.Exists) + { + return Assembly.LoadFrom(filePath).GetName().Version.ToString(); + } + + throw new Exception($"{filePath}ļ汾ȡʧ"); + } + catch (Exception ex) + { + throw new Exception($"{filePath}ļ汾ȡʧ,Ϣ : {ex.Message} .", ex.InnerException); + } + } + + private void button1_Click(object sender, EventArgs e) + { + Upgrade(); + } + + + private void button2_Click_1(object sender, EventArgs e) + { + MessageBox.Show("³ɹ"); + } + } +} \ No newline at end of file diff --git a/example/winform/TestWinForms/Program.cs b/example/winform/TestWinForms/Program.cs new file mode 100644 index 0000000..3a9f113 --- /dev/null +++ b/example/winform/TestWinForms/Program.cs @@ -0,0 +1,17 @@ +namespace TestWinForms +{ + internal static class Program + { + /// + /// The main entry point for the application. + /// + [STAThread] + static void Main() + { + // To customize application configuration such as set high DPI settings or default font, + // see https://aka.ms/applicationconfiguration. + ApplicationConfiguration.Initialize(); + Application.Run(new Form1()); + } + } +} \ No newline at end of file diff --git a/example/winform/TestWinForms/TestWinForms.csproj.user b/example/winform/TestWinForms/TestWinForms.csproj.user new file mode 100644 index 0000000..7814ea2 --- /dev/null +++ b/example/winform/TestWinForms/TestWinForms.csproj.user @@ -0,0 +1,8 @@ + + + + + Form + + + diff --git a/example/winform/TestWinForms/TestWinForms.sln b/example/winform/TestWinForms/TestWinForms.sln new file mode 100644 index 0000000..2bd7254 --- /dev/null +++ b/example/winform/TestWinForms/TestWinForms.sln @@ -0,0 +1,37 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWinForms", "TestWinForms.csproj", "{1E687C9A-CF89-4EC2-88D1-5F6ED35F5549}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeneralUpdate.ClientCore", "..\..\..\src\c#\GeneralUpdate.ClientCore\GeneralUpdate.ClientCore.csproj", "{7806BDFE-9F7B-40FF-87E4-A90F3F49F212}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeneralUpdate.Upgrad", "..\..\..\src\c#\GeneralUpdate.Upgrad\GeneralUpdate.Upgrad.csproj", "{FDEEEA9F-946D-4E2B-857C-279B8FA66231}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1E687C9A-CF89-4EC2-88D1-5F6ED35F5549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E687C9A-CF89-4EC2-88D1-5F6ED35F5549}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E687C9A-CF89-4EC2-88D1-5F6ED35F5549}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E687C9A-CF89-4EC2-88D1-5F6ED35F5549}.Release|Any CPU.Build.0 = Release|Any CPU + {7806BDFE-9F7B-40FF-87E4-A90F3F49F212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7806BDFE-9F7B-40FF-87E4-A90F3F49F212}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7806BDFE-9F7B-40FF-87E4-A90F3F49F212}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7806BDFE-9F7B-40FF-87E4-A90F3F49F212}.Release|Any CPU.Build.0 = Release|Any CPU + {FDEEEA9F-946D-4E2B-857C-279B8FA66231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FDEEEA9F-946D-4E2B-857C-279B8FA66231}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FDEEEA9F-946D-4E2B-857C-279B8FA66231}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FDEEEA9F-946D-4E2B-857C-279B8FA66231}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7010610C-F3F1-4A06-B67D-95049FD4C3E7} + EndGlobalSection +EndGlobal -- Gitee From e0fd65012c1416e0201868367a2c8856ed58b775 Mon Sep 17 00:00:00 2001 From: oufu99 Date: Sun, 13 Nov 2022 19:41:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=BA=9Bdemo?= =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8=E7=9A=84=E5=A4=84=E7=90=86=E5=8A=9E?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/winform/readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/example/winform/readme.md b/example/winform/readme.md index e49b546..f6778e7 100644 --- a/example/winform/readme.md +++ b/example/winform/readme.md @@ -1,12 +1,13 @@ 使用方法 1. 先运行example\fileserver 这个文件服务器,这个服务器中整合了版本更新查询和文件下载功能。具体代码逻辑可以参看官网的介绍,这里就不赘述了,为了方便测试,把官网的api服务加上文件下载弄在了一起,在demo中,默认配置的是1.0.0.9的可用升级版本。 -2. 打开TestWinForms.csproj项目.在Load方法中会先去请求文件服务器,检查是否需要更新版本,如果需要更新,就会启动Upgrade.exe程序来更新,并且关闭winform程序,更新完后会自动重启 +2. 打开TestWinForms.sln项目.在Load方法中会先去请求文件服务器,检查是否需要更新版本,如果需要更新,就会启动Upgrade.exe程序来更新,并且关闭winform程序,更新完后会自动重启 3.运行升级之前需要把GeneralUpdate.Upgrad程序中bin目录下面的所有文件复制到run文件夹(见下面的文件夹解释)中才能正常更新。demo中是直接引用source的源码的,后面发布了也可以引用nuget包。 4.代码里有比较详细的注释,可以试着操作一下 +5.如果项目中GeneralUpdate.ClientCore,GeneralUpdate.Upgrad说找不到,直接引用src中C#模块的对应代码过来,尤其是Upgrad是必须要的,要把bin里面的复制到运行文件夹才行 直接看效果 如果想直接看效果,可以直接打开example\winform\测试包 这个文件夹,将"可用版本.zip"解压。运行文件服务器,再运行解压后的run文件夹中的TestWinForms.exe,就能先体验一下更新的过程。 -- Gitee