升级库

SmallChi · Jun 7, 2023 · 5e19ace · 5e19ace
1 parent 7711ff5
commit 5e19ace
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 65 deletions.
diff --git a/simples/JT808.Gateway.NBIotSimpleClient/JT808.Gateway.NBIotSimpleClient.csproj b/simples/JT808.Gateway.NBIotSimpleClient/JT808.Gateway.NBIotSimpleClient.csproj
@@ -5,10 +5,10 @@
     <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DotPulsar" Version="2.5.2" />
+    <PackageReference Include="DotPulsar" Version="2.11.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
   <Import Project="..\pipeline.props" />

diff --git a/simples/JT808.Gateway.SimpleClient/JT808.Gateway.SimpleClient.csproj b/simples/JT808.Gateway.SimpleClient/JT808.Gateway.SimpleClient.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
   <Import Project="..\pipeline.props" />

diff --git a/simples/JT808.Gateway.SimpleQueueServer/JT808.Gateway.SimpleQueueServer.csproj b/simples/JT808.Gateway.SimpleQueueServer/JT808.Gateway.SimpleQueueServer.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
   <Import Project="..\pipeline.props" />

diff --git a/simples/JT808.Gateway.SimpleQueueService/JT808.Gateway.SimpleQueueService.csproj b/simples/JT808.Gateway.SimpleQueueService/JT808.Gateway.SimpleQueueService.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
   <Import Project="..\pipeline.props" />

diff --git a/src/JT808.Gateway.Abstractions/IJT808ClientBuilder.cs b/src/JT808.Gateway.Abstractions/IJT808ClientBuilder.cs
@@ -1,5 +1,4 @@
 using JT808.Protocol;
-using JT808.Protocol.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
@@ -9,7 +8,7 @@ namespace JT808.Gateway.Abstractions
 {
     public interface IJT808ClientBuilder
     {
-        IJT808DIBuilder JT808Builder { get; }
-        IJT808DIBuilder Builder();
+        IJT808Builder JT808Builder { get; }
+        IJT808Builder Builder();
     }
 }
diff --git a/src/JT808.Gateway.Abstractions/IJT808GatewayBuilder.cs b/src/JT808.Gateway.Abstractions/IJT808GatewayBuilder.cs
@@ -1,5 +1,4 @@
 using JT808.Protocol;
-using JT808.Protocol.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
@@ -9,7 +8,7 @@ namespace JT808.Gateway.Abstractions
 {
     public interface IJT808GatewayBuilder
     {
-        IJT808DIBuilder JT808Builder { get; }
-        IJT808DIBuilder Builder();
+        IJT808Builder JT808Builder { get; }
+        IJT808Builder Builder();
     }
 }
diff --git a/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj b/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj
@@ -16,8 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JT808" Version="2.6.1" />
-    <PackageReference Include="JT808.Protocol.DependencyInjection" Version="2.6.1" />
+    <PackageReference Include="JT808" Version="2.6.2-preview5" />
 	<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
 	<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
 	<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />

diff --git a/...T808.Gateway.Benchmark/JT808.Gateway.CleintBenchmark/JT808.Gateway.CleintBenchmark.csproj b/...T808.Gateway.Benchmark/JT808.Gateway.CleintBenchmark/JT808.Gateway.CleintBenchmark.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.3" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...T808.Gateway.Benchmark/JT808.Gateway.ServerBenchmark/JT808.Gateway.ServerBenchmark.csproj b/...T808.Gateway.Benchmark/JT808.Gateway.ServerBenchmark/JT808.Gateway.ServerBenchmark.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.3" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/JT808.Gateway.Client/IJT808ClientBuilder.cs b/src/JT808.Gateway.Client/IJT808ClientBuilder.cs
@@ -1,5 +1,4 @@
 using JT808.Protocol;
-using JT808.Protocol.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
@@ -9,7 +8,7 @@ namespace JT808.Gateway.Client
 {
     public interface IJT808ClientBuilder
     {
-        IJT808DIBuilder JT808Builder { get; }
-        IJT808DIBuilder Builder();
+        IJT808Builder JT808Builder { get; }
+        IJT808Builder Builder();
     }
 }
diff --git a/src/JT808.Gateway.Client/Internal/JT808ClientBuilderDefault.cs b/src/JT808.Gateway.Client/Internal/JT808ClientBuilderDefault.cs
@@ -1,5 +1,4 @@
 using JT808.Protocol;
