Merge pull request #59 from ilyfairy/master

v1.3.0 使用Json源生成器, 支持AOT&裁剪
OrgEleCho · Aug 21, 2024 · a874ed8 · a874ed8
2 parents 4f4f388 + 1eeaf4c
commit a874ed8
Show file tree

Hide file tree

Showing 7 changed files with 264 additions and 57 deletions.
diff --git a/...arams/CqGetForwardMsgActionParamsModel.cs → ...s/CqGetForwardMessageActionParamsModel.cs b/...arams/CqGetForwardMsgActionParamsModel.cs → ...s/CqGetForwardMessageActionParamsModel.cs
diff --git a/.../CqGetLoginInfomationActionParamsModel.cs → ...CqGetLoginInformationActionParamsModel.cs b/.../CqGetLoginInfomationActionParamsModel.cs → ...CqGetLoginInformationActionParamsModel.cs
diff --git a/...ams/CqGetStrangerInfoActionParamsModel.cs → ...etStrangerInformationActionParamsModel.cs b/...ams/CqGetStrangerInfoActionParamsModel.cs → ...etStrangerInformationActionParamsModel.cs
diff --git a/...Params/CqSendGroupMsgActionParamsModel.cs → ...ms/CqSendGroupMessageActionParamsModel.cs b/...Params/CqSendGroupMsgActionParamsModel.cs → ...ms/CqSendGroupMessageActionParamsModel.cs
diff --git a/src/EleCho.GoCqHttpSdk/CqWsSession.cs b/src/EleCho.GoCqHttpSdk/CqWsSession.cs
@@ -247,10 +247,10 @@ private async Task WebSocketLoop(WebSocket webSocket)
 #endif
 
                     ms.Seek(0, SeekOrigin.Begin);
-                    CqWsDataModel? wsDataModel = JsonSerializer.Deserialize<CqWsDataModel>(ms, JsonHelper.Options);
-
-                    // 处理 WebSocket 数据
-                    ProcWsDataAsync(wsDataModel);
+                CqWsDataModel? wsDataModel = JsonSerializer.Deserialize<CqWsDataModel>(ms, JsonHelper.Options);
+                
+                // 处理 WebSocket 数据
+                ProcWsDataAsync(wsDataModel);
 
 #if DEBUG
                 if (wsDataModel is not CqPostModel)

diff --git a/src/EleCho.GoCqHttpSdk/EleCho.GoCqHttpSdk.csproj b/src/EleCho.GoCqHttpSdk/EleCho.GoCqHttpSdk.csproj
@@ -8,7 +8,7 @@
     <Company>SlimeNull</Company>
     <Description>Go-CqHttp 的 .NET SDK</Description>
     <RepositoryUrl>https://github.com/OrgEleCho/EleCho.GoCqHttpSdk</RepositoryUrl>
-    <Version>1.2.6</Version>
+    <Version>1.3.0</Version>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <Copyright>Copyright (c) EleCho 2023</Copyright>
     <PackageProjectUrl>https://github.com/OrgEleCho/EleCho.GoCqHttpSdk</PackageProjectUrl>

diff --git a/src/EleCho.GoCqHttpSdk/Utils/JsonHelper.cs b/src/EleCho.GoCqHttpSdk/Utils/JsonHelper.cs