diff --git a/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj b/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj index 329c83f..9345bbf 100644 --- a/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj +++ b/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net5; + netstandard2.1;net5.0; 9.0 Copyright 2019. SmallChi(Koike) @@ -28,7 +28,7 @@ - + diff --git a/src/JT808.Gateway.Benchmark/JT808.Gateway.CleintBenchmark/JT808.Gateway.CleintBenchmark.csproj b/src/JT808.Gateway.Benchmark/JT808.Gateway.CleintBenchmark/JT808.Gateway.CleintBenchmark.csproj index f3b0dbc..9e42b4a 100644 --- a/src/JT808.Gateway.Benchmark/JT808.Gateway.CleintBenchmark/JT808.Gateway.CleintBenchmark.csproj +++ b/src/JT808.Gateway.Benchmark/JT808.Gateway.CleintBenchmark/JT808.Gateway.CleintBenchmark.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/JT808.Gateway.Benchmark/JT808.Gateway.ServerBenchmark/JT808.Gateway.ServerBenchmark.csproj b/src/JT808.Gateway.Benchmark/JT808.Gateway.ServerBenchmark/JT808.Gateway.ServerBenchmark.csproj index 59cf92d..88a2120 100644 --- a/src/JT808.Gateway.Benchmark/JT808.Gateway.ServerBenchmark/JT808.Gateway.ServerBenchmark.csproj +++ b/src/JT808.Gateway.Benchmark/JT808.Gateway.ServerBenchmark/JT808.Gateway.ServerBenchmark.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/JT808.Gateway.Client/JT808.Gateway.Client.csproj b/src/JT808.Gateway.Client/JT808.Gateway.Client.csproj index 4b829fb..8a3e6a4 100644 --- a/src/JT808.Gateway.Client/JT808.Gateway.Client.csproj +++ b/src/JT808.Gateway.Client/JT808.Gateway.Client.csproj @@ -2,7 +2,7 @@ - netstandard2.1;net5; + netstandard2.1;net5.0; 9.0 Copyright 2019. SmallChi(Koike) @@ -23,9 +23,9 @@ - + - + diff --git a/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj b/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj index 8326569..5d0c820 100644 --- a/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj +++ b/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net5; + netstandard2.1;net5.0; 9.0 Copyright 2019. SmallChi(Koike) @@ -21,7 +21,7 @@ $(JT808GatewayPackageVersion) - + diff --git a/src/JT808.Gateway.Services/JT808.Gateway.MsgLogging/JT808.Gateway.MsgLogging.csproj b/src/JT808.Gateway.Services/JT808.Gateway.MsgLogging/JT808.Gateway.MsgLogging.csproj index 2f2603b..e79fd89 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.MsgLogging/JT808.Gateway.MsgLogging.csproj +++ b/src/JT808.Gateway.Services/JT808.Gateway.MsgLogging/JT808.Gateway.MsgLogging.csproj @@ -2,7 +2,7 @@ - netstandard2.1;net5; + netstandard2.1;net5.0; 9.0 Copyright 2019. SmallChi(Koike) diff --git a/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808.Gateway.ReplyMessage.csproj b/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808.Gateway.ReplyMessage.csproj index a1f7ff8..042684f 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808.Gateway.ReplyMessage.csproj +++ b/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808.Gateway.ReplyMessage.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net5; + netstandard2.1;net5.0; 9.0 Copyright 2019. SmallChi(Koike) diff --git a/src/JT808.Gateway.Services/JT808.Gateway.SessionNotice/JT808.Gateway.SessionNotice.csproj b/src/JT808.Gateway.Services/JT808.Gateway.SessionNotice/JT808.Gateway.SessionNotice.csproj index c45f516..073b165 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.SessionNotice/JT808.Gateway.SessionNotice.csproj +++ b/src/JT808.Gateway.Services/JT808.Gateway.SessionNotice/JT808.Gateway.SessionNotice.csproj @@ -2,7 +2,7 @@ - netstandard2.1;net5; + netstandard2.1;net5.0; 9.0 Copyright 2019. SmallChi(Koike) diff --git a/src/JT808.Gateway.Services/JT808.Gateway.Transmit/JT808.Gateway.Transmit.csproj b/src/JT808.Gateway.Services/JT808.Gateway.Transmit/JT808.Gateway.Transmit.csproj index df618c3..963041e 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.Transmit/JT808.Gateway.Transmit.csproj +++ b/src/JT808.Gateway.Services/JT808.Gateway.Transmit/JT808.Gateway.Transmit.csproj @@ -2,7 +2,7 @@ - netstandard2.1;net5; + netstandard2.1;net5.0; 9.0 Copyright 2019. SmallChi(Koike) diff --git a/src/JT808.Gateway.Tests/JT808.Gateway.NormalHosting/Impl/JT808CustomMessageHandlerImpl.cs b/src/JT808.Gateway.Tests/JT808.Gateway.NormalHosting/Impl/JT808CustomMessageHandlerImpl.cs index cc6de84..62495e6 100644 --- a/src/JT808.Gateway.Tests/JT808.Gateway.NormalHosting/Impl/JT808CustomMessageHandlerImpl.cs +++ b/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); //下行日志(可同步也可以使用队列进行异步) diff --git a/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/Impl/JT808ReplyMessageHandlerImpl.cs b/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/Impl/JT808ReplyMessageHandlerImpl.cs index ca36ad6..9681db7 100644 --- a/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/Impl/JT808ReplyMessageHandlerImpl.cs +++ b/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(); - 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; + //} } } } diff --git a/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/JT808.Gateway.QueueHosting.csproj b/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/JT808.Gateway.QueueHosting.csproj index 2b9e3f2..be96215 100644 --- a/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/JT808.Gateway.QueueHosting.csproj +++ b/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/JT808.Gateway.QueueHosting.csproj @@ -42,4 +42,6 @@ + + diff --git a/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/appsettings.json b/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/appsettings.json index 45067e7..77108dc 100644 --- a/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/appsettings.json +++ b/src/JT808.Gateway.Tests/JT808.Gateway.QueueHosting/appsettings.json @@ -6,6 +6,7 @@ "Token": "123456", "MiniNumBufferSize": 51200, "SoBacklog": 65535 + //"IgnoreMsgIdReply": [ 512 ] }, "JT808WebApiClientToolConfig": { "Token": "123456", diff --git a/src/JT808.Gateway.WebApiClientTool/JT808.Gateway.WebApiClientTool.csproj b/src/JT808.Gateway.WebApiClientTool/JT808.Gateway.WebApiClientTool.csproj index ae1ee01..f17909d 100644 --- a/src/JT808.Gateway.WebApiClientTool/JT808.Gateway.WebApiClientTool.csproj +++ b/src/JT808.Gateway.WebApiClientTool/JT808.Gateway.WebApiClientTool.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net5; + netstandard2.1;net5.0; 9.0 Copyright 2019. SmallChi(Koike) diff --git a/src/JT808.Gateway/JT808.Gateway.csproj b/src/JT808.Gateway/JT808.Gateway.csproj index a53f65b..a10e310 100644 --- a/src/JT808.Gateway/JT808.Gateway.csproj +++ b/src/JT808.Gateway/JT808.Gateway.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net5; + netstandard2.1;net5.0; 8.0 Copyright 2019. SmallChi(Koike) @@ -27,7 +27,7 @@ - + diff --git a/src/JT808.Gateway/JT808TcpServer.cs b/src/JT808.Gateway/JT808TcpServer.cs index 1c1ecd1..3f52692 100644 --- a/src/JT808.Gateway/JT808TcpServer.cs +++ b/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) diff --git a/src/JT808.Gateway/JT808UdpServer.cs b/src/JT808.Gateway/JT808UdpServer.cs index 56f676b..3f34a7d 100644 --- a/src/JT808.Gateway/JT808UdpServer.cs +++ b/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) diff --git a/src/Version.props b/src/Version.props index 3dca61c..e90ef7e 100644 --- a/src/Version.props +++ b/src/Version.props @@ -1,6 +1,6 @@  2.3.2 - 1.1.0-preview4 + 1.1.0-preview5 \ No newline at end of file