[#] 修改补丁请求方式,使用新的地址和补丁发布机制

This commit is contained in:
huiyadanli 2019-12-07 14:38:16 +08:00
parent 82d9b5eb52
commit aed49e4e42
2 changed files with 45 additions and 27 deletions

View File

@ -210,11 +210,10 @@ namespace RevokeMsgPatcher
private async void FormMain_Load(object sender, EventArgs e)
{
// 异步获取最新的补丁信息
string json = await GetPathJsonAsync();
string json = await HttpUtil.GetPatchJsonAsync();
if (string.IsNullOrEmpty(json))
{
lblUpdatePachJson.Text = "[ 获取最新补丁信息失败 ]";
}
else
{
@ -247,28 +246,6 @@ namespace RevokeMsgPatcher
}
}
private async Task<string> GetPathJsonAsync()
{
string downStr = null;
try
{
downStr = await HttpUtil.Client.GetStringAsync("https://huiyadanli.coding.me/i/revokemsg/05.json");
}
catch (Exception ex1)
{
Console.WriteLine(ex1.Message);
try
{
downStr = await HttpUtil.Client.GetStringAsync("https://www.huiyadan.com/i/revokemsg/05.json");
}
catch (Exception ex2)
{
Console.WriteLine(ex2.Message);
}
}
return downStr;
}
private void lblUpdatePachJson_Click(object sender, EventArgs e)
{
string tips = "";

View File

@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
namespace RevokeMsgPatcher.Utils
@ -10,5 +8,48 @@ namespace RevokeMsgPatcher.Utils
public class HttpUtil
{
public static HttpClient Client { get; } = new HttpClient();
static HttpUtil()
{
Client.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36");
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
}
/// <summary>
/// 补丁路径
/// 已经弃用的路径
/// https://swordmaker-hauls-51508.netlify.com/i/revokemsg/05.json
/// https://huiyadanli.github.io/i/revokemsg/05.json
/// </summary>
private static readonly string[] urls = new string[]
{
"https://coding.net/u/huiyadanli/p/RevokeMsgPatcher/git/raw/master/RevokeMsgPatcher.Assistant/Data/0.6/patch.json",
"https://gitee.com/huiyadanli/RevokeMsgPatcher/raw/master/RevokeMsgPatcher.Assistant/Data/0.6/patch.json",
"https://raw.githubusercontent.com/huiyadanli/RevokeMsgPatcher/master/RevokeMsgPatcher.Assistant/Data/0.6/patch.json"
};
private static int i = 0;
public static async Task<string> GetPatchJsonAsync()
{
try
{
return await Client.GetStringAsync(urls[i]);
}
catch (Exception ex)
{
Console.WriteLine("第" + (i + 1) + "次请求异常:[" + ex.Message + "]\nURL:" + urls[i]);
i++;
if (i > urls.Length)
{
i = 0;
return null;
}
else
{
return await GetPatchJsonAsync();
}
}
}
}
}