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

fix(work): fix typo

Browse Source
This commit is contained in:
Fu Diwei
2021-08-02 21:31:05 +08:00
parent 8323a4c3bf
commit 2e31376048
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs
View File

@@ -299,7 +299,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
/// <param name="callbackTimestamp">微信回调通知中的 timestamp 字段。</param> /// <param name="callbackTimestamp">微信回调通知中的 timestamp 字段。</param>
/// <param name="callbackNonce">微信回调通知中的 nonce 字段。</param> /// <param name="callbackNonce">微信回调通知中的 nonce 字段。</param>
/// <param name="callbackJson">微信回调通知中请求正文（JSON 格式）。</param> /// <param name="callbackJson">微信回调通知中请求正文（JSON 格式）。</param>
/// <param name="callbackSignature">微信回调通知中的 signature 字段。</param> /// <param name="callbackSignature">微信回调通知中的 msg_signature 字段。</param>
/// <returns></returns> /// <returns></returns>
public static bool VerifyEventSignatureFromJson(this WechatApiClient client, string callbackTimestamp, string callbackNonce, string callbackJson, string callbackSignature) public static bool VerifyEventSignatureFromJson(this WechatApiClient client, string callbackTimestamp, string callbackNonce, string callbackJson, string callbackSignature)
{ {
@@ -331,7 +331,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
/// <param name="callbackTimestamp">微信回调通知中的 timestamp 字段。</param> /// <param name="callbackTimestamp">微信回调通知中的 timestamp 字段。</param>
/// <param name="callbackNonce">微信回调通知中的 nonce 字段。</param> /// <param name="callbackNonce">微信回调通知中的 nonce 字段。</param>
/// <param name="callbackXml">微信回调通知中请求正文（XML 格式）。</param> /// <param name="callbackXml">微信回调通知中请求正文（XML 格式）。</param>
/// <param name="callbackSignature">微信回调通知中的 signature 字段。</param> /// <param name="callbackSignature">微信回调通知中的 msg_signature 字段。</param>
/// <returns></returns> /// <returns></returns>
public static bool VerifyEventSignatureFromXml(this WechatApiClient client, string callbackTimestamp, string callbackNonce, string callbackXml, string callbackSignature) public static bool VerifyEventSignatureFromXml(this WechatApiClient client, string callbackTimestamp, string callbackNonce, string callbackXml, string callbackSignature)
{ {

14
src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventSerializationExtensions.cs → src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventExtensions.cs
View File

@@ -7,9 +7,9 @@ using System.Xml.Serialization;
namespace SKIT.FlurlHttpClient.Wechat.Work namespace SKIT.FlurlHttpClient.Wechat.Work
{ {
/// <summary> /// <summary>
/// 为 <see cref="WechatWorkClient"/> 提供回调通知事件序列化相关的扩展方法。 /// 为 <see cref="WechatWorkClient"/> 提供回调通知事件的扩展方法。
/// </summary> /// </summary>
public static class WechatWorkClientEventSerializationExtensions public static class WechatWorkClientEventExtensions
{ {
private class EncryptedWechatWorkEvent private class EncryptedWechatWorkEvent
{ {
@@ -46,11 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
if (string.IsNullOrEmpty(encryptedEvent.EncryptedData)) if (string.IsNullOrEmpty(encryptedEvent.EncryptedData))
throw new Exceptions.WechatWorkEventSerializationException("Encrypt event failed, because of empty encrypted data."); throw new Exceptions.WechatWorkEventSerializationException("Encrypt event failed, because of empty encrypted data.");
callbackJson = Utilities.WxBizMsgCryptor.AESDecrypt( callbackJson = Utilities.WxBizMsgCryptor.AESDecrypt(cipherText: encryptedEvent.EncryptedData, encodingAESKey: client.Credentials.PushEncodingAESKey!, out _);
cipherText: encryptedEvent.EncryptedData,
encodingAESKey: client.Credentials.PushEncodingAESKey!,
out _
);
return client.JsonSerializer.Deserialize<TEvent>(callbackJson); return client.JsonSerializer.Deserialize<TEvent>(callbackJson);
} }
@@ -72,9 +68,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
try try
{ {
if (!Utilities.WxBizMsgCryptor.TryParseXml(callbackXml, out callbackXml!)) if (!Utilities.WxBizMsgCryptor.TryParseXml(callbackXml, out string? encryptedXml))
throw new Exceptions.WechatWorkEventSerializationException("Encrypt event failed, because of empty encrypted data."); throw new Exceptions.WechatWorkEventSerializationException("Encrypt event failed, because of empty encrypted data.");
callbackXml = Utilities.WxBizMsgCryptor.AESDecrypt(cipherText: encryptedXml!, encodingAESKey: client.Credentials.PushEncodingAESKey!, out _);
using var reader = new StringReader(callbackXml); using var reader = new StringReader(callbackXml);
XmlSerializer xmlSerializer = new XmlSerializer(typeof(TEvent), new XmlRootAttribute("xml")); XmlSerializer xmlSerializer = new XmlSerializer(typeof(TEvent), new XmlRootAttribute("xml"));