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

refactor: 优化代码

Browse Source
This commit is contained in:
Fu Diwei
2024-07-18 15:56:20 +08:00
parent 08c675c6ba
commit fdb2d2a982
11 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SKIT.FlurlHttpClient.Wechat.Work/ExtendedSDK/Finance/InteropServices/MarshalerHelper.cs
View File

@@ -6,18 +6,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.ExtendedSDK.Finance.InteropServices
{
internal static class MarshalerHelper
{
public static string PtrToStringAnsi(IntPtr ptr)
public static string? PtrToStringAnsi(IntPtr ptr)
{
if (ptr == IntPtr.Zero)
return default!;
return null;
return Marshal.PtrToStringAnsi(ptr)!;
}
public static string PtrToStringUTF8(IntPtr ptr)
public static string? PtrToStringUTF8(IntPtr ptr)
{
if (ptr == IntPtr.Zero)
return default!;
return null;
#if NETCOREAPP || NET5_0_OR_GREATER
return Marshal.PtrToStringUTF8(ptr)!;

4
src/SKIT.FlurlHttpClient.Wechat.Work/ExtendedSDK/Finance/WechatWorkFinanceClient.cs
View File

@@ -159,7 +159,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.ExtendedSDK.Finance
IsRunOnWindows() ? FinanceDllWindowsPInvoker.GetContentFromSlice(dataPtr) :
IsRunOnLinux() ? FinanceDllLinuxPInvoker.GetContentFromSlice(dataPtr) :
throw new PlatformNotSupportedException();
string dataContent = MarshalerHelper.PtrToStringUTF8(dataContentPtr);
string dataContent = MarshalerHelper.PtrToStringUTF8(dataContentPtr)!;
response = JsonSerializer.Deserialize<Models.GetChatRecordsResponse>(dataContent);
response._InternalRawBytes = Encoding.UTF8.GetBytes(dataContent);
@@ -253,7 +253,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.ExtendedSDK.Finance
IsRunOnWindows() ? FinanceDllWindowsPInvoker.GetContentFromSlice(dataPtr) :
IsRunOnLinux() ? FinanceDllLinuxPInvoker.GetContentFromSlice(dataPtr) :
throw new PlatformNotSupportedException();
string dataContent = MarshalerHelper.PtrToStringUTF8(dataContentPtr);
string dataContent = MarshalerHelper.PtrToStringUTF8(dataContentPtr)!;
try
{

10
src/SKIT.FlurlHttpClient.Wechat.Work/ExtendedSDK/Finance/WechatWorkFinanceResponse.cs
View File

@@ -7,11 +7,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.ExtendedSDK.Finance
/// </summary>
public abstract class WechatWorkFinanceResponse : ICommonResponse
{
internal protected WechatWorkFinanceResponse()
{
_InternalRawBytes = Array.Empty<byte>();
}
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
internal byte[] _InternalRawBytes;
@@ -34,6 +29,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.ExtendedSDK.Finance
return _InternalRawBytes;
}
internal protected WechatWorkFinanceResponse()
{
_InternalRawBytes = Array.Empty<byte>();
}
/// <summary>
/// 获取企业微信会话内容存档 API 返回的返回值。
/// </summary>