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

refactor: clean code

Browse Source
This commit is contained in:
Fu Diwei 2022-03-11 20:07:12 +08:00
parent 6e4e621440
commit ac8034ee93
58 changed files with 206 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
string filename = "file.zip";
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(new StringContent(request.CustomAudienceId.ToString()), "audience_id");
httpContent.Add(new StringContent(request.UserIdType), "user_id_type");

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

@ -35,11 +35,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
if (request.FileHash == null)
{
request.FileHash = Utilities.MD5Utility.Hash(request.FileBytes ?? new byte[0]);
request.FileHash = BitConverter.ToString(Utilities.MD5Utility.Hash(request.FileBytes ?? Array.Empty<byte>())).Replace("-", "");
}
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"file\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);

6
src/SKIT.FlurlHttpClient.Wechat.Ads/Models/CustomAudiences/Files/CustomAudienceFilesAddRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [POST] /custom_audience_files/add 接口的请求。</para>
@ -31,6 +33,6 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
}
}

6
src/SKIT.FlurlHttpClient.Wechat.Ads/Models/Images/ImagesAddRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [POST] /images/add 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置图片文件名。如果不指定将由系统自动生成。

12
src/SKIT.FlurlHttpClient.Wechat.Ads/Utilities/MD5Utility.cs
View File

@ -13,14 +13,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Utilities
/// 获取 MD5 信息摘要。
/// </summary>
/// <param name="bytes">信息字节数组。</param>
/// <returns>信息摘要。</returns>
public static string Hash(byte[] bytes)
/// <returns>信息摘要字节数组。</returns>
public static byte[] Hash(byte[] bytes)
{
if (bytes == null) throw new ArgumentNullException(nameof(bytes));
using MD5 md5 = MD5.Create();
byte[] hashBytes = md5.ComputeHash(bytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
return md5.ComputeHash(bytes);
}
/// <summary>
@ -32,8 +31,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Utilities
{
if (message == null) throw new ArgumentNullException(nameof(message));
byte[] bytes = Encoding.UTF8.GetBytes(message);
return Hash(bytes);
byte[] msgBytes = Encoding.UTF8.GetBytes(message);
byte[] hashBytes = Hash(msgBytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
}
}
}

24
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCVExtensions.cs
View File

@ -18,10 +18,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (fileBytes != null && fileBytes.Any())
{
var fileContent = new ByteArrayContent(fileBytes);
var fileContent = new ByteArrayContent(fileBytes ?? Array.Empty<byte>());
httpContent.Add(fileContent, "\"img\"", "\"image.png\"");
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png");
fileContent.Headers.ContentLength = fileBytes.Length;
fileContent.Headers.ContentLength = fileBytes?.Length;
}
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
@ -51,7 +51,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (request.ImageUrl != null)
flurlReq.SetQueryParam("img_url", request.ImageUrl);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty<byte>());
return await client.SendRequestAsync<Models.CVImageQrcodeResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
@ -76,7 +76,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (request.ImageUrl != null)
flurlReq.SetQueryParam("img_url", request.ImageUrl);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty<byte>());
return await client.SendRequestAsync<Models.CVImageSuperResolutionResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
@ -101,7 +101,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (request.ImageUrl != null)
flurlReq.SetQueryParam("img_url", request.ImageUrl);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty<byte>());
return await client.SendRequestAsync<Models.CVImageAICropResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
#endregion
@ -129,7 +129,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (request.ImageUrl != null)
flurlReq.SetQueryParam("img_url", request.ImageUrl);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty<byte>());
return await client.SendRequestAsync<Models.CVOCRIdCardResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
@ -155,7 +155,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (request.ImageUrl != null)
flurlReq.SetQueryParam("img_url", request.ImageUrl);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty<byte>());
return await client.SendRequestAsync<Models.CVOCRBankCardResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
@ -181,7 +181,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (request.ImageUrl != null)
flurlReq.SetQueryParam("img_url", request.ImageUrl);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty<byte>());
return await client.SendRequestAsync<Models.CVOCRDrivingResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
@ -207,7 +207,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (request.ImageUrl != null)
flurlReq.SetQueryParam("img_url", request.ImageUrl);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty<byte>());
return await client.SendRequestAsync<Models.CVOCRDrivingLicenseResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
@ -233,7 +233,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (request.ImageUrl != null)
flurlReq.SetQueryParam("img_url", request.ImageUrl);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty<byte>());
return await client.SendRequestAsync<Models.CVOCRBusinessLicenseResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
@ -258,7 +258,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (request.ImageUrl != null)
flurlReq.SetQueryParam("img_url", request.ImageUrl);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty<byte>());
return await client.SendRequestAsync<Models.CVOCRCommonResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
@ -282,7 +282,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (request.ImageUrl != null)
flurlReq.SetQueryParam("img_url", request.ImageUrl);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]);
using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty<byte>());
return await client.SendRequestAsync<Models.CVOCRPlateNumberResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
#endregion

