lsm/DotNetCore.SKIT.FlurlHttpClient.Wechat
1
0
Fork 0
mirror of https://gitee.com/fudiwei/DotNetCore.SKIT.FlurlHttpClient.Wechat.git synced 2025-12-29 09:54:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(wxads): 重命名部分内部依赖属性

Browse Source
This commit is contained in:
Fu Diwei
2021-06-17 19:44:57 +08:00
parent 4b9d46bbbe
commit 012d7f0953
10 changed files with 37 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdCreativesExtensions.cs
View File

@@ -73,7 +73,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
flurlReq.SetQueryParam("adcreative_id", request.AdCreativeId.Value);
if (request.Filters != null && request.Filters.Any())
flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters));
flurlReq.SetQueryParam("filtering", client.FlurlJsonSerializer.Serialize(request.Filters));
if (request.PageSize.HasValue)
flurlReq.SetQueryParam("page_size", request.PageSize.Value);

2
src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdGroupsExtensions.cs
View File

@@ -73,7 +73,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
flurlReq.SetQueryParam("adgroup_id", request.AdGroupId.Value);
if (request.Filters != null && request.Filters.Any())
flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters));
flurlReq.SetQueryParam("filtering", client.FlurlJsonSerializer.Serialize(request.Filters));
if (request.PageSize.HasValue)
flurlReq.SetQueryParam("page_size", request.PageSize.Value);

2
src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdsExtensions.cs
View File

@@ -73,7 +73,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
flurlReq.SetQueryParam("ad_id", request.AdId.Value);
if (request.Filters != null && request.Filters.Any())
flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters));
flurlReq.SetQueryParam("filtering", client.FlurlJsonSerializer.Serialize(request.Filters));
if (request.PageSize.HasValue)
flurlReq.SetQueryParam("page_size", request.PageSize.Value);

2
src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAsyncTasksExtensions.cs
View File

@@ -50,7 +50,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
.SetQueryParam("access_token", request.AccessToken);
if (request.Filters != null && request.Filters.Any())
flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters));
flurlReq.SetQueryParam("filtering", client.FlurlJsonSerializer.Serialize(request.Filters));
if (request.PageSize.HasValue)
flurlReq.SetQueryParam("page_size", request.PageSize.Value);

2
src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCampaignsExtensions.cs
View File

@@ -73,7 +73,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
flurlReq.SetQueryParam("campaign_id", request.CampaignId.Value);
if (request.Filters != null && request.Filters.Any())
flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters));
flurlReq.SetQueryParam("filtering", client.FlurlJsonSerializer.Serialize(request.Filters));
if (request.PageSize.HasValue)
flurlReq.SetQueryParam("page_size", request.PageSize.Value);

2
src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteFundsExtensions.cs
View File

@@ -69,7 +69,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
.SetQueryParam("access_token", request.AccessToken);
if (request.DateRange != null)
flurlReq.SetQueryParam("date_range", client.JsonSerializer.Serialize(request.DateRange));
flurlReq.SetQueryParam("date_range", client.FlurlJsonSerializer.Serialize(request.DateRange));
if (!string.IsNullOrEmpty(request.TradeType))
flurlReq.SetQueryParam("trade_type", request.TradeType);

2
src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteImagesExtensions.cs
View File

@@ -86,7 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
flurlReq.SetQueryParam("image_id", request.ImageId);
if (request.Filters != null && request.Filters.Any())
flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters));
flurlReq.SetQueryParam("filtering", client.FlurlJsonSerializer.Serialize(request.Filters));
if (request.PageSize.HasValue)
flurlReq.SetQueryParam("page_size", request.PageSize.Value);

4
src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteReportsExtensions.cs
View File

@@ -30,7 +30,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
.SetQueryParam("access_token", request.AccessToken);
if (request.DateRange != null)
flurlReq.SetQueryParam("date_range", client.JsonSerializer.Serialize(request.DateRange));
flurlReq.SetQueryParam("date_range", client.FlurlJsonSerializer.Serialize(request.DateRange));
if (!string.IsNullOrEmpty(request.ReportType))
flurlReq.SetQueryParam("report_type", request.ReportType);
@@ -67,7 +67,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
.SetQueryParam("level", request.Level);
if (request.Filters != null && request.Filters.Any())
flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters));
flurlReq.SetQueryParam("filtering", client.FlurlJsonSerializer.Serialize(request.Filters));
return await client.SendRequestAsync<Models.RealtimeCostGetResponse>(flurlReq, cancellationToken: cancellationToken);
}

33
src/SKIT.FlurlHttpClient.Wechat.Ads/Interceptors/WechatAdsAuthenticator.cs
View File

@@ -1,33 +0,0 @@
using System;
using System.Linq;
using System.Text;
using Flurl;
using Flurl.Http;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Interceptors
{
internal class WechatAdsAuthenticator
{
private readonly string _agencyId;
private readonly string _agencyApiKey;
public WechatAdsAuthenticator(string agencyId, string agencyApiKey)
{
_agencyId = agencyId;
_agencyApiKey = agencyApiKey;
}
public void Authenticate(FlurlCall flurlCall)
{
if (flurlCall == null) throw new ArgumentNullException(nameof(flurlCall));
string timestamp = DateTimeOffset.Now.ToLocalTime().ToUnixTimeSeconds().ToString();
string nonce = Guid.NewGuid().ToString("N");
string sign = Security.MD5Utility.Hash($"{_agencyId}{timestamp}{nonce}{_agencyApiKey}").ToLower();
string token = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{_agencyId},{timestamp},{nonce},{sign}"));
flurlCall.Request.RemoveQueryParam("agency_token");
flurlCall.Request.SetQueryParam("agency_token", token);
}
}
}

