feat: lastest version get & deploy

huiyadanli · Mar 26, 2022 · 38b7f54 · 38b7f54
1 parent 6aeeeaa
commit 38b7f54
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 17 deletions.
diff --git a/Build/Build&Package.bat b/Build/Build&Package.bat
@@ -0,0 +1,12 @@
+"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe" ..\PasteEx.sln /t:Rebuild /p:Configuration=Release
+
+echo 打包中...
+xcopy /y "..\PasteEx\bin\Release\PasteEx.exe" PasteEx\
+xcopy /s /y "..\PasteEx\bin\Release\User" PasteEx\User\
+xcopy /s /y "..\PasteEx\bin\Release\Language" PasteEx\Language\
+"D:/Program Files/WinRAR/WinRAR.exe" a -as -r "PasteEx.v%~1.zip" "PasteEx"
+
+echo 打包完成，删除 PasteEx 目录
+
+rd /s /q PasteEx
+pause
diff --git a/PasteEx.Deploy/FormMian.cs b/PasteEx.Deploy/FormMian.cs
@@ -66,7 +66,7 @@ private void btnUpdateVersion_Click(object sender, EventArgs e)
  Console.WriteLine(readmeFileName + " √");
  }
 
- GetSurrentVersion();
+ GetCurrentVersion();
 
  MessageBox.Show("Done!");
 

diff --git a/PasteEx/Forms/FormInfo.Designer.cs b/PasteEx/Forms/FormInfo.Designer.cs
diff --git a/PasteEx/Forms/FormSetting.cs b/PasteEx/Forms/FormSetting.cs
@@ -236,7 +236,31 @@ private void linkLabels_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
  //System.Diagnostics.Process.Start(e.Link.LinkData as string);
  AppInfo appInfo = e.Link.LinkData as AppInfo;
  FormInfo f = FormInfo.GetInstance();
- f.SetInfo(appInfo.InfoCN);
+ string info = null;
+ try
+ {
+ string i = Properties.Settings.Default.language;
+ if (string.IsNullOrWhiteSpace(i))
+ {
+ i = I18n.FindLanguageByCurrentThreadInfo().Index.ToString();
+ }
+ int index = Convert.ToInt32(i);
+ // zh-CN || zh-Hant
+ if (index == 1 || index == 2)
+ {
+ info = appInfo.InfoCN;
+ }
+ // en-US 
+ else
+ {
+ info = appInfo.InfoEN;
+ }
+ }
+ catch (Exception ex)
+ {
+ Logger.Error(ex);
+ }
+ f.SetInfo(info);
  if (f.Visible == true)
  {
  f.Show();
@@ -294,7 +318,7 @@ private async void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
  int currentVersionNum = VersionToNumber(currentVersion);
  if (latestVersionNum > 1000000 && currentVersionNum > 1000000)
  {
- if (latestVersionNum > 1)
+ if (latestVersionNum > currentVersionNum)
  {
  // have new version
  labelUpdateinfo.Text = Resources.Strings.TxtNewVersion + latestVersion;

diff --git a/PasteEx/Util/HttpUtil.cs b/PasteEx/Util/HttpUtil.cs
@@ -23,15 +23,13 @@ static HttpUtil()
  /// </summary>
  private static readonly string[] urlsCN = new string[]
  {
- "https://gitee.com/huiyadanli/PasteEx/raw/master/PasteEx.Deploy/latest.json",
  "https://huiyadanli.coding.net/p/PasteEx/d/PasteEx/git/raw/master/PasteEx.Deploy/latest.json",
  "https://raw.githubusercontent.com/huiyadanli/PasteEx/master/PasteEx.Deploy/latest.json"
 
  };
  private static readonly string[] urlsOther = new string[]
  {
  "https://raw.githubusercontent.com/huiyadanli/PasteEx/master/PasteEx.Deploy/latest.json",
- "https://gitee.com/huiyadanli/PasteEx/raw/master/PasteEx.Deploy/latest.json",
  "https://huiyadanli.coding.net/p/PasteEx/d/PasteEx/git/raw/master/PasteEx.Deploy/latest.json"
  };
 
@@ -74,24 +72,28 @@ public static async Task<string> GetSoftInfoJsonAsync()
  Init();
  }
 
- try
- {
- return await Client.GetStringAsync(urls[i]);
- }
- catch (Exception ex)
+ int i = 0;
+ while (i < urls.Length)
  {
- Logger.Warning("第" + (i + 1) + "次请求异常:[" + ex.Message + "]\nURL:" + urls[i]);
- i++;
- if (i >= urls.Length)
+ try
  {
- i = 0;
- return null;
+ string json = await Client.GetStringAsync(urls[i]);
+ if (!string.IsNullOrEmpty(json) && json.Contains("Version"))
+ {
+ return json;
+ }
+ else
+ {
+ Logger.Warning("第" + (i + 1) + "次请求获得的数据并非期望数据\nURL:" + urls[i]);
+ }
  }
- else
+ catch (Exception ex)
  {
- return await GetSoftInfoJsonAsync();
+ Logger.Warning("第" + (i + 1) + "次请求异常:[" + ex.Message + "]\nURL:" + urls[i]);
  }
+ i++;
  }
+ return null;
  }
  }
 }