升级808库并测试

src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>
@@ -28,7 +28,7 @@
     <Compile Remove="JT808QueueReplyMessageHandler.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="JT808" Version="2.3.1" />
+    <PackageReference Include="JT808" Version="2.3.3" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />

src/JT808.Gateway.Benchmark/JT808.Gateway.CleintBenchmark/JT808.Gateway.CleintBenchmark.csproj

@@ -18,7 +18,7 @@
   <ItemGroup>
     <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.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.6.5" />
   </ItemGroup>

src/JT808.Gateway.Benchmark/JT808.Gateway.ServerBenchmark/JT808.Gateway.ServerBenchmark.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" 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.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.6.5" />

src/JT808.Gateway.Client/JT808.Gateway.Client.csproj

@@ -2,7 +2,7 @@
 
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>
@@ -23,9 +23,9 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="JT808" Version="2.3.0" />
+    <PackageReference Include="JT808" Version="2.3.3" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
-    <PackageReference Include="System.IO.Pipelines" Version="5.0.0" />
+    <PackageReference Include="System.IO.Pipelines" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
   </ItemGroup>

src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>
@@ -21,7 +21,7 @@
     <Version>$(JT808GatewayPackageVersion)</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Confluent.Kafka" Version="1.5.2" />
+    <PackageReference Include="Confluent.Kafka" Version="1.5.3" />
   </ItemGroup>
 
   <ItemGroup>

src/JT808.Gateway.Services/JT808.Gateway.MsgLogging/JT808.Gateway.MsgLogging.csproj

@@ -2,7 +2,7 @@
 
   <Import Project="..\..\Version.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>

src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808.Gateway.ReplyMessage.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Version.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>

src/JT808.Gateway.Services/JT808.Gateway.SessionNotice/JT808.Gateway.SessionNotice.csproj

@@ -2,7 +2,7 @@
 
   <Import Project="..\..\Version.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>

src/JT808.Gateway.Services/JT808.Gateway.Transmit/JT808.Gateway.Transmit.csproj

@@ -2,7 +2,7 @@
 
     <Import Project="..\..\Version.props" />
     <PropertyGroup>
-      <TargetFrameworks>netstandard2.1;net5;</TargetFrameworks>
+      <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
       <LangVersion>9.0</LangVersion>
       <Copyright>Copyright 2019.</Copyright>
       <Authors>SmallChi(Koike)</Authors>

src/JT808.Gateway.Tests/JT808.Gateway.NormalHosting/Impl/JT808CustomMessageHandlerImpl.cs

@@ -45,7 +45,7 @@ namespace JT808.Gateway.NormalHosting.Impl
             {
                 //AOP 可以自定义添加一些东西:上下行日志、
                 logger.LogDebug("可以自定义添加一些东西:上下行日志、数据转发");
-                var parameter = (request.Header.TerminalPhoneNo, request.OriginalData.ToArray());
+                var parameter = (request.Header.TerminalPhoneNo, request.OriginalData);
                 //上行日志（可同步也可以使用队列进行异步）
                 jT808MsgLogging.Processor(parameter, JT808MsgLoggingType.up);
                 //下行日志（可同步也可以使用队列进行异步）

src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/Impl/JT808ReplyMessageHandlerImpl.cs

@@ -13,14 +13,14 @@ namespace JT808.Gateway.QueueHosting.Impl
     public class JT808ReplyMessageHandlerImpl : IJT808ReplyMessageHandler
     {
         private ILogger logger;
-        private JT808Serializer Serializer;
+        private JT808Serializer JT808Serializer;
 
         public JT808ReplyMessageHandlerImpl(
             IJT808Config jT808Config,
             ILoggerFactory loggerFactory)
         {
             logger = loggerFactory.CreateLogger<JT808ReplyMessageHandlerImpl>();
-            Serializer = jT808Config.GetSerializer();
+            JT808Serializer = jT808Config.GetSerializer();
         }
 
         public byte[] Processor(string TerminalNo, byte[] Data)
@@ -29,12 +29,32 @@ namespace JT808.Gateway.QueueHosting.Impl
             {
                 logger.LogDebug($"实现消息应答处理,{TerminalNo},{Data.ToHexString()}");
             }
-            var package = Serializer.Deserialize(Data);
+            var package = JT808Serializer.Deserialize(Data);
             if (package.Header.MsgId == 0x09999)
             {
                 logger.LogDebug("====实现自定义或内部消息应答处理====");
             }
             return default;
+            //if (package.Version == JT808Version.JTT2019)
+            //{
+            //    byte[] data = JT808Serializer.Serialize(JT808MsgId.平台通用应答.Create_平台通用应答_2019(package.Header.TerminalPhoneNo, new JT808_0x8001()
+            //    {
+            //        AckMsgId = package.Header.MsgId,
+            //        JT808PlatformResult = JT808PlatformResult.成功,
+            //        MsgNum = package.Header.MsgNum
+            //    }));
+            //    return data;
+            //}
+            //else
+            //{
+            //    byte[] data = JT808Serializer.Serialize(JT808MsgId.平台通用应答.Create(package.Header.TerminalPhoneNo, new JT808_0x8001()
+            //    {
+            //        AckMsgId = package.Header.MsgId,
+            //        JT808PlatformResult = JT808PlatformResult.成功,
+            //        MsgNum = package.Header.MsgNum
+            //    }));
+            //    return data;
+            //}
         }
     }
 }