2
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardInvoiceExtensions.cs
View File

@ -356,7 +356,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var httpContent = new MultipartFormDataContent(boundary);
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
httpContent.Add(fileContent, "\"pdf\"", "\"invoice.pdf\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/pdf");

2
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinComponentExtensions.cs
View File

@ -388,7 +388,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
.SetQueryParam("access_token", request.AccessToken);
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"file\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);

2
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMaterialExtensions.cs
View File

@ -85,7 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
.SetQueryParam("type", request.Type);
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var descContent = new ByteArrayContent(Encoding.UTF8.GetBytes(client.JsonSerializer.Serialize(request)));
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");

8
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMediaExtensions.cs
View File

@ -63,7 +63,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
.SetQueryParam("type", request.Type);
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
@ -122,7 +122,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
.SetQueryParam("access_token", request.AccessToken);
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
@ -193,7 +193,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
.SetQueryParam("voice_id", request.VoiceId)
.SetQueryParam("lang", request.Language);
using var httpContent = new ByteArrayContent(request.VoiceBytes);
using var httpContent = new ByteArrayContent(request.VoiceBytes ?? Array.Empty<byte>());
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("audio/mp3");
return await client.SendRequestAsync<Models.CgibinMediaVoiceAddVoiceToRecognitionForTextResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
@ -240,7 +240,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
.SetQueryParam("lfrom", request.FromLanguage)
.SetQueryParam("lto", request.ToLanguage);
using var httpContent = new ByteArrayContent(request.VoiceBytes);
using var httpContent = new ByteArrayContent(request.VoiceBytes ?? Array.Empty<byte>());
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("audio/mp3");
return await client.SendRequestAsync<Models.CgibinMediaVoiceTranslateContentResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);

2
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCustomServiceExtensions.cs
View File

@ -94,7 +94,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
.SetQueryParam("kf_account", request.KfAccount);
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.HeadImageFileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.HeadImageFileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"media\"", "\"image.jpg\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);

2
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteMerchantExtensions.cs
View File

@ -663,7 +663,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
.CreateRequest(request, HttpMethod.Post, "merchant", "common", "upload_img")
.SetQueryParam("access_token", request.AccessToken);
using var httpContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var httpContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png");
return await client.SendRequestAsync<Models.MerchantCommonUploadImageResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);

2
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteProductExtensions.cs
View File

@ -43,7 +43,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var httpContent = new MultipartFormDataContent(boundary);
using var fileContent = new ByteArrayContent(request.ImageFileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.ImageFileBytes ?? Array.Empty<byte>());
httpContent.Add(fileContent, "\"media\"", "\"image.png\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png");

2
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteShopExtensions.cs
View File

@ -41,7 +41,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var httpContent = new MultipartFormDataContent(boundary);
using var fileContent = new ByteArrayContent(request.ImageFileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.ImageFileBytes ?? Array.Empty<byte>());
httpContent.Add(fileContent, "\"media\"", "\"image.png\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png");

6
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs
View File

