diff --git a/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj b/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj index 9de5c0c..bfb8b3f 100644 --- a/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj +++ b/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj @@ -20,7 +20,7 @@ 基于DotNetty实现的JT808DotNetty的抽象库 - + diff --git a/src/JT808.DotNetty.CleintBenchmark/JT808.DotNetty.CleintBenchmark.csproj b/src/JT808.DotNetty.CleintBenchmark/JT808.DotNetty.CleintBenchmark.csproj index ed854d5..edeb0d2 100644 --- a/src/JT808.DotNetty.CleintBenchmark/JT808.DotNetty.CleintBenchmark.csproj +++ b/src/JT808.DotNetty.CleintBenchmark/JT808.DotNetty.CleintBenchmark.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/JT808.DotNetty.Client/Codecs/JT808ClientTcpEncoder.cs b/src/JT808.DotNetty.Client/Codecs/JT808ClientTcpEncoder.cs index 0d78878..7f44e9b 100644 --- a/src/JT808.DotNetty.Client/Codecs/JT808ClientTcpEncoder.cs +++ b/src/JT808.DotNetty.Client/Codecs/JT808ClientTcpEncoder.cs @@ -5,6 +5,8 @@ using DotNetty.Transport.Channels; using Microsoft.Extensions.Logging; using JT808.DotNetty.Client.Metadata; using JT808.DotNetty.Client.Services; +using System; +using JT808.Protocol.Exceptions; namespace JT808.DotNetty.Client.Codecs { @@ -33,13 +35,13 @@ namespace JT808.DotNetty.Client.Codecs output.WriteBytes(sendData); jT808SendAtomicCounterService.MsgSuccessIncrement(); } - catch (JT808.Protocol.Exceptions.JT808Exception ex) + catch (JT808Exception ex) { logger.LogError(ex, context.Channel.Id.AsShortText()); } - catch (System.Exception ex) + catch (Exception ex) { - logger.LogError(ex, context.Channel.Id.AsShortText()); + logger.LogError(ex,$" context.Channel.Id.AsShortText()"); } } else if (message.HexData != null) diff --git a/src/JT808.DotNetty.Client/Handlers/JT808TcpClientConnectionHandler.cs b/src/JT808.DotNetty.Client/Handlers/JT808TcpClientConnectionHandler.cs index cde4d6d..86af42b 100644 --- a/src/JT808.DotNetty.Client/Handlers/JT808TcpClientConnectionHandler.cs +++ b/src/JT808.DotNetty.Client/Handlers/JT808TcpClientConnectionHandler.cs @@ -14,7 +14,7 @@ namespace JT808.DotNetty.Client.Handlers /// public class JT808TcpClientConnectionHandler : ChannelHandlerAdapter { - private readonly ILogger logger; + private readonly ILogger logger; private readonly JT808TcpClient jT808TcpClient; public JT808TcpClientConnectionHandler( diff --git a/src/JT808.DotNetty.Client/JT808.DotNetty.Client.csproj b/src/JT808.DotNetty.Client/JT808.DotNetty.Client.csproj index 595df91..7423b23 100644 --- a/src/JT808.DotNetty.Client/JT808.DotNetty.Client.csproj +++ b/src/JT808.DotNetty.Client/JT808.DotNetty.Client.csproj @@ -24,11 +24,12 @@ - - - + + + - + + diff --git a/src/JT808.DotNetty.Kafka/JT808.DotNetty.Kafka.csproj b/src/JT808.DotNetty.Kafka/JT808.DotNetty.Kafka.csproj index 37d05c4..186d17a 100644 --- a/src/JT808.DotNetty.Kafka/JT808.DotNetty.Kafka.csproj +++ b/src/JT808.DotNetty.Kafka/JT808.DotNetty.Kafka.csproj @@ -20,7 +20,7 @@ 基于Kafka的JT808消息发布与订阅 - + 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 fa8223b..c36cf57 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 @@ -10,13 +10,13 @@ - + 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 e1f938e..5c413d8 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 @@ -14,8 +14,8 @@ - - + + 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 88c88f6..1e4247c 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 @@ -10,13 +10,13 @@ - + 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 97f8696..b040a72 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 @@ -9,13 +9,13 @@ - + 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 27d5687..ed69f2f 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 @@ -8,13 +8,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/JT808.Gateway.Tests/JT808.Gateway.Test/Services/JT808BlacklistManagerTest.cs b/src/JT808.Gateway.Tests/JT808.Gateway.Test/Services/JT808BlacklistManagerTest.cs index 8cfd98c..52cd6dd 100644 --- a/src/JT808.Gateway.Tests/JT808.Gateway.Test/Services/JT808BlacklistManagerTest.cs +++ b/src/JT808.Gateway.Tests/JT808.Gateway.Test/Services/JT808BlacklistManagerTest.cs @@ -22,15 +22,5 @@ namespace JT808.Gateway.Test.Services jT808BlacklistManager.Remove("1"); Assert.False(jT808BlacklistManager.Contains("1")); } - - [Fact] - public void Test2() - { - JT808BlacklistManager jT808BlacklistManager = new JT808BlacklistManager(); - jT808BlacklistManager.Add("1"); - jT808BlacklistManager.Add("2"); - Assert.True(jT808BlacklistManager.Contains("1")); - Assert.True(jT808BlacklistManager.Contains("2")); - } } } diff --git a/src/Version.props b/src/Version.props index d0c3c6c..903412d 100644 --- a/src/Version.props +++ b/src/Version.props @@ -1,6 +1,6 @@  - 2.3.3-preview1 + 2.3.3-preview2 1.1.1-preview1 \ No newline at end of file