src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/JT808.Gateway.QueueHosting.csproj

@@ -42,4 +42,6 @@
     </None>
   </ItemGroup>
 
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+
 </Project>

src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/appsettings.json

@@ -6,6 +6,7 @@
     "Token": "123456",
     "MiniNumBufferSize": 51200,
     "SoBacklog": 65535
+    //"IgnoreMsgIdReply": [ 512 ]
   },
   "JT808WebApiClientToolConfig": {
     "Token": "123456",

src/JT808.Gateway.WebApiClientTool/JT808.Gateway.WebApiClientTool.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>

src/JT808.Gateway/JT808.Gateway.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>
@@ -27,7 +27,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="System.IO.Pipelines" Version="5.0.0" />
+    <PackageReference Include="System.IO.Pipelines" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/JT808.Gateway/JT808TcpServer.cs

@@ -204,7 +204,7 @@ namespace JT808.Gateway
                             if (contentSpan.Length > 14)
                             {
                                 var package = Serializer.HeaderDeserialize(contentSpan, minBufferSize: 10240);
-                                if (Logger.IsEnabled(LogLevel.Trace)) Logger.LogTrace($"[Accept Hex {session.Client.RemoteEndPoint}-{session.TerminalPhoneNo}]:{package.OriginalData.ToArray().ToHexString()}");
+                                if (Logger.IsEnabled(LogLevel.Trace)) Logger.LogTrace($"[Accept Hex {session.Client.RemoteEndPoint}-{session.TerminalPhoneNo}]:{package.OriginalData.ToHexString()}");
                                 SessionManager.TryLink(package.Header.TerminalPhoneNo, session);
                                 Processor(session, package);
                             }
@@ -242,7 +242,7 @@ namespace JT808.Gateway
         {
             try
             {
-                MsgProducer?.ProduceAsync(package.Header.TerminalPhoneNo, package.OriginalData.ToArray());
+                MsgProducer?.ProduceAsync(package.Header.TerminalPhoneNo, package.OriginalData);
                 var downData = MessageHandler.Processor(in package);
                 if (ConfigurationMonitor.CurrentValue.IgnoreMsgIdReply != null && ConfigurationMonitor.CurrentValue.IgnoreMsgIdReply.Count > 0)
                 {
@@ -263,7 +263,7 @@ namespace JT808.Gateway
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex, $"[Processor]:{package.OriginalData.ToArray().ToHexString()},{session.Client.RemoteEndPoint},{session.TerminalPhoneNo}");
+                Logger.LogError(ex, $"[Processor]:{package.OriginalData.ToHexString()},{session.Client.RemoteEndPoint},{session.TerminalPhoneNo}");
             }
         }
         public Task StopAsync(CancellationToken cancellationToken)

src/JT808.Gateway/JT808UdpServer.cs

@@ -99,7 +99,7 @@ namespace JT808.Gateway
             try
             {
                 var package = Serializer.HeaderDeserialize(buffer, minBufferSize: 10240);
-                if (Logger.IsEnabled(LogLevel.Trace)) Logger.LogTrace($"[Accept Hex {receiveMessageFromResult.RemoteEndPoint}]:{package.OriginalData.ToArray().ToHexString()}");
+                if (Logger.IsEnabled(LogLevel.Trace)) Logger.LogTrace($"[Accept Hex {receiveMessageFromResult.RemoteEndPoint}]:{package.OriginalData.ToHexString()}");
                 var session = SessionManager.TryLink(package.Header.TerminalPhoneNo, socket, receiveMessageFromResult.RemoteEndPoint);
                 if (Logger.IsEnabled(LogLevel.Information))
                 {
@@ -127,7 +127,7 @@ namespace JT808.Gateway
         {
             try
             {
-                MsgProducer?.ProduceAsync(package.Header.TerminalPhoneNo, package.OriginalData.ToArray());
+                MsgProducer?.ProduceAsync(package.Header.TerminalPhoneNo, package.OriginalData);
                 var downData = MessageHandler.Processor(package);
                 if (ConfigurationMonitor.CurrentValue.IgnoreMsgIdReply != null && ConfigurationMonitor.CurrentValue.IgnoreMsgIdReply.Count > 0)
                 {
@@ -148,7 +148,7 @@ namespace JT808.Gateway
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex, $"[Processor]:{package.OriginalData.ToArray().ToHexString()},{session.Client.RemoteEndPoint},{session.TerminalPhoneNo}");
+                Logger.LogError(ex, $"[Processor]:{package.OriginalData.ToHexString()},{session.Client.RemoteEndPoint},{session.TerminalPhoneNo}");
             }
         }
         public Task StopAsync(CancellationToken cancellationToken)

src/Version.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
 	    <JT808DotNettyPackageVersion>2.3.2</JT808DotNettyPackageVersion>
- 	    <JT808GatewayPackageVersion>1.1.0-preview4</JT808GatewayPackageVersion>
+ 	    <JT808GatewayPackageVersion>1.1.0-preview5</JT808GatewayPackageVersion>
 	</PropertyGroup>
 </Project>