@ -391,7 +391,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
.SetQueryParam("access_token", request.AccessToken);
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"media\"", "\"image.png\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
@ -784,11 +784,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var httpContent = new MultipartFormDataContent(boundary);
using var fileContent = new ByteArrayContent(request.ImageFileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.ImageFileBytes ?? Array.Empty<byte>());
httpContent.Add(fileContent, "\"img\"", "\"image.png\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png");
fileContent.Headers.ContentLength = request.ImageFileBytes?.Length;
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
return await client.SendRequestAsync<Models.WxaImageSearchResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}

6
src/SKIT.FlurlHttpClient.Wechat.Api/Models/CardInvoice/Platform/CardInvoicePlatformSetPdfRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /card/invoice/platform/setpdf 接口的请求。</para>
@ -10,6 +12,6 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
}
}

6
src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentUploadPrivacyExtraFileRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /cgi-bin/component/uploadprivacyextfile 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置图片文件名。如果不指定将由系统自动生成。

2
src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialAddMaterialRequest.cs
View File

@ -20,7 +20,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置文件名。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMedia/CgibinMediaUploadImageRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /cgi-bin/media/uploadimg 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置图片文件名。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMedia/CgibinMediaUploadRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /cgi-bin/media/upload 接口的请求。</para>
@ -17,7 +19,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置文件名。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMedia/Voice/CgibinMediaVoiceAddVoiceToRecognitionForTextRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /cgi-bin/media/voice/addvoicetorecofortext 接口的请求。</para>
@ -25,7 +27,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] VoiceBytes { get; set; } = new byte[0];
public byte[] VoiceBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置语言。

6
src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMedia/Voice/CgibinMediaVoiceTranslateContentRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /cgi-bin/media/voice/translatecontent 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] VoiceBytes { get; set; } = new byte[0];
public byte[] VoiceBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置源语言。

6
src/SKIT.FlurlHttpClient.Wechat.Api/Models/CustomService/KfAccount/CustomServiceKfAccountUploadHeadImageRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /customservice/kfaccount/uploadheadimg 接口的请求。</para>
@ -17,6 +19,6 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] HeadImageFileBytes { get; set; } = new byte[0];
public byte[] HeadImageFileBytes { get; set; } = Array.Empty<byte>();
}
}

6
src/SKIT.FlurlHttpClient.Wechat.Api/Models/Merchant/Common/MerchantCommonUploadImageRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /merchant/common/upload_img 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置图片文件名。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/Search/WxaImageSearchRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /wxa/imagesearch 接口的请求。</para>
@ -10,6 +12,6 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] ImageFileBytes { get; set; } = new byte[0];
public byte[] ImageFileBytes { get; set; } = Array.Empty<byte>();
}
}

6
src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/Security/WxaImageSecurityCheckRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /wxa/img_sec_check 接口的请求。</para>
@ -10,6 +12,6 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
}
}

18
src/SKIT.FlurlHttpClient.Wechat.Api/Utilities/HMACUtility.cs
View File

@ -13,16 +13,15 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Utilities
/// 获取 HMAC-SHA-256 消息认证码。
/// </summary>
/// <param name="secretBytes">密钥字节数组。</param>
/// <param name="bytes">信息字节数组。</param>
/// <returns>信息摘要。</returns>
public static string HashWithSHA256(byte[] secretBytes, byte[] bytes)
/// <param name="msgBytes">信息字节数组。</param>
/// <returns>消息认证码字节数组。</returns>
public static byte[] HashWithSHA256(byte[] secretBytes, byte[] msgBytes)
{
if (secretBytes == null) throw new ArgumentNullException(nameof(secretBytes));
if (bytes == null) throw new ArgumentNullException(nameof(bytes));
if (msgBytes == null) throw new ArgumentNullException(nameof(msgBytes));
using HMAC hmac = new HMACSHA256(secretBytes);
byte[] hashBytes = hmac.ComputeHash(bytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
return hmac.ComputeHash(msgBytes);
}
/// <summary>
@ -30,15 +29,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Utilities
/// </summary>
/// <param name="secret">密钥。</param>
/// <param name="message">文本信息。</param>
/// <returns>信息摘要。</returns>
/// <returns>消息认证码。</returns>
public static string HashWithSHA256(string secret, string message)
{
if (secret == null) throw new ArgumentNullException(nameof(secret));
if (message == null) throw new ArgumentNullException(nameof(message));
byte[] secretBytes = Encoding.UTF8.GetBytes(secret);
byte[] bytes = Encoding.UTF8.GetBytes(message);
return HashWithSHA256(secretBytes, bytes);
byte[] msgBytes = Encoding.UTF8.GetBytes(message);
byte[] hashBytes = HashWithSHA256(secretBytes, msgBytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
}
}
}