57
src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs
View File

@@ -20,24 +20,24 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
/// <summary>
/// 获取当前客户端使用的微信广告平台服务商 ID。
/// </summary>
public string AgencyId { get; }
public string WechatAgencyId { get; }
/// <summary>
/// 获取当前客户端使用的微信广告平台服务商 AppId。
/// </summary>
public string AgencyAppId { get; }
public string WechatAgencyAppId { get; }
/// <summary>
/// 获取当前客户端使用的微信广告平台服务商 ApiKey。
/// </summary>
internal string AgencyApiKey { get; }
internal string WechatAgencyApiKey { get; }
/// <summary>
/// 获取当前客户端使用的 JSON 序列化器。
/// </summary>
internal ISerializer JsonSerializer
internal ISerializer FlurlJsonSerializer
{
get { return ProxyFlurlClient.Settings?.JsonSerializer ?? new FlurlNewtonsoftJsonSerializer(); }
get { return FlurlClient.Settings?.JsonSerializer ?? new FlurlNewtonsoftJsonSerializer(); }
}
/// <summary>
@@ -49,18 +49,17 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
{
if (options == null) throw new ArgumentNullException(nameof(options));
AgencyId = options.AgencyId;
AgencyAppId = options.AgencyAppId;
AgencyApiKey = options.AgencyApiKey;
WechatAgencyId = options.AgencyId;
WechatAgencyAppId = options.AgencyAppId;
WechatAgencyApiKey = options.AgencyApiKey;
ProxyFlurlClient.BaseUrl = options.Endpoints ?? WechatAdsEndpoints.DEFAULT;
ProxyFlurlClient.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout));
FlurlClient.BaseUrl = options.Endpoints ?? WechatAdsEndpoints.DEFAULT;
FlurlClient.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout));
var interceptorAuthenticator = new Interceptors.WechatAdsAuthenticator(
Interceptors.Add(new Interceptors.WechatAdsAgencyTokenInterceptor(
agencyId: options.AgencyId,
agencyApiKey: options.AgencyApiKey
);
ProxyFlurlClient.BeforeCall((call) => interceptorAuthenticator.Authenticate(call));
));
}
/// <summary>
@@ -78,17 +77,17 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
/// 异步发起请求。
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="request"></param>
/// <param name="flurlRequest"></param>
/// <param name="content"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
public async Task<T> SendRequestAsync<T>(IFlurlRequest request, HttpContent? content = null, CancellationToken cancellationToken = default)
public async Task<T> SendRequestAsync<T>(IFlurlRequest flurlRequest, HttpContent? content = null, CancellationToken cancellationToken = default)
where T : WechatAdsResponse, new()
{
try
{
using IFlurlResponse response = await base.SendRequestAsync(request, content, cancellationToken).ConfigureAwait(false);
return await GetResposneAsync<T>(response).ConfigureAwait(false);
using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, content, cancellationToken).ConfigureAwait(false);
return await GetResposneAsync<T>(flurlResponse).ConfigureAwait(false);
}
catch (FlurlHttpException ex)
{
@@ -100,17 +99,17 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
/// 异步发起请求。
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="request"></param>
/// <param name="flurlRequest"></param>
/// <param name="data"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
public async Task<T> SendRequestWithJsonAsync<T>(IFlurlRequest request, object? data = null, CancellationToken cancellationToken = default)
public async Task<T> SendRequestWithJsonAsync<T>(IFlurlRequest flurlRequest, object? data = null, CancellationToken cancellationToken = default)
where T : WechatAdsResponse, new()
{
try
{
using IFlurlResponse response = await base.SendRequestWithJsonAsync(request, data, cancellationToken).ConfigureAwait(false);
return await GetResposneAsync<T>(response).ConfigureAwait(false);
using IFlurlResponse flurlResponse = await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken).ConfigureAwait(false);
return await GetResposneAsync<T>(flurlResponse).ConfigureAwait(false);
}
catch (FlurlHttpException ex)
{
@@ -118,27 +117,27 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
}
}
private async Task<T> GetResposneAsync<T>(IFlurlResponse response)
private async Task<T> GetResposneAsync<T>(IFlurlResponse flurlResponse)
where T : WechatAdsResponse, new()
{
string contentType = response.Headers.GetAll("Content-Type").FirstOrDefault() ?? string.Empty;
string contentDisposition = response.Headers.GetAll("Content-Disposition").FirstOrDefault() ?? string.Empty;
string contentType = flurlResponse.Headers.GetAll("Content-Type").FirstOrDefault() ?? string.Empty;
string contentDisposition = flurlResponse.Headers.GetAll("Content-Disposition").FirstOrDefault() ?? string.Empty;
bool contentTypeIsNotJson =
(response.StatusCode != (int)HttpStatusCode.OK) ||
(flurlResponse.StatusCode != (int)HttpStatusCode.OK) ||
(!contentType.StartsWith("application/json") && !contentType.StartsWith("text/json")) ||
(contentDisposition.StartsWith("attachment"));
T result = contentTypeIsNotJson ? new T() : await response.GetJsonAsync<T>().ConfigureAwait(false);
result.RawStatus = response.StatusCode;
T result = contentTypeIsNotJson ? new T() : await flurlResponse.GetJsonAsync<T>().ConfigureAwait(false);
result.RawStatus = flurlResponse.StatusCode;
result.RawHeaders = new ReadOnlyDictionary<string, string>(
response.Headers
flurlResponse.Headers
.GroupBy(e => e.Name)
.ToDictionary(
k => k.Key,
v => string.Join(", ", v.Select(e => e.Value))
)
);
result.RawBytes = await response.ResponseMessage.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
result.RawBytes = await flurlResponse.ResponseMessage.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
return result;
}
}