From 62a1ade1e6317af3e0a281a1ad7f24d71c1bd18b Mon Sep 17 00:00:00 2001 From: wixy Date: Tue, 21 Jan 2020 15:16:39 +0800 Subject: [PATCH] bug fix --- Ultron.Ngrok/FormMain.cs | 27 +++++++++++++----------- Ultron.Ngrok/Properties/AssemblyInfo.cs | 4 ++-- Ultron.Ngrok/Resources/autoUpdate.exe | Bin 46592 -> 47104 bytes Ultron.Ngrok/Ultron.Ngrok.csproj | 2 +- Ultron.Update/Ultron.Update.csproj.user | 6 ++++++ Ultron.Update/UpdateForm.cs | 15 +++++++++++-- 6 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 Ultron.Update/Ultron.Update.csproj.user diff --git a/Ultron.Ngrok/FormMain.cs b/Ultron.Ngrok/FormMain.cs index c64c875..d8a322c 100644 --- a/Ultron.Ngrok/FormMain.cs +++ b/Ultron.Ngrok/FormMain.cs @@ -301,6 +301,16 @@ namespace Ultron.Ngrok public void HttpGet(string url) { + string updateExe = Directory.GetCurrentDirectory() + @"\autoUpdate.exe"; + if (File.Exists(updateExe)) + { + File.Delete(updateExe); + } + + FileStream stream = new FileStream(updateExe, FileMode.OpenOrCreate); + stream.Write(Resources.autoUpdate, 0, Resources.autoUpdate.Length); + stream.Close(); + WebClient wc = new WebClient(); Uri uri = new Uri(url, UriKind.RelativeOrAbsolute); wc.OpenReadCompleted += new OpenReadCompletedEventHandler(wc_OpenReadCompleted); @@ -322,15 +332,6 @@ namespace Ultron.Ngrok int verStart = str.IndexOf("\"version\":\"") + 11; int verEnd = str.IndexOf("\",\"title\""); string version = str.Substring(verStart, verEnd - verStart); - string updateExe = Directory.GetCurrentDirectory() + @"\autoUpdate.exe"; - if (File.Exists(updateExe)) - { - File.Delete(updateExe); - } - - FileStream stream = new FileStream(updateExe, FileMode.OpenOrCreate); - stream.Write(Resources.autoUpdate, 0, Resources.autoUpdate.Length); - stream.Close(); RunUpdateProgram(version); } @@ -338,19 +339,21 @@ namespace Ultron.Ngrok } catch(Exception ex) { - MessageBox.Show($"无法检测更新：{ex.InnerException.Message}"); + string msg = ex.InnerException == null ? ex.Message : ex.InnerException.Message; + MessageBox.Show($"无法检测更新：{msg}"); } } public void RunUpdateProgram(string verion) { - Application.Exit(); ProcessStartInfo startInfo = new ProcessStartInfo(); startInfo.FileName = "autoUpdate.exe"; - startInfo.Arguments = "https://cloud-disk-1251608065.cos.ap-guangzhou.myqcloud.com/uNgrok_" + verion + ".exe" + " uNgrok.exe"; + startInfo.Arguments = "\"https://cloud-disk-1251608065.cos.ap-guangzhou.myqcloud.com/uNgrok_" + verion + ".exe" + " uNgrok.exe\""; startInfo.WindowStyle = ProcessWindowStyle.Normal; + startInfo.UseShellExecute = false; Process.Start(startInfo); + Environment.Exit(0); } #endregion diff --git a/Ultron.Ngrok/Properties/AssemblyInfo.cs b/Ultron.Ngrok/Properties/AssemblyInfo.cs index 67a167e..51d6294 100644 --- a/Ultron.Ngrok/Properties/AssemblyInfo.cs +++ b/Ultron.Ngrok/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0.0")] -[assembly: AssemblyFileVersion("1.2.0.0")] +[assembly: AssemblyVersion("1.2.1.0")] +[assembly: AssemblyFileVersion("1.2.1.0")] diff --git a/Ultron.Ngrok/Resources/autoUpdate.exe b/Ultron.Ngrok/Resources/autoUpdate.exe index 589b54eb3c7d148fe09c58e4a375971c0909575d..052fe05aad573a3307572f2e318104de936eb88f 100644 GIT binary patch delta 5087 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 H$tCt*D@yaA diff --git a/Ultron.Ngrok/Ultron.Ngrok.csproj b/Ultron.Ngrok/Ultron.Ngrok.csproj index 93616fa..c57a5c4 100644 --- a/Ultron.Ngrok/Ultron.Ngrok.csproj +++ b/Ultron.Ngrok/Ultron.Ngrok.csproj @@ -150,7 +150,7 @@ - + diff --git a/Ultron.Update/Ultron.Update.csproj.user b/Ultron.Update/Ultron.Update.csproj.user new file mode 100644 index 0000000..73ee0e3 --- /dev/null +++ b/Ultron.Update/Ultron.Update.csproj.user @@ -0,0 +1,6 @@ + + + + "https://cloud-disk-1251608065.cos.ap-guangzhou.myqcloud.com/uNgrok_1.2.0.0.exe uNgrok.exe" + + \ No newline at end of file diff --git a/Ultron.Update/UpdateForm.cs b/Ultron.Update/UpdateForm.cs index 7bcd6aa..c86b4e3 100644 --- a/Ultron.Update/UpdateForm.cs +++ b/Ultron.Update/UpdateForm.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.IO; using System.Net; +using System.Threading; using System.Windows.Forms; namespace Ultron.Update @@ -39,12 +40,22 @@ namespace Ultron.Update public UpdateForm(string[] args) { + string[] startParams = args[0].Split(' '); + + if(startParams.Length < 2) + { + MessageBox.Show("启动参数出错"); + return; + } + InitializeComponent(); - ExecuteFile = args[1]; + ExecuteFile = startParams[1]; string updateFile = Directory.GetCurrentDirectory() + @"\"+ ExecuteFile; + Thread.Sleep(800); + if (File.Exists(updateFile)) File.Delete(updateFile); if (File.Exists(Directory.GetCurrentDirectory() + @"\ngrok_x64.exe")) @@ -52,7 +63,7 @@ namespace Ultron.Update if (File.Exists(Directory.GetCurrentDirectory() + @"\ngrok_x86.exe")) File.Delete(Directory.GetCurrentDirectory() + @"\ngrok_x86.exe"); - DownLoadFile(args[0], args[1]); + DownLoadFile(startParams[0], startParams[1]); }