12
src/SKIT.FlurlHttpClient.Wechat.Api/Utilities/SHA1Utility.cs
View File

@ -13,14 +13,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Utilities
/// 获取 SHA-1 信息摘要。
/// </summary>
/// <param name="bytes">信息字节数组。</param>
/// <returns>信息摘要。</returns>
public static string Hash(byte[] bytes)
/// <returns>信息摘要字节数组。</returns>
public static byte[] Hash(byte[] bytes)
{
if (bytes == null) throw new ArgumentNullException(nameof(bytes));
using SHA1 sha = SHA1.Create();
byte[] hashBytes = sha.ComputeHash(bytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
return sha.ComputeHash(bytes);
}
/// <summary>
@ -32,8 +31,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Utilities
{
if (message == null) throw new ArgumentNullException(nameof(message));
byte[] bytes = Encoding.UTF8.GetBytes(message);
return Hash(bytes);
byte[] msgBytes = Encoding.UTF8.GetBytes(message);
byte[] hashBytes = Hash(msgBytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
}
}
}

2
src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/Platform/WechatOpenAIPlatformClientExecuteMpExtensions.cs
View File

@ -110,7 +110,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI
IFlurlRequest flurlReq = client
.CreateRequest(request, HttpMethod.Post, "assetsupload", client.Credentials.Token!);
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var paramContent = new StringContent(
Utilities.WxBizMsgCryptor.AESEncrypt(
plainText: Utilities.XmlUtility.Serialize(request),

2
src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/ThirdParty/WechatOpenAIThirdPartyClientExecuteFileExtensions.cs vendored
View File

@ -32,7 +32,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI
IFlurlRequest flurlReq = client
.CreateRequest(request, HttpMethod.Post, "v1", "file", "upload");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent();
httpContent.Add(fileContent, "\"file\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(request.FileContentType);

5
src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Platform/Mp/AssetsUploadRequest.cs
View File

@ -1,4 +1,5 @@
using System.Xml.Serialization;
using System;
using System.Xml.Serialization;
namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models.Platform
{
@ -18,7 +19,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models.Platform
/// 获取或设置文件字节数组。
/// </summary>
[XmlIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置文件名。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdParty/File/FileUploadRequest.cs vendored
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models.ThirdParty
using System;
namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models.ThirdParty
{
/// <summary>
/// <para>表示 [POST] /v1/file/upload 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置文件名。如果不指定将由系统自动生成。

12
src/SKIT.FlurlHttpClient.Wechat.OpenAI/Utilities/SHA1Utility.cs
View File

@ -13,14 +13,13 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Utilities
/// 获取 SHA-1 信息摘要。
/// </summary>
/// <param name="bytes">信息字节数组。</param>
/// <returns>信息摘要。</returns>
public static string Hash(byte[] bytes)
/// <returns>信息摘要字节数组。</returns>
public static byte[] Hash(byte[] bytes)
{
if (bytes == null) throw new ArgumentNullException(nameof(bytes));
using SHA1 sha = SHA1.Create();
byte[] hashBytes = sha.ComputeHash(bytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
return sha.ComputeHash(bytes);
}
/// <summary>
@ -32,8 +31,9 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Utilities
{
if (message == null) throw new ArgumentNullException(nameof(message));
byte[] bytes = Encoding.UTF8.GetBytes(message);
return Hash(bytes);
byte[] msgBytes = Encoding.UTF8.GetBytes(message);
byte[] hashBytes = Hash(msgBytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
}
}
}

2
src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientEventDecryptionExtensions.cs
View File

@ -43,7 +43,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2
{
string plainXml = Utilities.AESUtility.DecryptWithECB(
encodingKey: Convert.ToBase64String(Encoding.UTF8.GetBytes(key)),
encodingCipherText: callback.EncryptedRequestInfo
encodingCipherText: callback.EncryptedRequestInfo!
);
plainJson = Utilities.XmlUtility.ConvertToJson(plainXml);
}

5
src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMediaExtensions.cs
View File

@ -29,14 +29,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2
request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".jpg";
if (request.FileHash == null)
request.FileHash = Utilities.MD5Utility.Hash(request.FileBytes).ToLower();
request.FileHash = BitConverter.ToString(Utilities.MD5Utility.Hash(request.FileBytes ?? Array.Empty<byte>())).Replace("-", "").ToLower();
IFlurlRequest flurlReq = client
.CreateRequest(request, HttpMethod.Post, "secapi", "mch", "uploadmedia");
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
string sign = Utilities.RequestSigner.Sign(new Dictionary<string, string?>() { { "mch_id", client.Credentials.MerchantId }, { "media_hash", request.FileHash } }, client.Credentials.MerchantSecret, Constants.SignTypes.MD5);
using var fileContent = new ByteArrayContent(request.FileBytes);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");
httpContent.Add(new StringContent(client.Credentials.MerchantId, Encoding.UTF8), $"\"mch_id\"");
@ -44,6 +44,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2
httpContent.Add(new StringContent(sign, Encoding.UTF8), $"\"sign\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/jpeg");
fileContent.Headers.ContentLength = request.FileBytes?.Length;
return await client.SendRequestAsync<Models.UploadMerchantMediaResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}

6
src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMedia/UploadMerchantMediaRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models
{
/// <summary>
/// <para>表示 [POST] /secapi/mch/uploadmedia 接口的请求。</para>
@ -24,7 +26,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置任务上传文件名。如果不指定将由系统自动生成。

18
src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Utilities/HMACUtility.cs
View File

@ -13,16 +13,15 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Utilities
/// 获取 HMAC-SHA-256 消息认证码。
/// </summary>
/// <param name="secretBytes">密钥字节数组。</param>
/// <param name="bytes">信息字节数组。</param>
/// <returns>信息摘要。</returns>
public static string HashWithSHA256(byte[] secretBytes, byte[] bytes)
/// <param name="msgBytes">信息字节数组。</param>
/// <returns>消息认证码字节数组。</returns>
public static byte[] HashWithSHA256(byte[] secretBytes, byte[] msgBytes)
{
if (secretBytes == null) throw new ArgumentNullException(nameof(secretBytes));
if (bytes == null) throw new ArgumentNullException(nameof(bytes));
if (msgBytes == null) throw new ArgumentNullException(nameof(msgBytes));
using HMAC hmac = new HMACSHA256(secretBytes);
byte[] hashBytes = hmac.ComputeHash(bytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
return hmac.ComputeHash(msgBytes);
}
/// <summary>
@ -30,15 +29,16 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Utilities
/// </summary>
/// <param name="secret">密钥。</param>
/// <param name="message">文本信息。</param>
/// <returns>信息摘要。</returns>
/// <returns>消息认证码。</returns>
public static string HashWithSHA256(string secret, string message)
{
if (secret == null) throw new ArgumentNullException(nameof(secret));
if (message == null) throw new ArgumentNullException(nameof(message));
byte[] secretBytes = Encoding.UTF8.GetBytes(secret);
byte[] bytes = Encoding.UTF8.GetBytes(message);
return HashWithSHA256(secretBytes, bytes);
byte[] msgBytes = Encoding.UTF8.GetBytes(message);
byte[] hashBytes = HashWithSHA256(secretBytes, msgBytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
}
}
}

2
src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Utilities/Internal/ReflectionUtility.cs
View File

@ -47,7 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Utilities
}
}
element = updateFactory(element);
element = updateFactory(element!);
array.SetValue(element, index);
}

4
src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Utilities/Internal/XmlUtility.cs
View File

@ -10,7 +10,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Utilities
{
public static string ConvertFromJson(string json)
{
XmlDocument xmlDocument = JsonConvert.DeserializeXmlNode(json, "xml");
XmlDocument xmlDocument = JsonConvert.DeserializeXmlNode(json, "xml")!;
string xml = xmlDocument.InnerXml;
return xml;
}
@ -25,7 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Utilities
xCData.Remove();
}
JObject jObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXNode(xElement));
JObject jObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXNode(xElement))!;
string json = (jObject.First as JProperty)?.Value?.ToString(Newtonsoft.Json.Formatting.None) ?? "{}";
return json;
}

