From 88ad8fba0b69c4b2f728f2dfb5ba5a286ba8d351 Mon Sep 17 00:00:00 2001
From: "SmallChi(Koike)" <564952747@qq.com>
Date: Mon, 23 Dec 2019 11:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0kafka=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JT808.Gateway.Abstractions.csproj         |  4 +++
 .../JT808.Gateway.Kafka.csproj                | 28 +++++++++----------
 .../JT808ClientBuilderDefault.cs              |  3 +-
 .../JT808ClientKafkaExtensions.cs             |  2 +-
 src/JT808.Gateway.Kafka/JT808MsgConsumer.cs   |  2 +-
 src/JT808.Gateway.Kafka/JT808MsgProducer.cs   |  4 +--
 .../JT808MsgReplyConsumer.cs                  |  2 +-
 .../JT808MsgReplyProducer.cs                  |  4 +--
 .../JT808ServerKafkaExtensions.cs             |  2 +-
 .../JT808SessionConsumer.cs                   |  2 +-
 .../JT808SessionProducer.cs                   |  4 +--
 src/JT808.Gateway.sln                         |  6 ++++
 src/JT808.Gateway/JT808.Gateway.csproj        |  4 +++
 13 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj b/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj
index de3eb76..4774af9 100644
--- a/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj
+++ b/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj
@@ -6,6 +6,10 @@
     <Authors>SmallChi(Koike)</Authors>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <SignAssembly>false</SignAssembly>
+    <RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/SmallChi/JT808Gateway</PackageProjectUrl>
+    <licenseUrl>https://github.com/SmallChi/JT808Gateway/blob/master/LICENSE</licenseUrl>
+    <license>https://github.com/SmallChi/JT808Gateway/blob/master/LICENSE</license>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Description>基于Pipeline实现的JT808Gateway的抽象库</Description>
diff --git a/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj b/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj
index f68e24b..da06104 100644
--- a/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj
+++ b/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <Copyright>Copyright 2018.</Copyright>
+    <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>
-    <RepositoryUrl>https://github.com/SmallChi/JT808DotNetty</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/SmallChi/JT808DotNetty</PackageProjectUrl>
-    <licenseUrl>https://github.com/SmallChi/JT808DotNetty/blob/master/LICENSE</licenseUrl>
-    <license>https://github.com/SmallChi/JT808DotNetty/blob/master/LICENSE</license>
+    <RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/SmallChi/JT808Gateway</PackageProjectUrl>
+    <licenseUrl>https://github.com/SmallChi/JT808Gateway/blob/master/LICENSE</licenseUrl>
+    <license>https://github.com/SmallChi/JT808Gateway/blob/master/LICENSE</license>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.0.0-preview1</Version>
+    <Version>1.0.0-preview2</Version>
     <SignAssembly>false</SignAssembly>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -20,12 +20,12 @@
     <PackageReleaseNotes>基于Kafka的JT808消息发布与订阅</PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Confluent.Kafka" Version="1.2.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" />
+    <PackageReference Include="Confluent.Kafka" Version="1.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\JT808.Gateway\JT808.Gateway.csproj" />
+    <ProjectReference Include="..\JT808.Gateway.Abstractions\JT808.Gateway.Abstractions.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/JT808.Gateway.Kafka/JT808ClientBuilderDefault.cs b/src/JT808.Gateway.Kafka/JT808ClientBuilderDefault.cs
index 3279c64..d34e239 100644
--- a/src/JT808.Gateway.Kafka/JT808ClientBuilderDefault.cs
+++ b/src/JT808.Gateway.Kafka/JT808ClientBuilderDefault.cs
@@ -1,4 +1,5 @@
-using JT808.Protocol;
+using JT808.Gateway.Abstractions;
+using JT808.Protocol;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
diff --git a/src/JT808.Gateway.Kafka/JT808ClientKafkaExtensions.cs b/src/JT808.Gateway.Kafka/JT808ClientKafkaExtensions.cs
index b334097..0875b36 100644
--- a/src/JT808.Gateway.Kafka/JT808ClientKafkaExtensions.cs
+++ b/src/JT808.Gateway.Kafka/JT808ClientKafkaExtensions.cs
@@ -1,6 +1,6 @@
 using JJT808.Gateway.Kafka;
 using JT808.Gateway.Configs.Kafka;
