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

feat: 移除基础依赖库，升级公共组件，并适配 .NET 6.0

Browse Source
This commit is contained in:
Fu Diwei
2021-11-09 15:23:23 +08:00
parent b11f6bb73b
commit acea1b477c
62 changed files with 149 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientParameterExtensions.cs
View File

@@ -35,7 +35,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
string timestamp = DateTimeOffset.Now.ToLocalTime().ToUnixTimeSeconds().ToString();
string nonce = Guid.NewGuid().ToString("N");
string sign = Security.SHA1Utility.Hash($"jsapi_ticket={jsapiTicket}&noncestr={nonce}&timestamp={timestamp}&url={url.Split('#')[0]}").ToLower();
string sign = Utilities.SHA1Utility.Hash($"jsapi_ticket={jsapiTicket}&noncestr={nonce}&timestamp={timestamp}&url={url.Split('#')[0]}").ToLower();
return new ReadOnlyDictionary<string, string>(new Dictionary<string, string>()
{
@@ -64,7 +64,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
string timestamp = DateTimeOffset.Now.ToLocalTime().ToUnixTimeSeconds().ToString();
string nonce = Guid.NewGuid().ToString("N");
string sign = Security.SHA1Utility.Hash($"jsapi_ticket={jsapiTicket}&noncestr={nonce}&timestamp={timestamp}&url={url.Split('#')[0]}").ToLower();
string sign = Utilities.SHA1Utility.Hash($"jsapi_ticket={jsapiTicket}&noncestr={nonce}&timestamp={timestamp}&url={url.Split('#')[0]}").ToLower();
return new ReadOnlyDictionary<string, string>(new Dictionary<string, string>()
{

8
src/SKIT.FlurlHttpClient.Wechat.Work/SKIT.FlurlHttpClient.Wechat.Work.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461; netstandard2.0; net5.0</TargetFrameworks>
<TargetFrameworks>net461; netstandard2.0; net5.0; net6.0</TargetFrameworks>
<LangVersion>8.0</LangVersion>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
@@ -27,11 +27,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SKIT.FlurlHttpClient.Wechat\SKIT.FlurlHttpClient.Wechat.csproj" />
<PackageReference Include="SKIT.FlurlHttpClient.Common" Version="2.0.0" />
</ItemGroup>
</Project>

39
src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/SHA1Utility.cs Normal file
View File

@@ -0,0 +1,39 @@
using System;
using System.Security.Cryptography;
using System.Text;
namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities
{
/// <summary>
/// SHA-1 算法工具类。
/// </summary>
public static class SHA1Utility
{
/// <summary>
/// 获取信息摘要。
/// </summary>
/// <param name="bytes">信息字节数组。</param>
/// <returns>信息摘要。</returns>
public static string 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("-", "");
}
/// <summary>
/// 获取信息摘要。
/// </summary>
/// <param name="message">文本信息。</param>
/// <returns>信息摘要。</returns>
public static string Hash(string message)
{
if (message == null) throw new ArgumentNullException(nameof(message));
byte[] bytes = Encoding.UTF8.GetBytes(message);
return Hash(bytes);
}
}
}

8
src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/WxBizMsgCryptor.cs
View File

@@ -81,7 +81,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities
if (ivBytes == null) throw new ArgumentNullException(nameof(ivBytes));
if (cipherBytes == null) throw new ArgumentNullException(nameof(cipherBytes));
using RijndaelManaged aes = new RijndaelManaged();
using var aes = Aes.Create();
aes.KeySize = 256;
aes.BlockSize = 128;
aes.Mode = CipherMode.CBC;
@@ -109,7 +109,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities
if (ivBytes == null) throw new ArgumentNullException(nameof(ivBytes));
if (plainBytes == null) throw new ArgumentNullException(nameof(plainBytes));
using var aes = new RijndaelManaged();
using var aes = Aes.Create();
aes.KeySize = AES_KEY_SIZE;
aes.BlockSize = AES_BLOCK_SIZE;
//aes.Padding = PaddingMode.PKCS7;
@@ -238,7 +238,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities
set.Add(sMsgEncrypt);
string rawText = string.Join(string.Empty, set.ToArray());
string signText = Security.SHA1Utility.Hash(rawText);
string signText = Utilities.SHA1Utility.Hash(rawText);
return signText.ToLower();
}
@@ -273,7 +273,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities
try
{
XmlDocument xmlDoc = new XmlDocument();
xmlDoc.XmlResolver = null;
xmlDoc.XmlResolver = null!;
xmlDoc.LoadXml(xml);
XmlNode? xmlRoot = xmlDoc.FirstChild;

5
src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs
View File

@@ -1,21 +1,18 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Flurl.Http;
using Flurl.Http.Configuration;
namespace SKIT.FlurlHttpClient.Wechat.Work
{
/// <summary>
/// 一个企业微信 API HTTP 客户端。
/// </summary>
public class WechatWorkClient : CommonClientBase, IWechatClient
public class WechatWorkClient : CommonClientBase, ICommonClient
{
/// <summary>
/// 获取当前客户端使用的企业微信凭证。

2
src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkRequest.cs
View File

@@ -5,7 +5,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
/// <summary>
/// 表示企业微信 API 请求的基类。
/// </summary>
public abstract class WechatWorkRequest : IWechatRequest
public abstract class WechatWorkRequest : ICommonRequest
{
/// <summary>
/// 获取或设置请求超时时间（单位：毫秒）。如果不指定将使用构造 <see cref="WechatWorkClient"/> 时的 <see cref="WechatWorkClientOptions.Timeout"/> 参数，这在需要指定特定耗时请求（比如上传或下载文件）的超时时间时很有用。

2
src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkResponse.cs
View File

@@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
/// <summary>
/// 表示企业微信 API 响应的基类。
/// </summary>
public abstract class WechatWorkResponse : IWechatResponse
public abstract class WechatWorkResponse : ICommonResponse
{
/// <summary>
/// 获取原始的 HTTP 响应状态码。