12
src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Utilities/MD5Utility.cs
View File

@ -13,14 +13,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Utilities
/// 获取 MD5 信息摘要。
/// </summary>
/// <param name="bytes">信息字节数组。</param>
/// <returns>信息摘要。</returns>
public static string Hash(byte[] bytes)
/// <returns>信息摘要字节数组。</returns>
public static byte[] Hash(byte[] bytes)
{
if (bytes == null) throw new ArgumentNullException(nameof(bytes));
using MD5 md5 = MD5.Create();
byte[] hashBytes = md5.ComputeHash(bytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
return md5.ComputeHash(bytes);
}
/// <summary>
@ -32,8 +31,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Utilities
{
if (message == null) throw new ArgumentNullException(nameof(message));
byte[] bytes = Encoding.UTF8.GetBytes(message);
return Hash(bytes);
byte[] msgBytes = Encoding.UTF8.GetBytes(message);
byte[] hashBytes = Hash(msgBytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
}
}
}

5
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingBankExtensions.cs
View File

@ -32,7 +32,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".txt";
if (request.FileHash == null)
request.FileHash = Utilities.SHA256Utility.Hash(request.FileBytes).ToLower();
request.FileHash = BitConverter.ToString(Utilities.SHA256Utility.Hash(request.FileBytes ?? Array.Empty<byte>())).Replace("-", "").ToLower();
if (request.FileContentType == null)
request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "text/plain";
@ -41,7 +41,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateRequest(request, HttpMethod.Post, "marketing", "bank", "packages", request.PackageId, "tasks");
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var metaContent = new ByteArrayContent(Encoding.UTF8.GetBytes(client.JsonSerializer.Serialize(request)));
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(metaContent, $"\"{Constants.FormDataFields.FORMDATA_META}\"");
@ -49,6 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
metaContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(request.FileContentType);
fileContent.Headers.ContentLength = request.FileBytes?.Length;
return await client.SendRequestAsync<Models.UploadMarketingBankPackagesTasksResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}

