Skip to content

Commit e3dbb9e

Browse files
authored
Merge pull request #62 from ilyfairy/master
撤销 Json源生成器
2 parents a874ed8 + cc81330 commit e3dbb9e

File tree

8 files changed

+64
-265
lines changed

8 files changed

+64
-265
lines changed

.github/workflows/dotnet.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
5.0.x
2929
6.0.x
3030
7.0.x
31+
8.0.x
3132
3233
- name: Build
3334
run: dotnet build -c Release
@@ -55,4 +56,9 @@ jobs:
5556
with:
5657
name: .NET 7
5758
path: src/EleCho.GoCqHttpSdk*/bin/Release/net7.0/*.dll
58-
59+
- name: Upload .NET 8
60+
uses: actions/upload-artifact@v3
61+
with:
62+
name: .NET 8
63+
path: src/EleCho.GoCqHttpSdk*/bin/Release/net8.0/*.dll
64+

src/EleCho.GoCqHttpSdk/Action/Model/Params/CqGetForwardMessageActionParamsModel.cs renamed to src/EleCho.GoCqHttpSdk/Action/Model/Params/CqGetForwardMsgActionParamsModel.cs

File renamed without changes.

src/EleCho.GoCqHttpSdk/Action/Model/Params/CqGetLoginInformationActionParamsModel.cs renamed to src/EleCho.GoCqHttpSdk/Action/Model/Params/CqGetLoginInfomationActionParamsModel.cs

File renamed without changes.

src/EleCho.GoCqHttpSdk/Action/Model/Params/CqGetStrangerInformationActionParamsModel.cs renamed to src/EleCho.GoCqHttpSdk/Action/Model/Params/CqGetStrangerInfoActionParamsModel.cs

File renamed without changes.

src/EleCho.GoCqHttpSdk/Action/Model/Params/CqSendGroupMessageActionParamsModel.cs renamed to src/EleCho.GoCqHttpSdk/Action/Model/Params/CqSendGroupMsgActionParamsModel.cs

File renamed without changes.

src/EleCho.GoCqHttpSdk/CqWsSession.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@ private async Task WebSocketLoop(WebSocket webSocket)
247247
#endif
248248

249249
ms.Seek(0, SeekOrigin.Begin);
250-
CqWsDataModel? wsDataModel = JsonSerializer.Deserialize<CqWsDataModel>(ms, JsonHelper.Options);
251-
252-
// 处理 WebSocket 数据
253-
ProcWsDataAsync(wsDataModel);
250+
CqWsDataModel? wsDataModel = JsonSerializer.Deserialize<CqWsDataModel>(ms, JsonHelper.Options);
251+
252+
// 处理 WebSocket 数据
253+
ProcWsDataAsync(wsDataModel);
254254

255255
#if DEBUG
256256
if (wsDataModel is not CqPostModel)

src/EleCho.GoCqHttpSdk/EleCho.GoCqHttpSdk.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Company>SlimeNull</Company>
99
<Description>Go-CqHttp 的 .NET SDK</Description>
1010
<RepositoryUrl>https://github.com/OrgEleCho/EleCho.GoCqHttpSdk</RepositoryUrl>
11-
<Version>1.3.0</Version>
11+
<Version>1.2.6</Version>
1212
<PackageReadmeFile>README.md</PackageReadmeFile>
1313
<Copyright>Copyright (c) EleCho 2023</Copyright>
1414
<PackageProjectUrl>https://github.com/OrgEleCho/EleCho.GoCqHttpSdk</PackageProjectUrl>

src/EleCho.GoCqHttpSdk/Utils/JsonHelper.cs

Lines changed: 52 additions & 259 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)