From d83e8ff7032ee8391bd9291d29c6712db657a7f4 Mon Sep 17 00:00:00 2001 From: "SmallChi(Koike)" <564952747@qq.com> Date: Sun, 24 Jan 2021 11:13:15 +0800 Subject: [PATCH] =?UTF-8?q?dotnetty-2.3.3-preview1=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=BAnet5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++-- publish.bat | 28 +++++------ .../JT808.DotNetty.Abstractions.csproj | 10 ++-- .../JT808.DotNetty.CleintBenchmark.csproj | 14 +++--- .../JT808.DotNetty.Client.csproj | 4 +- .../JT808.DotNetty.Core.csproj | 10 ++-- .../JT808.DotNetty.Kafka.csproj | 16 +++---- .../JT808.DotNetty.MsgIdHandler.Test.csproj | 8 ++-- .../JT808.DotNetty.MsgLogging.Test.csproj | 8 ++-- .../JT808.DotNetty.ReplyMessage.Test.csproj | 8 ++-- .../JT808.DotNetty.SessionNotice.Test.csproj | 8 ++-- .../JT808.DotNetty.Traffic.Test.csproj | 8 ++-- .../JT808.DotNetty.Transmit.Test.csproj | 8 ++-- .../JT808.DotNetty.MsgIdHandler.csproj | 7 +-- .../JT808.DotNetty.MsgLogging.csproj | 10 ++-- .../JT808.DotNetty.ReplyMessage.csproj | 9 +--- .../JT808.DotNetty.SessionNotice.csproj | 10 ++-- .../JT808.DotNetty.Traffic.csproj | 9 ++-- .../JT808.DotNetty.Transmit.csproj | 7 +-- .../JT808.DotNetty.Tcp.csproj | 4 +- .../JT808.DotNetty.Core.Test.csproj | 14 +++--- .../JT808.DotNetty.Hosting.csproj | 18 ++++---- .../JT808.DotNetty.Hosting/appsettings.json | 28 ++++++++++- .../JT808.DotNetty.Kafka.Test.csproj | 14 +++--- .../JT808.DotNetty.Tcp.Test.csproj | 14 +++--- .../JT808.DotNetty.Udp.Test.csproj | 15 +++--- .../JT808.DotNetty.WebApi.Test.csproj | 8 ++-- .../JT808.DotNetty.Udp.csproj | 4 +- .../JT808.DotNetty.WebApi.csproj | 4 +- .../JT808.DotNetty.WebApiClientTool.csproj | 6 +-- .../JT808.DotNetty.WebApiClientTool.xml | 46 +++++++++++++++++++ src/Version.props | 2 +- 32 files changed, 210 insertions(+), 157 deletions(-) create mode 100644 src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.xml diff --git a/README.md b/README.md index c65060b..27488c8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# JT808Gateway +# JT808Gateway 基于Pipeline封装的JT808Pipeline支持TCP/UDP通用消息业务处理 @@ -30,7 +30,7 @@ ## 集成接口功能 | 接口名称 | 接口说明 | 使用场景 | -| :---------------------------: | :-------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------- | +| :--------------------------- | :-------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------- | | IJT808SessionProducer | 会话通知(在线/离线)数据生产接口 | 有些超长待机的设备,不会实时保持连接,那么通过平台下发的命令是无法到达的,这时候就需要设备一上线,就即时通知服务去处理,然后在即时的下发消息到设备。 | | IJT808SessionConsumer | 会话通知(在线/离线)数据消费接口 | - | | IJT808MsgProducer | 数据生产接口 | 网关将接收到的数据发送到队列 | @@ -45,7 +45,7 @@ ## 基于网关的相关服务 | 服务名称 | 服务说明 | 使用场景 | -| :--------------------------------: | :----------- | :----------------------------------------------------------------------------------------------------------------- | +| :-------------------------------- | :----------- | :----------------------------------------------------------------------------------------------------------------- | | MsgIdHandler (v1.1.0新版pipeline) | 消息处理服务 | 从队列中消费设备上报数据,再结合自身的业务场景,将数据进行处理并入库 | | MsgLogging | 消息日志服务 | 从队列中消费设备上报和平台应答数据,再将数据存入influxdb等数据库中,便于技术和技术支持排查设备与平台交互的原始数据 | | ReplyMessage | 消息响应服务 | 用于响应设备上报消息,以及下发指令信息到设备 | @@ -61,7 +61,7 @@ [接口文档](https://github.com/SmallChi/JT808Gateway/tree/master/api) -## 基于core 3.1 Pipeline +## 基于NET5.0 Pipeline Pipeline分为两种方式使用,一种是使用队列的方式,一种是网关集成的方式。 diff --git a/publish.bat b/publish.bat index 239a822..7b2ef0b 100644 --- a/publish.bat +++ b/publish.bat @@ -1,18 +1,18 @@ -dotnet pack .\src\JT808.DotNetty.WebApiClientTool\JT808.DotNetty.WebApiClientTool.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.WebApi\JT808.DotNetty.WebApi.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Udp\JT808.DotNetty.Udp.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Tcp\JT808.DotNetty.Tcp.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Kafka\JT808.DotNetty.Kafka.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Core\JT808.DotNetty.Core.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Client\JT808.DotNetty.Client.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Abstractions\JT808.DotNetty.Abstractions.csproj --no-build --output ../../nupkgs +dotnet pack .\src\JT808.DotNetty.WebApiClientTool\JT808.DotNetty.WebApiClientTool.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.WebApi\JT808.DotNetty.WebApi.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.Udp\JT808.DotNetty.Udp.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.Tcp\JT808.DotNetty.Tcp.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.Kafka\JT808.DotNetty.Kafka.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.Core\JT808.DotNetty.Core.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.Client\JT808.DotNetty.Client.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.Abstractions\JT808.DotNetty.Abstractions.csproj -c Release --output nupkgs echo 'push service pacakge...' -dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.MsgIdHandler\JT808.DotNetty.MsgIdHandler.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.MsgLogging\JT808.DotNetty.MsgLogging.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.ReplyMessage\JT808.DotNetty.ReplyMessage.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.SessionNotice\JT808.DotNetty.SessionNotice.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.Traffic\JT808.DotNetty.Traffic.csproj --no-build --output ../../nupkgs -dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.Transmit\JT808.DotNetty.Transmit.csproj --no-build --output ../../nupkgs +dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.MsgIdHandler\JT808.DotNetty.MsgIdHandler.csproj -c Release--output nupkgs +dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.MsgLogging\JT808.DotNetty.MsgLogging.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.ReplyMessage\JT808.DotNetty.ReplyMessage.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.SessionNotice\JT808.DotNetty.SessionNotice.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.Traffic\JT808.DotNetty.Traffic.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.DotNetty.Services\JT808.DotNetty.Transmit\JT808.DotNetty.Transmit.csproj -c Release --output nupkgs pause \ No newline at end of file diff --git a/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj b/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj index 339401a..9de5c0c 100644 --- a/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj +++ b/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj @@ -1,8 +1,8 @@  - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway @@ -20,8 +20,12 @@ 基于DotNetty实现的JT808DotNetty的抽象库 - + + + + + diff --git a/src/JT808.DotNetty.CleintBenchmark/JT808.DotNetty.CleintBenchmark.csproj b/src/JT808.DotNetty.CleintBenchmark/JT808.DotNetty.CleintBenchmark.csproj index ceeee61..ed854d5 100644 --- a/src/JT808.DotNetty.CleintBenchmark/JT808.DotNetty.CleintBenchmark.csproj +++ b/src/JT808.DotNetty.CleintBenchmark/JT808.DotNetty.CleintBenchmark.csproj @@ -2,8 +2,8 @@ Exe - netcoreapp3.1 - 7.3 + net5 + 9.0 @@ -12,11 +12,11 @@ - - - - - + + + + + diff --git a/src/JT808.DotNetty.Client/JT808.DotNetty.Client.csproj b/src/JT808.DotNetty.Client/JT808.DotNetty.Client.csproj index 68474d3..595df91 100644 --- a/src/JT808.DotNetty.Client/JT808.DotNetty.Client.csproj +++ b/src/JT808.DotNetty.Client/JT808.DotNetty.Client.csproj @@ -1,8 +1,8 @@  - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway diff --git a/src/JT808.DotNetty.Core/JT808.DotNetty.Core.csproj b/src/JT808.DotNetty.Core/JT808.DotNetty.Core.csproj index ebb21b4..26d794c 100644 --- a/src/JT808.DotNetty.Core/JT808.DotNetty.Core.csproj +++ b/src/JT808.DotNetty.Core/JT808.DotNetty.Core.csproj @@ -1,8 +1,8 @@  - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway @@ -25,9 +25,9 @@ - - - + + + diff --git a/src/JT808.DotNetty.Kafka/JT808.DotNetty.Kafka.csproj b/src/JT808.DotNetty.Kafka/JT808.DotNetty.Kafka.csproj index d279604..37d05c4 100644 --- a/src/JT808.DotNetty.Kafka/JT808.DotNetty.Kafka.csproj +++ b/src/JT808.DotNetty.Kafka/JT808.DotNetty.Kafka.csproj @@ -1,8 +1,8 @@  - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway @@ -20,12 +20,12 @@ 基于Kafka的JT808消息发布与订阅 - - - - - - + + + + + + diff --git a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.MsgIdHandler.Test/JT808.DotNetty.MsgIdHandler.Test.csproj b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.MsgIdHandler.Test/JT808.DotNetty.MsgIdHandler.Test.csproj index ecdf488..4a7ccfe 100644 --- a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.MsgIdHandler.Test/JT808.DotNetty.MsgIdHandler.Test.csproj +++ b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.MsgIdHandler.Test/JT808.DotNetty.MsgIdHandler.Test.csproj @@ -2,13 +2,13 @@ Exe - netcoreapp3.1 + net5.0 - - - + + + diff --git a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.MsgLogging.Test/JT808.DotNetty.MsgLogging.Test.csproj b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.MsgLogging.Test/JT808.DotNetty.MsgLogging.Test.csproj index 4af3b27..67f35cf 100644 --- a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.MsgLogging.Test/JT808.DotNetty.MsgLogging.Test.csproj +++ b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.MsgLogging.Test/JT808.DotNetty.MsgLogging.Test.csproj @@ -2,13 +2,13 @@ Exe - netcoreapp3.1 + net5.0 - - - + + + diff --git a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.ReplyMessage.Test/JT808.DotNetty.ReplyMessage.Test.csproj b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.ReplyMessage.Test/JT808.DotNetty.ReplyMessage.Test.csproj index a23609e..5e4a007 100644 --- a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.ReplyMessage.Test/JT808.DotNetty.ReplyMessage.Test.csproj +++ b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.ReplyMessage.Test/JT808.DotNetty.ReplyMessage.Test.csproj @@ -2,13 +2,13 @@ Exe - netcoreapp3.1 + net5.0 - - - + + + diff --git a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.SessionNotice.Test/JT808.DotNetty.SessionNotice.Test.csproj b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.SessionNotice.Test/JT808.DotNetty.SessionNotice.Test.csproj index 0a0bb30..d638a8a 100644 --- a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.SessionNotice.Test/JT808.DotNetty.SessionNotice.Test.csproj +++ b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.SessionNotice.Test/JT808.DotNetty.SessionNotice.Test.csproj @@ -2,13 +2,13 @@ Exe - netcoreapp3.1 + net5.0 - - - + + + diff --git a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.Traffic.Test/JT808.DotNetty.Traffic.Test.csproj b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.Traffic.Test/JT808.DotNetty.Traffic.Test.csproj index b5c5ab6..a7798de 100644 --- a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.Traffic.Test/JT808.DotNetty.Traffic.Test.csproj +++ b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.Traffic.Test/JT808.DotNetty.Traffic.Test.csproj @@ -2,13 +2,13 @@ Exe - netcoreapp3.1 + net5.0 - - - + + + diff --git a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.Transmit.Test/JT808.DotNetty.Transmit.Test.csproj b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.Transmit.Test/JT808.DotNetty.Transmit.Test.csproj index 51a9aaa..f0bd7e1 100644 --- a/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.Transmit.Test/JT808.DotNetty.Transmit.Test.csproj +++ b/src/JT808.DotNetty.Services.Tests/JT808.DotNetty.Transmit.Test/JT808.DotNetty.Transmit.Test.csproj @@ -2,13 +2,13 @@ Exe - netcoreapp3.1 + net5.0 - - - + + + diff --git a/src/JT808.DotNetty.Services/JT808.DotNetty.MsgIdHandler/JT808.DotNetty.MsgIdHandler.csproj b/src/JT808.DotNetty.Services/JT808.DotNetty.MsgIdHandler/JT808.DotNetty.MsgIdHandler.csproj index 6be10f9..d93e217 100644 --- a/src/JT808.DotNetty.Services/JT808.DotNetty.MsgIdHandler/JT808.DotNetty.MsgIdHandler.csproj +++ b/src/JT808.DotNetty.Services/JT808.DotNetty.MsgIdHandler/JT808.DotNetty.MsgIdHandler.csproj @@ -2,8 +2,8 @@ - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway @@ -22,9 +22,6 @@ LICENSE - - - diff --git a/src/JT808.DotNetty.Services/JT808.DotNetty.MsgLogging/JT808.DotNetty.MsgLogging.csproj b/src/JT808.DotNetty.Services/JT808.DotNetty.MsgLogging/JT808.DotNetty.MsgLogging.csproj index 52e1754..21b1e3f 100644 --- a/src/JT808.DotNetty.Services/JT808.DotNetty.MsgLogging/JT808.DotNetty.MsgLogging.csproj +++ b/src/JT808.DotNetty.Services/JT808.DotNetty.MsgLogging/JT808.DotNetty.MsgLogging.csproj @@ -2,8 +2,8 @@ - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway @@ -21,11 +21,7 @@ 基于JT808消息上下行日志服务 LICENSE - - - - - + diff --git a/src/JT808.DotNetty.Services/JT808.DotNetty.ReplyMessage/JT808.DotNetty.ReplyMessage.csproj b/src/JT808.DotNetty.Services/JT808.DotNetty.ReplyMessage/JT808.DotNetty.ReplyMessage.csproj index 17ca90f..f80a488 100644 --- a/src/JT808.DotNetty.Services/JT808.DotNetty.ReplyMessage/JT808.DotNetty.ReplyMessage.csproj +++ b/src/JT808.DotNetty.Services/JT808.DotNetty.ReplyMessage/JT808.DotNetty.ReplyMessage.csproj @@ -1,8 +1,8 @@  - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway @@ -20,11 +20,6 @@ 基于JT808消息业务处理程序服务 LICENSE - - - - - diff --git a/src/JT808.DotNetty.Services/JT808.DotNetty.SessionNotice/JT808.DotNetty.SessionNotice.csproj b/src/JT808.DotNetty.Services/JT808.DotNetty.SessionNotice/JT808.DotNetty.SessionNotice.csproj index 6c2ac0e..74063cb 100644 --- a/src/JT808.DotNetty.Services/JT808.DotNetty.SessionNotice/JT808.DotNetty.SessionNotice.csproj +++ b/src/JT808.DotNetty.Services/JT808.DotNetty.SessionNotice/JT808.DotNetty.SessionNotice.csproj @@ -2,8 +2,8 @@ - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway @@ -21,11 +21,7 @@ 基于JT808会话通知服务 LICENSE - - - - - + diff --git a/src/JT808.DotNetty.Services/JT808.DotNetty.Traffic/JT808.DotNetty.Traffic.csproj b/src/JT808.DotNetty.Services/JT808.DotNetty.Traffic/JT808.DotNetty.Traffic.csproj index 6222a41..e50003a 100644 --- a/src/JT808.DotNetty.Services/JT808.DotNetty.Traffic/JT808.DotNetty.Traffic.csproj +++ b/src/JT808.DotNetty.Services/JT808.DotNetty.Traffic/JT808.DotNetty.Traffic.csproj @@ -1,8 +1,8 @@  - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway @@ -21,10 +21,7 @@ LICENSE - - - - + diff --git a/src/JT808.DotNetty.Services/JT808.DotNetty.Transmit/JT808.DotNetty.Transmit.csproj b/src/JT808.DotNetty.Services/JT808.DotNetty.Transmit/JT808.DotNetty.Transmit.csproj index 7a4f6bb..4b9b53a 100644 --- a/src/JT808.DotNetty.Services/JT808.DotNetty.Transmit/JT808.DotNetty.Transmit.csproj +++ b/src/JT808.DotNetty.Services/JT808.DotNetty.Transmit/JT808.DotNetty.Transmit.csproj @@ -2,8 +2,8 @@ - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway @@ -25,9 +25,6 @@ - - - diff --git a/src/JT808.DotNetty.Tcp/JT808.DotNetty.Tcp.csproj b/src/JT808.DotNetty.Tcp/JT808.DotNetty.Tcp.csproj index b04beef..8c72b7c 100644 --- a/src/JT808.DotNetty.Tcp/JT808.DotNetty.Tcp.csproj +++ b/src/JT808.DotNetty.Tcp/JT808.DotNetty.Tcp.csproj @@ -1,8 +1,8 @@  - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway diff --git a/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/JT808.DotNetty.Core.Test.csproj b/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/JT808.DotNetty.Core.Test.csproj index 3537a80..fa8223b 100644 --- a/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/JT808.DotNetty.Core.Test.csproj +++ b/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/JT808.DotNetty.Core.Test.csproj @@ -1,22 +1,22 @@  - netcoreapp3.1 + net5.0 false - - - - + + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/JT808.DotNetty.Tests/JT808.DotNetty.Hosting/JT808.DotNetty.Hosting.csproj b/src/JT808.DotNetty.Tests/JT808.DotNetty.Hosting/JT808.DotNetty.Hosting.csproj index 0227e58..e1f938e 100644 --- a/src/JT808.DotNetty.Tests/JT808.DotNetty.Hosting/JT808.DotNetty.Hosting.csproj +++ b/src/JT808.DotNetty.Tests/JT808.DotNetty.Hosting/JT808.DotNetty.Hosting.csproj @@ -2,20 +2,20 @@ Exe - netcoreapp3.0 + net5.0 true latest - - - - - - - - + + + + + + + + diff --git a/src/JT808.DotNetty.Tests/JT808.DotNetty.Hosting/appsettings.json b/src/JT808.DotNetty.Tests/JT808.DotNetty.Hosting/appsettings.json index f656c3e..62c868b 100644 --- a/src/JT808.DotNetty.Tests/JT808.DotNetty.Hosting/appsettings.json +++ b/src/JT808.DotNetty.Tests/JT808.DotNetty.Hosting/appsettings.json @@ -1,6 +1,5 @@ { "Logging": { - "IncludeScopes": false, "Debug": { "LogLevel": { "Default": "Trace" @@ -16,5 +15,32 @@ "TcpPort": 808, "UdpPort": 808, "WebApiPort": 828 + }, + "JT808MsgProducerConfig": { + "TopicName": "JT808Msg", + "BootstrapServers": "127.0.0.1:9092" + }, + "JT808MsgConsumerConfig": { + "TopicName": "JT808Msg", + "GroupId": "msg-group", + "BootstrapServers": "127.0.0.1:9092" + }, + "JT808MsgReplyProducerConfig": { + "TopicName": "JT808MsgReply", + "BootstrapServers": "127.0.0.1:9092" + }, + "JT808MsgReplyConsumerConfig": { + "TopicName": "JT808MsgReply", + "GroupId": "msgreply-group", + "BootstrapServers": "127.0.0.1:9092" + }, + "JT808SessionProducerConfig": { + "TopicName": "JT808Session", + "BootstrapServers": "127.0.0.1:9092" + }, + "JT808SessionConsumerConfig": { + "TopicName": "JT808Session", + "GroupId": "session-group", + "BootstrapServers": "127.0.0.1:9092" } } diff --git a/src/JT808.DotNetty.Tests/JT808.DotNetty.Kafka.Test/JT808.DotNetty.Kafka.Test.csproj b/src/JT808.DotNetty.Tests/JT808.DotNetty.Kafka.Test/JT808.DotNetty.Kafka.Test.csproj index 0ba606f..1dc86c6 100644 --- a/src/JT808.DotNetty.Tests/JT808.DotNetty.Kafka.Test/JT808.DotNetty.Kafka.Test.csproj +++ b/src/JT808.DotNetty.Tests/JT808.DotNetty.Kafka.Test/JT808.DotNetty.Kafka.Test.csproj @@ -1,19 +1,19 @@  - netcoreapp3.1 + net5.0 false - - - - - + + + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/JT808.DotNetty.Tests/JT808.DotNetty.Tcp.Test/JT808.DotNetty.Tcp.Test.csproj b/src/JT808.DotNetty.Tests/JT808.DotNetty.Tcp.Test/JT808.DotNetty.Tcp.Test.csproj index a86babe..88c88f6 100644 --- a/src/JT808.DotNetty.Tests/JT808.DotNetty.Tcp.Test/JT808.DotNetty.Tcp.Test.csproj +++ b/src/JT808.DotNetty.Tests/JT808.DotNetty.Tcp.Test/JT808.DotNetty.Tcp.Test.csproj @@ -1,22 +1,22 @@  - netcoreapp3.1 + net5.0 false - - - - + + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/JT808.DotNetty.Tests/JT808.DotNetty.Udp.Test/JT808.DotNetty.Udp.Test.csproj b/src/JT808.DotNetty.Tests/JT808.DotNetty.Udp.Test/JT808.DotNetty.Udp.Test.csproj index aed697a..97f8696 100644 --- a/src/JT808.DotNetty.Tests/JT808.DotNetty.Udp.Test/JT808.DotNetty.Udp.Test.csproj +++ b/src/JT808.DotNetty.Tests/JT808.DotNetty.Udp.Test/JT808.DotNetty.Udp.Test.csproj @@ -1,22 +1,21 @@  - netcoreapp3.1 - + net5.0 false - - - - + + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/JT808.DotNetty.Tests/JT808.DotNetty.WebApi.Test/JT808.DotNetty.WebApi.Test.csproj b/src/JT808.DotNetty.Tests/JT808.DotNetty.WebApi.Test/JT808.DotNetty.WebApi.Test.csproj index b967153..27d5687 100644 --- a/src/JT808.DotNetty.Tests/JT808.DotNetty.WebApi.Test/JT808.DotNetty.WebApi.Test.csproj +++ b/src/JT808.DotNetty.Tests/JT808.DotNetty.WebApi.Test/JT808.DotNetty.WebApi.Test.csproj @@ -7,14 +7,14 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/JT808.DotNetty.Udp/JT808.DotNetty.Udp.csproj b/src/JT808.DotNetty.Udp/JT808.DotNetty.Udp.csproj index 2342de3..dcae4f0 100644 --- a/src/JT808.DotNetty.Udp/JT808.DotNetty.Udp.csproj +++ b/src/JT808.DotNetty.Udp/JT808.DotNetty.Udp.csproj @@ -1,8 +1,8 @@  - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway diff --git a/src/JT808.DotNetty.WebApi/JT808.DotNetty.WebApi.csproj b/src/JT808.DotNetty.WebApi/JT808.DotNetty.WebApi.csproj index 16c3fc1..9bf5b95 100644 --- a/src/JT808.DotNetty.WebApi/JT808.DotNetty.WebApi.csproj +++ b/src/JT808.DotNetty.WebApi/JT808.DotNetty.WebApi.csproj @@ -1,8 +1,8 @@  - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway diff --git a/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.csproj b/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.csproj index 82bf285..c7d47a7 100644 --- a/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.csproj +++ b/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.csproj @@ -1,8 +1,8 @@  - netstandard2.0 - 7.3 + netstandard2.0;net5; + 9.0 Copyright 2018. SmallChi(Koike) https://github.com/SmallChi/JT808Gateway @@ -24,7 +24,7 @@ - + diff --git a/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.xml b/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.xml new file mode 100644 index 0000000..2c292e3 --- /dev/null +++ b/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.xml @@ -0,0 +1,46 @@ + + + + JT808.DotNetty.WebApiClientTool + + + + + 会话服务集合 + + + + + + 会话服务-通过设备终端号移除对应会话 + + + + + + + 统一下发信息 + + + + + + + 获取Tcp包计数器 + + + + + + 会话服务集合 + + + + + + 获取Udp包计数器 + + + + + diff --git a/src/Version.props b/src/Version.props index 8ba6122..c66e2b3 100644 --- a/src/Version.props +++ b/src/Version.props @@ -1,6 +1,6 @@  - 2.3.2 + 2.3.3-preview1 1.1.0-preview6 \ No newline at end of file