5
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingMediaExtensions.cs
View File

@ -32,7 +32,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".png";
if (request.FileHash == null)
request.FileHash = Utilities.SHA256Utility.Hash(request.FileBytes).ToLower();
request.FileHash = BitConverter.ToString(Utilities.SHA256Utility.Hash(request.FileBytes)).Replace("-", "").ToLower();
if (request.FileContentType == null)
request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png";
@ -41,7 +41,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateRequest(request, HttpMethod.Post, "marketing", "favor", "media", "image-upload");
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var metaContent = new ByteArrayContent(Encoding.UTF8.GetBytes(client.JsonSerializer.Serialize(request)));
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(metaContent, $"\"{Constants.FormDataFields.FORMDATA_META}\"");
@ -49,6 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
metaContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(request.FileContentType);
fileContent.Headers.ContentLength = request.FileBytes?.Length;
return await client.SendRequestAsync<Models.UploadMarketingMediaImageResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}

10
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantMediaExtensions.cs
View File

@ -33,7 +33,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".png";
if (request.FileHash == null)
request.FileHash = Utilities.SHA256Utility.Hash(request.FileBytes).ToLower();
request.FileHash = BitConverter.ToString(Utilities.SHA256Utility.Hash(request.FileBytes)).Replace("-", "").ToLower();
if (request.FileContentType == null)
request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png";
@ -42,7 +42,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateRequest(request, HttpMethod.Post, "merchant", "media", "upload");
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var metaContent = new StringContent(client.JsonSerializer.Serialize(request), Encoding.UTF8, "application/json");
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(metaContent, $"\"{Constants.FormDataFields.FORMDATA_META}\"");
@ -50,6 +50,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
metaContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(request.FileContentType);
fileContent.Headers.ContentLength = request.FileBytes?.Length;
return await client.SendRequestAsync<Models.UploadMerchantMediaImageResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}
@ -72,7 +73,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".mp4";
if (request.FileHash == null)
request.FileHash = Utilities.SHA256Utility.Hash(request.FileBytes).ToLower();
request.FileHash = BitConverter.ToString(Utilities.SHA256Utility.Hash(request.FileBytes)).Replace("-", "").ToLower();
if (request.FileContentType == null)
request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForVideo(request.FileName!) ?? "video/mp4";
@ -81,7 +82,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateRequest(request, HttpMethod.Post, "merchant", "media", "video_upload");
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var metaContent = new ByteArrayContent(Encoding.UTF8.GetBytes(client.JsonSerializer.Serialize(request)));
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(metaContent, $"\"{Constants.FormDataFields.FORMDATA_META}\"");
@ -89,6 +90,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
metaContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(request.FileContentType);
fileContent.Headers.ContentLength = request.FileBytes?.Length;
return await client.SendRequestAsync<Models.UploadMerchantMediaVideoResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}

