升级net5.0

src/JT1078.Gateway.Abstractions/JT1078.Gateway.Abstractions.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
+    <LangVersion>9.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>
     <PackageId>JT1078.Gateway.Abstractions</PackageId>
@@ -18,6 +18,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Version>$(JT1078PackageVersion)</Version>
+    <DocumentationFile>JT1078.Gateway.Abstractions.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,11 +33,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JT1078" Version="1.0.4-preview1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.7" />
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
+    <PackageReference Include="JT1078" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
+    <PackageReference Include="System.Text.Json" Version="5.0.0" />
   </ItemGroup>
 </Project>

src/JT1078.Gateway.Abstractions/JT1078.Gateway.Abstractions.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>JT1078.Gateway.Abstractions</name>
+    </assembly>
+    <members>
+        <member name="T:JT1078.Gateway.Abstractions.Enums.JT1078TransportProtocolType">
+            <summary>
+            传输协议类型
+            </summary>
+        </member>
+        <member name="M:JT1078.Gateway.Abstractions.IJT1078MsgProducer.ProduceAsync(System.String,System.Byte[])">
+            <summary>
+            
+            </summary>
+            <param name="sim">设备sim终端号</param>
+            <param name="data">jt1078 hex data</param>
+        </member>
+        <member name="P:JT1078.Gateway.Abstractions.IJT1078Session.TerminalPhoneNo">
+            <summary>
+            终端手机号
+            </summary>
+        </member>
+    </members>
+</doc>

src/JT1078.Gateway.Coordinator/JT1078.Gateway.Coordinator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 

src/JT1078.Gateway.InMemoryMQ/JT1078.Gateway.InMemoryMQ.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
+    <LangVersion>9.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>
     <PackageId>JT1078.Gateway.InMemoryMQ</PackageId>
@@ -18,10 +18,11 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Version>$(JT1078PackageVersion)</Version>
+    <DocumentationFile>JT1078.Gateway.InMemoryMQ.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Threading.Channels" Version="4.7.1" />
+    <PackageReference Include="System.Threading.Channels" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\LICENSE" Pack="true" PackagePath="" />

src/JT1078.Gateway.InMemoryMQ/JT1078.Gateway.InMemoryMQ.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>JT1078.Gateway.InMemoryMQ</name>
+    </assembly>
+    <members>
+    </members>
+</doc>

src/JT1078.Gateway.Tests/JT1078.Gateway.Test/JT1078.Gateway.Test.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="System.IO.Pipelines" Version="5.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

src/JT1078.Gateway.Tests/JT1078.Gateway.TestNormalHosting/JT1078.Gateway.TestNormalHosting.csproj

@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="JT1078.Flv" Version="1.0.0-preview11" />
-    <PackageReference Include="JT1078.Hls" Version="1.0.0-preview2" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.7" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="1.6.4" />
+    <PackageReference Include="JT1078.Flv" Version="1.1.0" />
+    <PackageReference Include="JT1078.Hls" Version="1.1.0-preview1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.6.5" />
   </ItemGroup>
   
   <ItemGroup>

src/JT1078.Gateway/JT1078.Gateway.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+    <TargetFrameworks>netstandard2.1;net5.0;</TargetFrameworks>
+    <LangVersion>9.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>
     <PackageId>JT1078.Gateway</PackageId>
