Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Commit ef8b963

Browse files
committed
fix GetResource method
1 parent bf53acf commit ef8b963

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

MiHoMo/MiHoMo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
77
<GenerateDocumentationFile>True</GenerateDocumentationFile>
88
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
9-
<Version>1.0.0.0</Version>
9+
<Version>1.0.0.2</Version>
1010
<Title>MiHoMo</Title>
1111
<Description>A C# library for API wrapper data from https://api.mihomo.me/
1212
对 https://api.mihomo.me/ API的C#封装库</Description>

MiHoMo/MiHoMoAPI.cs

+6-15
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public MiHoMoAPI(
8383
/// <returns>从网络获取资源作为流任务</returns>
8484
public async Task<Stream> GetResourceAsStreamAsync(string path)
8585
{
86-
var response = await _httpClient.GetAsync(path);
86+
var response = await _httpClient.GetAsync($"{_indexBaseUrl}/{path}");
8787
response.EnsureSuccessStatusCode();
8888
return await response.Content.ReadAsStreamAsync();
8989
}
@@ -95,26 +95,17 @@ public async Task<Stream> GetResourceAsStreamAsync(string path)
9595
/// <returns>从网络获取资源作为字节数组任务</returns>
9696
public async Task<byte[]> GetResourceAsByteArrayAsync(string path)
9797
{
98-
var response = await _httpClient.GetAsync(path);
98+
var response = await _httpClient.GetAsync($"{_indexBaseUrl}/{path}");
9999
response.EnsureSuccessStatusCode();
100100
return await response.Content.ReadAsByteArrayAsync();
101101
}
102102

103-
/// <summary>
104-
/// 从网络获取资源作为字符串
105-
/// </summary>
106-
/// <param name="path">资源路径<br/>例如:icon/element/Physical.png</param>
107-
/// <returns>从网络获取资源作为字符串任务</returns>
108-
public async Task<string> GetResourceAsStringAsync(string path)
109-
{
110-
var response = await _httpClient.GetAsync(path);
111-
response.EnsureSuccessStatusCode();
112-
return await response.Content.ReadAsStringAsync();
113-
}
114-
115103
private async Task<T> GetDataFromUrlAsync<T>(string url)
116104
{
117-
return JsonConvert.DeserializeObject<T>(await GetResourceAsStringAsync(url));
105+
var response = await _httpClient.GetAsync(url);
106+
response.EnsureSuccessStatusCode();
107+
var content = await response.Content.ReadAsStringAsync();
108+
return JsonConvert.DeserializeObject<T>(content);
118109
}
119110

120111
#endregion

0 commit comments

Comments
 (0)