5
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs
View File

@ -236,7 +236,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".png";
if (request.FileHash == null)
request.FileHash = Utilities.SHA256Utility.Hash(request.FileBytes).ToLower();
request.FileHash = BitConverter.ToString(Utilities.SHA256Utility.Hash(request.FileBytes)).Replace("-", "").ToLower();
if (request.FileContentType == null)
request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png";
@ -245,7 +245,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateRequest(request, HttpMethod.Post, "merchant-service", "images", "upload");
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var metaContent = new ByteArrayContent(Encoding.UTF8.GetBytes(client.JsonSerializer.Serialize(request)));
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(metaContent, $"\"{Constants.FormDataFields.FORMDATA_META}\"");
@ -253,6 +253,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
metaContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(request.FileContentType);
fileContent.Headers.ContentLength = request.FileBytes?.Length;
return await client.SendRequestAsync<Models.UploadMerchantServiceImageResponse>(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken);
}

6
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MarketingBank/UploadMarketingBankPackagesTasksRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
{
/// <summary>
/// <para>表示 [POST] /marketing/bank/packages/{package_id}/tasks 接口的请求。</para>
@ -17,7 +19,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置任务上传文件名。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MarketingMedia/UploadMarketingMediaImageRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
{
/// <summary>
/// <para>表示 [POST] /marketing/favor/media/image-upload 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置图片文件名（必须以 jpg、bmp、png 为后缀）。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantMedia/UploadMerchantMediaImageRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
{
/// <summary>
/// <para>表示 [POST] /merchant/media/upload 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置图片文件名（必须以 jpg、bmp、png 为后缀）。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantMedia/UploadMerchantMediaVideoRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
{
/// <summary>
/// <para>表示 [POST] /merchant/media/video_upload 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置视频文件名（必须以 avi、wmv、mpeg、mp4、mov、mkv、flv、f4v、m4v、rmvb 为后缀）。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/UploadMerchantServiceImageRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
{
/// <summary>
/// <para>表示 [POST] /merchant-service/images/upload 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置图片文件名（必须以 jpg、bmp、png 为后缀）。如果不指定将由系统自动生成。

12
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Utilities/SHA256Utility.cs
View File

@ -13,14 +13,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Utilities
/// 获取 SHA-256 信息摘要。
/// </summary>
/// <param name="bytes">信息字节数组。</param>
/// <returns>信息摘要。</returns>
public static string Hash(byte[] bytes)
/// <returns>信息摘要字节数组。</returns>
public static byte[] Hash(byte[] bytes)
{
if (bytes == null) throw new ArgumentNullException(nameof(bytes));
using SHA256 sha = SHA256.Create();
byte[] hashBytes = sha.ComputeHash(bytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
return sha.ComputeHash(bytes);
}
/// <summary>
@ -32,8 +31,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Utilities
{
if (message == null) throw new ArgumentNullException(nameof(message));
byte[] bytes = Encoding.UTF8.GetBytes(message);
return Hash(bytes);
byte[] msgBytes = Encoding.UTF8.GetBytes(message);
byte[] hashBytes = Hash(msgBytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
}
}
}

6
src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMediaExtensions.cs
View File

@ -61,7 +61,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
.SetQueryParam("type", request.Type);
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
@ -97,7 +97,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
.SetQueryParam("access_token", request.AccessToken);
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);
@ -157,7 +157,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
.SetQueryParam("attachment_type", request.AttachmentType);
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);

2
src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinServiceExtensions.cs
View File

@ -317,7 +317,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
.SetQueryParam("type", request.Type);
string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x");
using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]);
using var fileContent = new ByteArrayContent(request.FileBytes ?? Array.Empty<byte>());
using var httpContent = new MultipartFormDataContent(boundary);
httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\"");
httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary);