@@ -18,6 +18,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Version>$(JT1078PackageVersion)</Version>
+    <DocumentationFile>JT1078.Gateway.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Codecs\**" />
@@ -38,8 +39,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.7" />
-    <PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
+    <PackageReference Include="System.IO.Pipelines" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/JT1078.Gateway/JT1078.Gateway.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>JT1078.Gateway</name>
+    </assembly>
+    <members>
+        <member name="P:JT1078.Gateway.Configurations.JT1078Configuration.TcpReaderIdleTimeSeconds">
+            <summary>
+            Tcp读超时 
+            默认10分钟检查一次
+            </summary>
+        </member>
+        <member name="P:JT1078.Gateway.Configurations.JT1078Configuration.TcpReceiveTimeoutCheckTimeSeconds">
+            <summary>
+            Tcp 60s检查一次
+            </summary>
+        </member>
+        <member name="P:JT1078.Gateway.Configurations.JT1078Configuration.UdpReaderIdleTimeSeconds">
+            <summary>
+            Udp读超时
+            </summary>
+        </member>
+        <member name="P:JT1078.Gateway.Configurations.JT1078Configuration.UdpReceiveTimeoutCheckTimeSeconds">
+            <summary>
+            Udp 60s检查一次
+            </summary>
+        </member>
+        <member name="P:JT1078.Gateway.Configurations.JT1078Configuration.HlsRootDirectory">
+            <summary>
+            Hls根目录
+            </summary>
+        </member>
+        <member name="P:JT1078.Gateway.Configurations.JT1078Configuration.CoordinatorHeartbeatTimeSeconds">
+            <summary>
+            协调器发送心跳时间
+            默认60s发送一次
+            </summary>
+        </member>
+        <member name="P:JT1078.Gateway.Configurations.JT1078Configuration.CoordinatorUri">
+            <summary>
+            协调器Coordinator主机
+            http://localhost/
+            http://127.0.0.1/
+            </summary>
+        </member>
+        <member name="P:JT1078.Gateway.Configurations.JT1078Configuration.CoordinatorUserName">
+            <summary>
+            协调器Coordinator主机登录账号
+            </summary>
+        </member>
+        <member name="P:JT1078.Gateway.Configurations.JT1078Configuration.CoordinatorPassword">
+            <summary>
+            协调器Coordinator主机登录密码
+            </summary>
+        </member>
+        <member name="T:JT1078.Gateway.JT1078CoordinatorHttpClient">
+            <summary>
+            协调器客户端
+            </summary>
+        </member>
+        <member name="M:JT1078.Gateway.JT1078CoordinatorHttpClient.Login">
+            <summary>
+            登录
+            </summary>
+        </member>
+        <member name="M:JT1078.Gateway.JT1078CoordinatorHttpClient.Reset">
+            <summary>
+            发送重制至协调器中
+            </summary>
+        </member>
+        <member name="M:JT1078.Gateway.JT1078CoordinatorHttpClient.Heartbeat(System.String)">
+            <summary>
+            发送心跳至协调器中
+            </summary>
+            <param name="content"></param>
+        </member>
+        <member name="M:JT1078.Gateway.JT1078CoordinatorHttpClient.ChannelClose(System.String,System.Int32)">
+            <summary>
+            发送设备号和通道给协调器中
+            </summary>
+            <param name="terminalPhoneNo"></param>
+            <param name="channelNo"></param>
+        </member>
+        <member name="M:JT1078.Gateway.JT1078TcpServer.#ctor(JT1078.Gateway.Abstractions.IJT1078MsgProducer,Microsoft.Extensions.Options.IOptions{JT1078.Gateway.Configurations.JT1078Configuration},Microsoft.Extensions.Logging.ILoggerFactory,JT1078.Gateway.Sessions.JT1078SessionManager)">
+            <summary>
+            使用队列方式
+            </summary>
+            <param name="jT1078MsgProducer"></param>
+            <param name="jT1078ConfigurationAccessor"></param>
+            <param name="loggerFactory"></param>
+            <param name="jT1078SessionManager"></param>
+        </member>
+        <member name="M:JT1078.Gateway.JT1078UdpServer.#ctor(JT1078.Gateway.Abstractions.IJT1078MsgProducer,Microsoft.Extensions.Options.IOptions{JT1078.Gateway.Configurations.JT1078Configuration},Microsoft.Extensions.Logging.ILoggerFactory,JT1078.Gateway.Sessions.JT1078SessionManager)">
+            <summary>
+            使用队列方式
+            </summary>
+            <param name="jT1078MsgProducer"></param>
+            <param name="jT1078ConfigurationAccessor"></param>
+            <param name="loggerFactory"></param>
+            <param name="jT1078SessionManager"></param>
+        </member>
+        <member name="M:JT1078.Gateway.Sessions.JT1078HttpSessionManager.SendAVData(JT1078.Gateway.Metadata.JT1078HttpContext,System.Byte[],System.Boolean)">
+            <summary>
+            发送音视频数据
+            </summary>
+            <param name="httpContext"></param>
+            <param name="data"></param>
+            <param name="firstSend"></param>
+        </member>
+        <member name="T:JT1078.Gateway.Sessions.JT1078SessionManager">
+            <summary>
+            
+            <remark>不支持变态类型:既发TCP和UDP</remark>
+            </summary>
+        </member>
+        <member name="P:JT1078.Gateway.Sessions.JT1078TcpSession.TerminalPhoneNo">
+            <summary>
+            终端手机号
+            </summary>
+        </member>
+        <member name="P:JT1078.Gateway.Sessions.JT1078UdpSession.TerminalPhoneNo">
+            <summary>
+            终端手机号
+            </summary>
+        </member>
+    </members>
+</doc>