-using JT808.Gateway.PubSub;
+using JT808.Gateway.Abstractions;
 using JT808.Protocol;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/JT808.Gateway.Kafka/JT808MsgConsumer.cs b/src/JT808.Gateway.Kafka/JT808MsgConsumer.cs
index 56818f2..da9d71e 100644
--- a/src/JT808.Gateway.Kafka/JT808MsgConsumer.cs
+++ b/src/JT808.Gateway.Kafka/JT808MsgConsumer.cs
@@ -1,6 +1,6 @@
 using Confluent.Kafka;
 using JT808.Gateway.Configs.Kafka;
-using JT808.Gateway.PubSub;
+using JT808.Gateway.Abstractions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System;
diff --git a/src/JT808.Gateway.Kafka/JT808MsgProducer.cs b/src/JT808.Gateway.Kafka/JT808MsgProducer.cs
index 67d6d1b..e644927 100644
--- a/src/JT808.Gateway.Kafka/JT808MsgProducer.cs
+++ b/src/JT808.Gateway.Kafka/JT808MsgProducer.cs
@@ -1,6 +1,6 @@
 using Confluent.Kafka;
 using JT808.Gateway.Configs.Kafka;
-using JT808.Gateway.PubSub;
+using JT808.Gateway.Abstractions;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
@@ -26,7 +26,7 @@ namespace JT808.Gateway.Kafka
             producer.Dispose();
         }
 