6
src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaUploadAttachmentRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Work.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Work.Models
{
/// <summary>
/// <para>表示 [POST] /cgi-bin/media/upload_attachment 接口的请求。</para>
@ -24,7 +26,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置文件名。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaUploadImageRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Work.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Work.Models
{
/// <summary>
/// <para>表示 [POST] /cgi-bin/media/uploadimg 接口的请求。</para>
@ -10,7 +12,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置图片文件名。如果不指定将由系统自动生成。

6
src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaUploadRequest.cs
View File

@ -1,4 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Work.Models
using System;
namespace SKIT.FlurlHttpClient.Wechat.Work.Models
{
/// <summary>
/// <para>表示 [POST] /cgi-bin/media/upload 接口的请求。</para>
@ -17,7 +19,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public byte[] FileBytes { get; set; } = new byte[0];
public byte[] FileBytes { get; set; } = Array.Empty<byte>();
/// <summary>
/// 获取或设置文件名。如果不指定将由系统自动生成。

12
src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/SHA1Utility.cs
View File

@ -13,14 +13,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities
/// 获取 SHA-1 信息摘要。
/// </summary>
/// <param name="bytes">信息字节数组。</param>
/// <returns>信息摘要。</returns>
public static string Hash(byte[] bytes)
/// <returns>信息摘要字节数组。</returns>
public static byte[] Hash(byte[] bytes)
{
if (bytes == null) throw new ArgumentNullException(nameof(bytes));
using SHA1 sha = SHA1.Create();
byte[] hashBytes = sha.ComputeHash(bytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
return sha.ComputeHash(bytes);
}
/// <summary>
@ -32,8 +31,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities
{
if (message == null) throw new ArgumentNullException(nameof(message));
byte[] bytes = Encoding.UTF8.GetBytes(message);
return Hash(bytes);
byte[] msgBytes = Encoding.UTF8.GetBytes(message);
byte[] hashBytes = Hash(msgBytes);
return BitConverter.ToString(hashBytes).Replace("-", "");
}
}
}

4
test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_WechatEventDataCryptorTests.cs
View File

@ -4,7 +4,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
{
public class TestCase_WechatEventDataCryptorTests
{
[Fact(DisplayName = "试用例：验签并解密回调数据")]
[Fact(DisplayName = "测试用例：验签并解密回调数据")]
public void TestVerifyAndDecryptEvent()
{
string token = "QDG6eK";
@ -23,7 +23,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
Assert.True(Utilities.WechatEventDataCryptor.VerifySignature(token, reqTimeStamp, reqNonce, reqCipherText, reqMsgSig));
}
[Fact(DisplayName = "试用例：验签回调数据")]
[Fact(DisplayName = "测试用例：验签回调数据")]
public void TestVerifyEvent()
{
string token = "ovAkP0Tb";

2
test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestCase_WechatEventDataCryptorUtilityTests.cs → test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestCase_WechatEventDataCryptorTests.cs
View File

@ -2,7 +2,7 @@
namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests
{
public class TestCase_WechatEventDataCryptorUtilityTests
public class TestCase_WechatEventDataCryptorTests
{
[Fact(DisplayName = "测试用例：回调信息解析")]
public void TestWxBizMsgCryptorParsing()