-using JT808.Protocol.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
@@ -10,14 +9,14 @@ namespace JT808.Gateway.Client
 {
     internal class JT808ClientBuilderDefault : IJT808ClientBuilder
     {
-        public IJT808DIBuilder JT808Builder { get; }
+        public IJT808Builder JT808Builder { get; }
 
-        public JT808ClientBuilderDefault(IJT808DIBuilder builder)
+        public JT808ClientBuilderDefault(IJT808Builder builder)
         {
             JT808Builder = builder;
         }
 
-        public IJT808DIBuilder Builder()
+        public IJT808Builder Builder()
         {
             return JT808Builder;
         }

diff --git a/src/JT808.Gateway.Client/JT808.Gateway.Client.csproj b/src/JT808.Gateway.Client/JT808.Gateway.Client.csproj
@@ -10,8 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JT808" Version="2.6.1" />
-    <PackageReference Include="JT808.Protocol.DependencyInjection" Version="2.6.1" />
+    <PackageReference Include="JT808" Version="2.6.2-preview5" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
     <PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />

diff --git a/src/JT808.Gateway.Client/JT808ClientExtensions.cs b/src/JT808.Gateway.Client/JT808ClientExtensions.cs
@@ -7,13 +7,12 @@
 using JT808.Gateway.Client.Services;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using JT808.Gateway.Client.Internal;
-using JT808.Protocol.DependencyInjection;
 
 namespace JT808.Gateway.Client
 {
     public static  class JT808ClientExtensions
     {
-        public static IJT808ClientBuilder AddClient(this IJT808DIBuilder jT808Builder)
+        public static IJT808ClientBuilder AddClient(this IJT808Builder jT808Builder)
         {
             JT808ClientBuilderDefault jT808ClientBuilderDefault = new JT808ClientBuilderDefault(jT808Builder);
             jT808ClientBuilderDefault.JT808Builder.Services.AddSingleton<JT808RetryBlockingCollection>();

diff --git a/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj b/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj
@@ -8,7 +8,7 @@
     <DocumentationFile>JT808.Gateway.Kafka.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Confluent.Kafka" Version="2.1.0" />
+    <PackageReference Include="Confluent.Kafka" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/JT808.Gateway.Kafka/JT808ClientBuilderDefault.cs b/src/JT808.Gateway.Kafka/JT808ClientBuilderDefault.cs
@@ -1,6 +1,5 @@
 using JT808.Gateway.Abstractions;
 using JT808.Protocol;
-using JT808.Protocol.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
@@ -11,14 +10,14 @@ namespace JT808.Gateway.Kafka
 {
     internal class JT808ClientBuilderDefault : IJT808ClientBuilder
     {
-        public IJT808DIBuilder JT808Builder { get; }
+        public IJT808Builder JT808Builder { get; }
 
-        public JT808ClientBuilderDefault(IJT808DIBuilder builder)
+        public JT808ClientBuilderDefault(IJT808Builder builder)
         {
             JT808Builder = builder;
         }
 
-        public IJT808DIBuilder Builder()
+        public IJT808Builder Builder()
         {
             return JT808Builder;
         }

diff --git a/src/JT808.Gateway.Kafka/JT808ClientKafkaExtensions.cs b/src/JT808.Gateway.Kafka/JT808ClientKafkaExtensions.cs
@@ -5,13 +5,12 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using JT808.Protocol.DependencyInjection;
 
 namespace JT808.Gateway.Kafka
 {
     public static class JT808ClientKafkaExtensions
     {
-        public static IJT808ClientBuilder AddClientKafka(this IJT808DIBuilder builder)
+        public static IJT808ClientBuilder AddClientKafka(this IJT808Builder builder)
         {
             return new JT808ClientBuilderDefault(builder);
         }

diff --git a/src/JT808.Gateway.Tests/JT808.Gateway.NormalHosting/JT808.Gateway.NormalHosting.csproj b/src/JT808.Gateway.Tests/JT808.Gateway.NormalHosting/JT808.Gateway.NormalHosting.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.3" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
   </ItemGroup>
 
   <ItemGroup>

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
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.3" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/JT808.Gateway.Tests/JT808.Gateway.Test/JT808.Gateway.Test.csproj b/src/JT808.Gateway.Tests/JT808.Gateway.Test/JT808.Gateway.Test.csproj
@@ -9,13 +9,13 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/JT808.Gateway.Tests/JT808.Gateway.Test/Session/JT808SessionManagerTest.cs b/src/JT808.Gateway.Tests/JT808.Gateway.Test/Session/JT808SessionManagerTest.cs
@@ -39,15 +39,15 @@ public void TryLinkTest()
         public void PerfSession1M()
         {
             //Random.Shared.Next(0,1000000)
-            int number = 1000000;
-            JT808SessionManager jT808SessionManager = new JT808SessionManager(new LoggerFactory());
-            Parallel.For(0, number, (i) =>
-            {
-                string tno = i.ToString();
-                var session = new JT808TcpSession(new Socket(SocketType.Stream, ProtocolType.Tcp));
-                var result1 = jT808SessionManager.TryAdd(session);
-                jT808SessionManager.TryLink(tno, session);
-            });
+            //int number = 1000000;
+            //JT808SessionManager jT808SessionManager = new JT808SessionManager(new LoggerFactory());
+            //Parallel.For(0, number, (i) =>
+            //{
+            //    string tno = i.ToString();
+            //    var session = new JT808TcpSession(new Socket(SocketType.Stream, ProtocolType.Tcp));
+            //    var result1 = jT808SessionManager.TryAdd(session);
+            //    jT808SessionManager.TryLink(tno, session);
+            //});
         }
 
         /// <summary>

diff --git a/src/JT808.Gateway.WebApiClientTool/JT808.Gateway.WebApiClientTool.xml b/src/JT808.Gateway.WebApiClientTool/JT808.Gateway.WebApiClientTool.xml
diff --git a/src/JT808.Gateway.WebApiClientTool/JT808HttpClientExtensions.cs b/src/JT808.Gateway.WebApiClientTool/JT808HttpClientExtensions.cs
@@ -1,6 +1,5 @@
 using JT808.Gateway.Abstractions;
 using JT808.Protocol;
-using JT808.Protocol.DependencyInjection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
@@ -61,7 +60,7 @@ public static IServiceCollection AddJT808WebApiClientTool(this IServiceCollectio
         /// <param name="jT808Builder"></param>
         /// <param name="configuration"></param>
         /// <returns></returns>
-        public static IJT808DIBuilder AddWebApiClientTool(this IJT808DIBuilder jT808Builder, IConfiguration configuration)
+        public static IJT808Builder AddWebApiClientTool(this IJT808Builder jT808Builder, IConfiguration configuration)
         {
             jT808Builder.Services.AddHttpClient("JT808WebApiClientTool", c =>
             {
@@ -81,7 +80,7 @@ public static IJT808DIBuilder AddWebApiClientTool(this IJT808DIBuilder jT808Buil
         /// <param name="webapiUri"></param>
         /// <param name="token"></param>
         /// <returns></returns>
-        public static IJT808DIBuilder AddWebApiClientTool(this IJT808DIBuilder jT808Builder, Uri webapiUri, string token)
+        public static IJT808Builder AddWebApiClientTool(this IJT808Builder jT808Builder, Uri webapiUri, string token)
         {
             jT808Builder.Services.AddHttpClient("JT808WebApiClientTool", c =>
             {
@@ -141,7 +140,7 @@ public static IServiceCollection AddJT808WebApiClientTool<TJT808HttpClient>(this
         /// <param name="jT808Builder"></param>
         /// <param name="configuration"></param>
         /// <returns></returns>
-        public static IJT808DIBuilder AddWebApiClientTool<TJT808HttpClient>(this IJT808DIBuilder jT808Builder, IConfiguration configuration)
+        public static IJT808Builder AddWebApiClientTool<TJT808HttpClient>(this IJT808Builder jT808Builder, IConfiguration configuration)
             where TJT808HttpClient : JT808HttpClient
         {
             jT808Builder.Services.AddHttpClient("JT808WebApiClientToolExt", c =>
@@ -162,7 +161,7 @@ public static IJT808DIBuilder AddWebApiClientTool<TJT808HttpClient>(this IJT808D
         /// <param name="webapiUri"></param>
         /// <param name="token"></param>
         /// <returns></returns>
-        public static IJT808DIBuilder AddWebApiClientTool<TJT808HttpClient>(this IJT808DIBuilder jT808Builder, Uri webapiUri, string token)
+        public static IJT808Builder AddWebApiClientTool<TJT808HttpClient>(this IJT808Builder jT808Builder, Uri webapiUri, string token)
             where TJT808HttpClient: JT808HttpClient
         {
             jT808Builder.Services.AddHttpClient("JT808WebApiClientToolExt", c =>

diff --git a/src/JT808.Gateway/Internal/JT808GatewayBuilderDefault.cs b/src/JT808.Gateway/Internal/JT808GatewayBuilderDefault.cs
@@ -1,19 +1,18 @@
 using JT808.Gateway.Abstractions;
 using JT808.Protocol;
-using JT808.Protocol.DependencyInjection;
 
 namespace JT808.Gateway.Internal
 {
     public class JT808GatewayBuilderDefault : IJT808GatewayBuilder
     {
-        public IJT808DIBuilder JT808Builder { get; }
+        public IJT808Builder JT808Builder { get; }
 
-        public JT808GatewayBuilderDefault(IJT808DIBuilder builder)
+        public JT808GatewayBuilderDefault(IJT808Builder builder)
         {
             JT808Builder = builder;
         }
 
-        public IJT808DIBuilder Builder()
+        public IJT808Builder Builder()
         {
             return JT808Builder;
         }

diff --git a/src/JT808.Gateway/JT808.Gateway.xml b/src/JT808.Gateway/JT808.Gateway.xml