-        public async Task ProduceAsync(string terminalNo, byte[] data)
+        public async ValueTask ProduceAsync(string terminalNo, byte[] data)
         {
             await producer.ProduceAsync(TopicName, new Message<string, byte[]>
             {
diff --git a/src/JT808.Gateway.Kafka/JT808MsgReplyConsumer.cs b/src/JT808.Gateway.Kafka/JT808MsgReplyConsumer.cs
index 004a391..340fd30 100644
--- a/src/JT808.Gateway.Kafka/JT808MsgReplyConsumer.cs
+++ b/src/JT808.Gateway.Kafka/JT808MsgReplyConsumer.cs
@@ -1,6 +1,6 @@
 using Confluent.Kafka;
 using JT808.Gateway.Configs.Kafka;
-using JT808.Gateway.PubSub;
+using JT808.Gateway.Abstractions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System;
diff --git a/src/JT808.Gateway.Kafka/JT808MsgReplyProducer.cs b/src/JT808.Gateway.Kafka/JT808MsgReplyProducer.cs
index f29e9be..a609273 100644
--- a/src/JT808.Gateway.Kafka/JT808MsgReplyProducer.cs
+++ b/src/JT808.Gateway.Kafka/JT808MsgReplyProducer.cs
@@ -1,6 +1,6 @@
 using Confluent.Kafka;
 using JT808.Gateway.Configs.Kafka;
-using JT808.Gateway.PubSub;
+using JT808.Gateway.Abstractions;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
@@ -26,7 +26,7 @@ namespace JJT808.Gateway.Kafka
             producer.Dispose();
         }
 
-        public async Task ProduceAsync(string terminalNo, byte[] data)
+        public async ValueTask ProduceAsync(string terminalNo, byte[] data)
         {
             await producer.ProduceAsync(TopicName, new Message<string, byte[]>
             {
diff --git a/src/JT808.Gateway.Kafka/JT808ServerKafkaExtensions.cs b/src/JT808.Gateway.Kafka/JT808ServerKafkaExtensions.cs
index e8e1dc1..e4e493b 100644
--- a/src/JT808.Gateway.Kafka/JT808ServerKafkaExtensions.cs
+++ b/src/JT808.Gateway.Kafka/JT808ServerKafkaExtensions.cs
@@ -1,5 +1,5 @@
 using JT808.Gateway.Configs.Kafka;
-using JT808.Gateway.PubSub;
+using JT808.Gateway.Abstractions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
diff --git a/src/JT808.Gateway.Kafka/JT808SessionConsumer.cs b/src/JT808.Gateway.Kafka/JT808SessionConsumer.cs
index 9ccf830..83b4d31 100644
--- a/src/JT808.Gateway.Kafka/JT808SessionConsumer.cs
+++ b/src/JT808.Gateway.Kafka/JT808SessionConsumer.cs
@@ -1,6 +1,6 @@
 using Confluent.Kafka;
 using JT808.Gateway.Configs.Kafka;
-using JT808.Gateway.PubSub;
+using JT808.Gateway.Abstractions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System;
diff --git a/src/JT808.Gateway.Kafka/JT808SessionProducer.cs b/src/JT808.Gateway.Kafka/JT808SessionProducer.cs
index 3b6494f..9049a0d 100644
--- a/src/JT808.Gateway.Kafka/JT808SessionProducer.cs
+++ b/src/JT808.Gateway.Kafka/JT808SessionProducer.cs
@@ -1,6 +1,6 @@
 using Confluent.Kafka;
 using JT808.Gateway.Configs.Kafka;
-using JT808.Gateway.PubSub;
+using JT808.Gateway.Abstractions;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
@@ -26,7 +26,7 @@ namespace JT808.Gateway.Kafka
             producer.Dispose();
         }
 
-        public async Task ProduceAsync(string notice,string terminalNo)
+        public async ValueTask ProduceAsync(string notice,string terminalNo)
         {
             await producer.ProduceAsync(TopicName, new Message<string, string>
             {
diff --git a/src/JT808.Gateway.sln b/src/JT808.Gateway.sln
index 3719e74..e171f8b 100644
--- a/src/JT808.Gateway.sln
+++ b/src/JT808.Gateway.sln
@@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Gateway.Test", "JT808
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Gateway.Abstractions", "JT808.Gateway.Abstractions\JT808.Gateway.Abstractions.csproj", "{3AA17DF7-A1B3-449C-93C2-45B051C32933}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Gateway.Kafka", "JT808.Gateway.Kafka\JT808.Gateway.Kafka.csproj", "{274C048E-A8E3-4422-A578-A10A97DF36F2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{3AA17DF7-A1B3-449C-93C2-45B051C32933}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3AA17DF7-A1B3-449C-93C2-45B051C32933}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AA17DF7-A1B3-449C-93C2-45B051C32933}.Release|Any CPU.Build.0 = Release|Any CPU
+		{274C048E-A8E3-4422-A578-A10A97DF36F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{274C048E-A8E3-4422-A578-A10A97DF36F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{274C048E-A8E3-4422-A578-A10A97DF36F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{274C048E-A8E3-4422-A578-A10A97DF36F2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/JT808.Gateway/JT808.Gateway.csproj b/src/JT808.Gateway/JT808.Gateway.csproj
index fdbfd6e..ff072a0 100644
--- a/src/JT808.Gateway/JT808.Gateway.csproj
+++ b/src/JT808.Gateway/JT808.Gateway.csproj
@@ -7,6 +7,10 @@
     <Authors>SmallChi(Koike)</Authors>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <SignAssembly>false</SignAssembly>
+    <RepositoryUrl>https://github.com/SmallChi/JT808Gateway</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/SmallChi/JT808Gateway</PackageProjectUrl>
+    <licenseUrl>https://github.com/SmallChi/JT808Gateway/blob/master/LICENSE</licenseUrl>
+    <license>https://github.com/SmallChi/JT808Gateway/blob/master/LICENSE</license>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Description>基于Pipeline实现的JT808Gateway的网络库</Description>