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 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
@@ -20,8 +20,12 @@
<PackageReleaseNotes>基于DotNetty实现的JT808DotNetty的抽象库</PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="JT808" Version="2.2.10" />
+ <PackageReference Include="JT808" Version="2.3.5" />
+ <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
</ItemGroup>
+
<ItemGroup>
<None Include="..\..\LICENSE" Pack="true" PackagePath="" />
</ItemGroup>
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 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFramework>net5</TargetFramework>
+ <LangVersion>9.0</LangVersion>
</PropertyGroup>
<ItemGroup>
@@ -12,11 +12,11 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="NLog.Extensions.Logging" Version="1.6.3" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="NLog.Extensions.Logging" Version="1.7.0" />
</ItemGroup>
<ItemGroup>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
@@ -25,9 +25,9 @@
<PackageReference Include="DotNetty.Transport.Libuv" Version="0.6.0" />
<PackageReference Include="DotNetty.Codecs.Http" Version="0.6.0" />
<PackageReference Include="DotNetty.Codecs" Version="0.6.0" />
- <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
- <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.0" />
- <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0" />
+ <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
@@ -20,12 +20,12 @@
<PackageReleaseNotes>基于Kafka的JT808消息发布与订阅</PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Confluent.Kafka" Version="1.4.2" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.4" />
+ <PackageReference Include="Confluent.Kafka" Version="1.5.3" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\JT808.DotNetty.Abstractions\JT808.DotNetty.Abstractions.csproj" />
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 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.4" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
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 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.4" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
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 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.4" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
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 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.4" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
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 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.4" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
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 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.4" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
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 @@
<Import Project="..\..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
@@ -22,9 +22,6 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.4" />
- </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\JT808.DotNetty.Abstractions\JT808.DotNetty.Abstractions.csproj" />
</ItemGroup>
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 @@
<Import Project="..\..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
@@ -21,11 +21,7 @@
<PackageReleaseNotes>基于JT808消息上下行日志服务</PackageReleaseNotes>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.4" />
- </ItemGroup>
+
<ItemGroup>
<None Include="..\..\..\LICENSE" Pack="true" PackagePath="" />
</ItemGroup>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
@@ -20,11 +20,6 @@
<PackageReleaseNotes>基于JT808消息业务处理程序服务</PackageReleaseNotes>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.4" />
- </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\JT808.DotNetty.Abstractions\JT808.DotNetty.Abstractions.csproj" />
</ItemGroup>
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 @@
<Import Project="..\..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
@@ -21,11 +21,7 @@
<PackageReleaseNotes>基于JT808会话通知服务</PackageReleaseNotes>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.4" />
- </ItemGroup>
+
<ItemGroup>
<None Include="..\..\..\LICENSE" Pack="true" PackagePath="" />
</ItemGroup>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
@@ -21,10 +21,7 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.4" />
- <PackageReference Include="CSRedisCore" Version="3.6.3" />
+ <PackageReference Include="CSRedisCore" Version="3.6.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\JT808.DotNetty.Abstractions\JT808.DotNetty.Abstractions.csproj" />
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 @@
<Import Project="..\..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
@@ -25,9 +25,6 @@
<PackageReference Include="DotNetty.Buffers" Version="0.6.0" />
<PackageReference Include="DotNetty.Handlers" Version="0.6.0" />
<PackageReference Include="DotNetty.Transport" Version="0.6.0" />
- <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.4" />
<PackageReference Include="Polly" Version="7.2.1" />
</ItemGroup>
<ItemGroup>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="xunit" Version="2.4.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="coverlet.collector" Version="1.2.1">
+ <PackageReference Include="coverlet.collector" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
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 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.0</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.4" />
- <PackageReference Include="NLog" Version="4.7.0" />
- <PackageReference Include="NLog.Extensions.Logging" Version="1.6.3" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+ <PackageReference Include="NLog" Version="4.7.7" />
+ <PackageReference Include="NLog.Extensions.Logging" Version="1.7.0" />
</ItemGroup>
<ItemGroup>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.4" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+ <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="xunit" Version="2.4.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="coverlet.collector" Version="1.2.1">
+ <PackageReference Include="coverlet.collector" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
-
+ <TargetFramework>net5.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="xunit" Version="2.4.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="coverlet.collector" Version="1.2.1">
+ <PackageReference Include="coverlet.collector" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
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 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="xunit" Version="2.4.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="coverlet.collector" Version="1.2.1">
+ <PackageReference Include="coverlet.collector" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Version.props" />
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.3</LangVersion>
+ <TargetFrameworks>netstandard2.0;net5;</TargetFrameworks>
+ <LangVersion>9.0</LangVersion>
<Copyright>Copyright 2018.</Copyright>
<Authors>SmallChi(Koike)</Authors>
<RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
@@ -24,7 +24,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="System.Text.Json" Version="4.7.2" />
+ <PackageReference Include="System.Text.Json" Version="5.0.1" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE" Pack="true" PackagePath="" />
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 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>JT808.DotNetty.WebApiClientTool</name>
+ </assembly>
+ <members>
+ <member name="M:JT808.DotNetty.WebApiClientTool.JT808HttpClient.GetTcpSessionAll">
+ <summary>
+ 会话服务集合
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:JT808.DotNetty.WebApiClientTool.JT808HttpClient.RemoveByTerminalPhoneNo(System.String)">
+ <summary>
+ 会话服务-通过设备终端号移除对应会话
+ </summary>
+ <param name="terminalPhoneNo"></param>
+ <returns></returns>
+ </member>
+ <member name="M:JT808.DotNetty.WebApiClientTool.JT808HttpClient.UnificationSend(JT808.DotNetty.Abstractions.Dtos.JT808UnificationSendRequestDto)">
+ <summary>
+ 统一下发信息
+ </summary>
+ <param name="jT808UnificationSendRequestDto"></param>
+ <returns></returns>
+ </member>
+ <member name="M:JT808.DotNetty.WebApiClientTool.JT808HttpClient.GetTcpAtomicCounter">
+ <summary>
+ 获取Tcp包计数器
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:JT808.DotNetty.WebApiClientTool.JT808HttpClient.GetUdpSessionAll">
+ <summary>
+ 会话服务集合
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:JT808.DotNetty.WebApiClientTool.JT808HttpClient.GetUdpAtomicCounter">
+ <summary>
+ 获取Udp包计数器
+ </summary>
+ <returns></returns>
+ </member>
+ </members>
+</doc>
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 @@
<Project>
<PropertyGroup>
- <JT808DotNettyPackageVersion>2.3.2</JT808DotNettyPackageVersion>
+ <JT808DotNettyPackageVersion>2.3.3-preview1</JT808DotNettyPackageVersion>
<JT808GatewayPackageVersion>1.1.0-preview6</JT808GatewayPackageVersion>
</PropertyGroup>
</Project>
\ No newline at end of file