From 4aa060466d03cada0f8ce1304e3d3eb188a926e7 Mon Sep 17 00:00:00 2001 From: "smallchi(Koike)" <564952747@qq.com> Date: Fri, 24 Jan 2020 13:37:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E5=8F=96=E5=86=85=E5=AD=98=E9=98=9F?= =?UTF-8?q?=E5=88=97=E5=88=B0=E5=8D=95=E7=8B=AC=E5=BA=93=E4=B8=AD=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E7=9A=84=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E6=96=B9=E6=B3=95=203.=E5=A2=9E=E5=8A=A0github=20actions?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=204.=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dotnetcore.yml | 41 ++++ README.md | 39 ++-- publish.gateway.bat | 1 + .../JT808.Gateway.Abstractions.csproj | 4 +- .../JT808ReplyMessageHandler.cs} | 9 +- .../JT808.Gateway.InMemoryMQ.csproj | 34 +++ .../JT808MsgConsumer.cs | 62 ++++++ .../JT808MsgProducer.cs} | 16 +- .../JT808MsgReplyConsumer.cs | 65 ++++++ .../JT808MsgReplyProducer.cs | 27 +++ .../JT808ServerInMemoryMQExtensions.cs | 26 +++ .../Services}/JT808MsgService.cs | 4 +- .../Services/JT808ReplyMsgService.cs | 29 +++ .../JT808.Gateway.Kafka.csproj | 10 +- .../JT808ServerKafkaExtensions.cs | 6 +- .../JT808.Gateway.MsgIdHandler.csproj | 4 - .../JT808MsgIdHandlerExtensions.cs | 6 +- .../JT808.Gateway.MsgLogging.csproj | 4 +- .../JT808.Gateway.ReplyMessage.csproj | 4 +- .../JT808ReplyMessageExtensions.cs | 38 ++-- .../JT808ReplyMessageHostedService.cs | 8 +- .../JT808.Gateway.SessionNotice.csproj | 4 +- .../JT808SessionNoticeExtensions.cs | 34 +-- .../JT808.Gateway.Traffic.csproj | 6 +- .../JT808TrafficServiceExtensions.cs | 19 +- .../JT808TrafficServiceHostedService.cs | 2 +- .../JT808.Gateway.Transmit.csproj | 4 +- .../JT808TransmitExtensions.cs | 21 +- .../JT808.Gateway.Test.csproj | 4 +- .../Configs/nlog.Win32NT.config | 2 +- .../JT808.Gateway.TestHosting.csproj | 6 +- src/JT808.Gateway.TestHosting/Program.cs | 17 +- .../appsettings.json | 9 +- src/JT808.Gateway.sln | 6 + .../Configurations/JT808Configuration.cs | 8 +- .../Enums/JT808MessageQueueType.cs | 18 -- .../Internal/JT808MsgReplyConsumerDefault.cs | 204 ------------------ src/JT808.Gateway/JT808.Gateway.csproj | 5 +- src/JT808.Gateway/JT808GatewayExtensions.cs | 11 - src/JT808.Gateway/JT808GrpcServer.cs | 5 +- src/JT808.Gateway/JT808TcpServer.cs | 25 +-- src/JT808.Gateway/JT808UdpServer.cs | 18 +- .../Services/JT808MsgReplyHostedService.cs | 23 +- .../JT808TcpReceiveTimeoutHostedService.cs | 5 +- .../JT808UdpReceiveTimeoutHostedService.cs | 5 +- 45 files changed, 460 insertions(+), 438 deletions(-) create mode 100644 .github/workflows/dotnetcore.yml rename src/{JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageService.cs => JT808.Gateway.Abstractions/JT808ReplyMessageHandler.cs} (98%) create mode 100644 src/JT808.Gateway.InMemoryMQ/JT808.Gateway.InMemoryMQ.csproj create mode 100644 src/JT808.Gateway.InMemoryMQ/JT808MsgConsumer.cs rename src/{JT808.Gateway/Internal/JT808MsgProducerDefault.cs => JT808.Gateway.InMemoryMQ/JT808MsgProducer.cs} (72%) create mode 100644 src/JT808.Gateway.InMemoryMQ/JT808MsgReplyConsumer.cs create mode 100644 src/JT808.Gateway.InMemoryMQ/JT808MsgReplyProducer.cs create mode 100644 src/JT808.Gateway.InMemoryMQ/JT808ServerInMemoryMQExtensions.cs rename src/{JT808.Gateway/Internal => JT808.Gateway.InMemoryMQ/Services}/JT808MsgService.cs (90%) create mode 100644 src/JT808.Gateway.InMemoryMQ/Services/JT808ReplyMsgService.cs delete mode 100644 src/JT808.Gateway/Enums/JT808MessageQueueType.cs delete mode 100644 src/JT808.Gateway/Internal/JT808MsgReplyConsumerDefault.cs diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml new file mode 100644 index 0000000..73dea84 --- /dev/null +++ b/.github/workflows/dotnetcore.yml @@ -0,0 +1,41 @@ +name: .NET Core + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@master + - name: Setup .NET Core + uses: actions/setup-dotnet@master + with: + dotnet-version: 3.1.101 + - name: dotnet info + run: dotnet --info + - name: dotnet JT808.DotNetty restore + run: dotnet restore ./src/JT808.DotNetty.sln + - name: dotnet JT808.DotNetty.Core build + run: dotnet build ./src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/JT808.DotNetty.Core.Test.csproj + - name: dotnet JT808.DotNetty.Core test + run: dotnet test ./src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/JT808.DotNetty.Core.Test.csproj + - name: dotnet JT808.DotNetty.Tcp build + run: dotnet build ./src/JT808.DotNetty.Tests/JT808.DotNetty.Tcp.Test/JT808.DotNetty.Tcp.Test.csproj + - name: dotnet JT808.DotNetty.Tcp test + run: dotnet test ./src/JT808.DotNetty.Tests/JT808.DotNetty.Tcp.Test/JT808.DotNetty.Tcp.Test.csproj + - name: dotnet JT808.DotNetty.Udp build + run: dotnet build ./src/JT808.DotNetty.Tests/JT808.DotNetty.Udp.Test/JT808.DotNetty.Udp.Test.csproj + - name: dotnet JT808.DotNetty.Udp test + run: dotnet test ./src/JT808.DotNetty.Tests/JT808.DotNetty.Udp.Test/JT808.DotNetty.Udp.Test.csproj + - name: dotnet JT808.DotNetty.WebApi build + run: dotnet build ./src/JT808.DotNetty.Tests/JT808.DotNetty.WebApi.Test/JT808.DotNetty.WebApi.Test.csproj + - name: dotnet JT808.DotNetty.WebApi test + run: dotnet test ./src/JT808.DotNetty.Tests/JT808.DotNetty.WebApi.Test/JT808.DotNetty.WebApi.Test.csproj + - name: dotnet JT808.Gateway restore + run: dotnet restore ./src/JT808.Gateway.sln + - name: dotnet JT808.Gateway build + run: dotnet build ./src/JT808.Gateway.Test/JT808.Gateway.Test.csproj + - name: dotnet test + run: dotnet test ./src/JT808.Gateway.Test/JT808.Gateway.Test.csproj diff --git a/README.md b/README.md index e991ed5..2359e0d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ [玩一玩压力测试](https://github.com/SmallChi/JT808DotNetty/blob/master/doc/README.md) -[![MIT Licence](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/SmallChi/JT808DotNetty/blob/master/LICENSE)[![Build Status](https://travis-ci.org/SmallChi/JT808DotNetty.svg?branch=master)](https://travis-ci.org/SmallChi/JT808DotNetty) +[![MIT Licence](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/SmallChi/JT808DotNetty/blob/master/LICENSE)[![Build Status](https://travis-ci.org/SmallChi/JT808DotNetty.svg?branch=master)](https://travis-ci.org/SmallChi/JT808DotNetty)[![Github Build status](https://github.com/SmallChi/JT808Gateway/workflows/.NET%20Core/badge.svg)]() ## 新网关的优势 @@ -57,7 +57,7 @@ ## 基于GRPC的消息业务处理程序 -[GRPC协议](https://github.com/SmallChi/JT808Gateway/blob/master/src/JT808.Gateway.Abstractions/Protos/JT808Gateway.proto) +[GRPC消息业务处理协议](https://github.com/SmallChi/JT808Gateway/blob/master/src/JT808.Gateway.Abstractions/Protos/JT808Gateway.proto) ## 基于DotNetty的NuGet安装 @@ -86,6 +86,7 @@ | Install-Package JT808.Gateway.Abstractions| ![JT808.Gateway.Abstractions](https://img.shields.io/nuget/v/JT808.Gateway.Abstractions.svg) | ![JT808.Gateway.Abstractions](https://img.shields.io/nuget/dt/JT808.Gateway.Abstractions.svg) | | Install-Package JT808.Gateway | ![JT808.Gateway](https://img.shields.io/nuget/v/JT808.Gateway.svg) | ![JT808.Gateway](https://img.shields.io/nuget/dt/JT808.Gateway.svg) | | Install-Package JT808.Gateway.Kafka| ![JT808.Gateway.Kafka](https://img.shields.io/nuget/v/JT808.Gateway.Kafka.svg) | ![JT808.Gateway.Kafka](https://img.shields.io/nuget/dt/JT808.Gateway.Kafka.svg) | +| Install-Package JT808.Gateway.InMemoryMQ| ![JT808.Gateway.InMemoryMQ](https://img.shields.io/nuget/v/JT808.Gateway.InMemoryMQ.svg) | ![JT808.Gateway.InMemoryMQ](https://img.shields.io/nuget/dt/JT808.Gateway.InMemoryMQ.svg) | | Install-Package JT808.Gateway.Transmit | ![JT808.Gateway.Transmit](https://img.shields.io/nuget/v/JT808.Gateway.Transmit.svg) | ![JT808.Gateway.Transmit](https://img.shields.io/nuget/dt/JT808.Gateway.Transmit.svg) | | Install-Package JT808.Gateway.Traffic | ![JT808.Gateway.Traffic](https://img.shields.io/nuget/v/JT808.Gateway.Traffic.svg) | ![JT808.Gateway.Traffic](https://img.shields.io/nuget/dt/JT808.Gateway.Traffic.svg)| | Install-Package JT808.Gateway.SessionNotice | ![JT808.Gateway.SessionNotice](https://img.shields.io/nuget/v/JT808.Gateway.SessionNotice.svg) | ![JT808.Gateway.SessionNotice](https://img.shields.io/nuget/dt/JT808.Gateway.SessionNotice.svg)| @@ -168,23 +169,23 @@ static async Task Main(string[] args) services.AddSingleton(); services.AddSingleton(typeof(ILogger<>), typeof(Logger<>)); services.AddJT808Configure() - //用于测试网关 - .AddJT808DevelopmentGateway() - //用于生产环境 - //.AddJT808Gateway(options => - //{ - // options.TcpPort=8086; - // options.UdpPort=8086; - // options.MessageQueueType = JT808MessageQueueType.InPlug; - //}) - .AddTcp() - .AddUdp() - .AddGrpc() - //kafka插件 - //.AddJT808ServerKafkaMsgProducer(hostContext.Configuration) - //.AddJT808ServerKafkaMsgReplyConsumer(hostContext.Configuration) - //.AddJT808ServerKafkaSessionProducer(hostContext.Configuration) - ; + //.AddJT808Gateway(options => + //{ + // options.TcpPort = 808; + // options.UdpPort = 808; + //}) + .AddJT808Gateway(hostContext.Configuration) + .AddTcp() + .AddUdp() + .AddGrpc() + //InMemoryMQ + .AddJT808ServerInMemoryMQ() + .AddJT808InMemoryReplyMessage() + //kafka插件 + //.AddJT808ServerKafkaMsgProducer(hostContext.Configuration) + //.AddJT808ServerKafkaMsgReplyConsumer(hostContext.Configuration) + //.AddJT808ServerKafkaSessionProducer(hostContext.Configuration) + ; //services.AddHostedService(); }); diff --git a/publish.gateway.bat b/publish.gateway.bat index 90791b2..fb3f822 100644 --- a/publish.gateway.bat +++ b/publish.gateway.bat @@ -1,5 +1,6 @@ dotnet pack .\src\JT808.Gateway\JT808.Gateway.csproj --no-build --output ../../nupkgs dotnet pack .\src\JT808.Gateway.Kafka\JT808.Gateway.Kafka.csproj --no-build --output ../../nupkgs +dotnet pack .\src\JT808.Gateway.InMemoryMQ\JT808.Gateway.InMemoryMQ.csproj --no-build --output ../../nupkgs dotnet pack .\src\JT808.Gateway.Abstractions\JT808.Gateway.Abstractions.csproj --no-build --output ../../nupkgs echo 'push service pacakge...' diff --git a/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj b/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj index dec02b2..dfbef5f 100644 --- a/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj +++ b/src/JT808.Gateway.Abstractions/JT808.Gateway.Abstractions.csproj @@ -29,8 +29,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageService.cs b/src/JT808.Gateway.Abstractions/JT808ReplyMessageHandler.cs similarity index 98% rename from src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageService.cs rename to src/JT808.Gateway.Abstractions/JT808ReplyMessageHandler.cs index b86ed57..2e96fda 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageService.cs +++ b/src/JT808.Gateway.Abstractions/JT808ReplyMessageHandler.cs @@ -1,5 +1,4 @@ -using JT808.Gateway.Abstractions; -using JT808.Protocol; +using JT808.Protocol; using JT808.Protocol.Enums; using JT808.Protocol.Extensions; using JT808.Protocol.MessageBody; @@ -7,16 +6,16 @@ using System; using System.Collections.Generic; using System.Text; -namespace JT808.Gateway.ReplyMessage +namespace JT808.Gateway.Abstractions { - public class JT808ReplyMessageService + public class JT808ReplyMessageHandler { protected Dictionary HandlerDict { get; } protected delegate byte[] MsgIdMethodDelegate(JT808HeaderPackage package); protected JT808Serializer JT808Serializer { get; } protected IJT808MsgReplyProducer JT808MsgReplyProducer { get; } - public JT808ReplyMessageService( + public JT808ReplyMessageHandler( IJT808Config jT808Config, IJT808MsgReplyProducer jT808MsgReplyProducer) { diff --git a/src/JT808.Gateway.InMemoryMQ/JT808.Gateway.InMemoryMQ.csproj b/src/JT808.Gateway.InMemoryMQ/JT808.Gateway.InMemoryMQ.csproj new file mode 100644 index 0000000..b9bbf12 --- /dev/null +++ b/src/JT808.Gateway.InMemoryMQ/JT808.Gateway.InMemoryMQ.csproj @@ -0,0 +1,34 @@ + + + + + netstandard2.1 + 8.0 + Copyright 2019. + SmallChi(Koike) + https://github.com/SmallChi/JT808Gateway + https://github.com/SmallChi/JT808Gateway + https://github.com/SmallChi/JT808Gateway/blob/master/LICENSE + https://github.com/SmallChi/JT808Gateway/blob/master/LICENSE + false + false + LICENSE + true + JT808.Gateway.InMemoryMQ + JT808.Gateway.InMemoryMQ + 基于InMemory的JT808消息发布与订阅 + 基于InMemory的JT808消息发布与订阅 + $(JT808GatewayPackageVersion) + + + + + + + + + + + + + diff --git a/src/JT808.Gateway.InMemoryMQ/JT808MsgConsumer.cs b/src/JT808.Gateway.InMemoryMQ/JT808MsgConsumer.cs new file mode 100644 index 0000000..2eeb39c --- /dev/null +++ b/src/JT808.Gateway.InMemoryMQ/JT808MsgConsumer.cs @@ -0,0 +1,62 @@ +using JT808.Gateway.Abstractions; +using JT808.Gateway.InMemoryMQ.Services; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace JT808.Gateway.InMemoryMQ +{ + public class JT808MsgConsumer : IJT808MsgConsumer + { + private readonly JT808MsgService JT808MsgService; + public CancellationTokenSource Cts => new CancellationTokenSource(); + private readonly ILogger logger; + public string TopicName => JT808GatewayConstants.MsgTopic; + public JT808MsgConsumer( + JT808MsgService jT808MsgService, + ILoggerFactory loggerFactory) + { + JT808MsgService = jT808MsgService; + logger = loggerFactory.CreateLogger("JT808MsgConsumer"); + } + + public void OnMessage(Action<(string TerminalNo, byte[] Data)> callback) + { + Task.Run(() => + { + while (!Cts.IsCancellationRequested) + { + try + { + if (JT808MsgService.TryRead(out var item)) + { + callback(item); + } + } + catch(Exception ex) + { + logger.LogError(ex, ""); + } + } + }, Cts.Token); + } + + public void Subscribe() + { + + } + + public void Unsubscribe() + { + Cts.Cancel(); + } + + public void Dispose() + { + Cts.Dispose(); + } + } +} diff --git a/src/JT808.Gateway/Internal/JT808MsgProducerDefault.cs b/src/JT808.Gateway.InMemoryMQ/JT808MsgProducer.cs similarity index 72% rename from src/JT808.Gateway/Internal/JT808MsgProducerDefault.cs rename to src/JT808.Gateway.InMemoryMQ/JT808MsgProducer.cs index e17fefb..60efd58 100644 --- a/src/JT808.Gateway/Internal/JT808MsgProducerDefault.cs +++ b/src/JT808.Gateway.InMemoryMQ/JT808MsgProducer.cs @@ -1,27 +1,27 @@ using JT808.Gateway.Abstractions; -using JT808.Gateway.Internal; +using JT808.Gateway.InMemoryMQ.Services; using System; using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -namespace JT808.Gateway.Internal +namespace JT808.Gateway.InMemoryMQ { - internal class JT808MsgProducerDefault : IJT808MsgProducer + public class JT808MsgProducer : IJT808MsgProducer { private readonly JT808MsgService JT808MsgService; public string TopicName => JT808GatewayConstants.MsgTopic; - public JT808MsgProducerDefault(JT808MsgService jT808MsgService) + public JT808MsgProducer(JT808MsgService jT808MsgService) { JT808MsgService = jT808MsgService; - } - public void Dispose() - { - } public async ValueTask ProduceAsync(string terminalNo, byte[] data) { await JT808MsgService.WriteAsync(terminalNo, data); } + public void Dispose() + { + + } } } diff --git a/src/JT808.Gateway.InMemoryMQ/JT808MsgReplyConsumer.cs b/src/JT808.Gateway.InMemoryMQ/JT808MsgReplyConsumer.cs new file mode 100644 index 0000000..432e746 --- /dev/null +++ b/src/JT808.Gateway.InMemoryMQ/JT808MsgReplyConsumer.cs @@ -0,0 +1,65 @@ +using JT808.Gateway.Abstractions; +using JT808.Gateway.InMemoryMQ.Services; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace JT808.Gateway.InMemoryMQ +{ + public class JT808MsgReplyConsumer : IJT808MsgReplyConsumer + { + private readonly JT808ReplyMsgService JT808ReplyMsgService; + public CancellationTokenSource Cts => new CancellationTokenSource(); + + private readonly ILogger logger; + + public string TopicName => JT808GatewayConstants.MsgReplyTopic; + + public JT808MsgReplyConsumer( + JT808ReplyMsgService jT808ReplyMsgService, + ILoggerFactory loggerFactory) + { + logger = loggerFactory.CreateLogger("JT808MsgReplyConsumer"); + JT808ReplyMsgService = jT808ReplyMsgService; + } + + public void OnMessage(Action<(string TerminalNo, byte[] Data)> callback) + { + Task.Run(() => + { + while (!Cts.IsCancellationRequested) + { + try + { + if (JT808ReplyMsgService.TryRead(out var item)) + { + callback(item); + } + } + catch (Exception ex) + { + logger.LogError(ex, ""); + } + } + }, Cts.Token); + } + + public void Subscribe() + { + + } + + public void Unsubscribe() + { + Cts.Cancel(); + } + + public void Dispose() + { + Cts.Dispose(); + } + } +} diff --git a/src/JT808.Gateway.InMemoryMQ/JT808MsgReplyProducer.cs b/src/JT808.Gateway.InMemoryMQ/JT808MsgReplyProducer.cs new file mode 100644 index 0000000..bd9c3b3 --- /dev/null +++ b/src/JT808.Gateway.InMemoryMQ/JT808MsgReplyProducer.cs @@ -0,0 +1,27 @@ +using JT808.Gateway.Abstractions; +using JT808.Gateway.InMemoryMQ.Services; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace JT808.Gateway.InMemoryMQ +{ + public class JT808MsgReplyProducer : IJT808MsgReplyProducer + { + public string TopicName => JT808GatewayConstants.MsgReplyTopic; + private readonly JT808ReplyMsgService JT808ReplyMsgService; + public JT808MsgReplyProducer(JT808ReplyMsgService jT808ReplyMsgService) + { + JT808ReplyMsgService = jT808ReplyMsgService; + } + public async ValueTask ProduceAsync(string terminalNo, byte[] data) + { + await JT808ReplyMsgService.WriteAsync(terminalNo, data); + } + public void Dispose() + { + + } + } +} diff --git a/src/JT808.Gateway.InMemoryMQ/JT808ServerInMemoryMQExtensions.cs b/src/JT808.Gateway.InMemoryMQ/JT808ServerInMemoryMQExtensions.cs new file mode 100644 index 0000000..69a9375 --- /dev/null +++ b/src/JT808.Gateway.InMemoryMQ/JT808ServerInMemoryMQExtensions.cs @@ -0,0 +1,26 @@ +using JT808.Gateway.Abstractions; +using JT808.Gateway.InMemoryMQ.Services; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; + +namespace JT808.Gateway.InMemoryMQ +{ + public static class JT808ServerInMemoryMQExtensions + { + /// + /// + /// + /// + /// + public static IJT808GatewayBuilder AddJT808ServerInMemoryMQ(this IJT808GatewayBuilder jT808GatewayBuilder) + { + jT808GatewayBuilder.JT808Builder.Services.AddSingleton(); + jT808GatewayBuilder.JT808Builder.Services.AddSingleton(); + jT808GatewayBuilder.JT808Builder.Services.Replace(new ServiceDescriptor(typeof(IJT808MsgProducer), typeof(JT808MsgProducer), ServiceLifetime.Singleton)); + jT808GatewayBuilder.JT808Builder.Services.Replace(new ServiceDescriptor(typeof(IJT808MsgConsumer), typeof(JT808MsgConsumer), ServiceLifetime.Singleton)); + jT808GatewayBuilder.JT808Builder.Services.Replace(new ServiceDescriptor(typeof(IJT808MsgReplyProducer), typeof(JT808MsgReplyProducer), ServiceLifetime.Singleton)); + jT808GatewayBuilder.JT808Builder.Services.Replace(new ServiceDescriptor(typeof(IJT808MsgReplyConsumer), typeof(JT808MsgReplyConsumer), ServiceLifetime.Singleton)); + return jT808GatewayBuilder; + } + } +} \ No newline at end of file diff --git a/src/JT808.Gateway/Internal/JT808MsgService.cs b/src/JT808.Gateway.InMemoryMQ/Services/JT808MsgService.cs similarity index 90% rename from src/JT808.Gateway/Internal/JT808MsgService.cs rename to src/JT808.Gateway.InMemoryMQ/Services/JT808MsgService.cs index 367be21..765b58b 100644 --- a/src/JT808.Gateway/Internal/JT808MsgService.cs +++ b/src/JT808.Gateway.InMemoryMQ/Services/JT808MsgService.cs @@ -5,9 +5,9 @@ using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; -namespace JT808.Gateway.Internal +namespace JT808.Gateway.InMemoryMQ.Services { - internal class JT808MsgService + public class JT808MsgService { private readonly Channel<(string TerminalNo, byte[] Data)> _channel; diff --git a/src/JT808.Gateway.InMemoryMQ/Services/JT808ReplyMsgService.cs b/src/JT808.Gateway.InMemoryMQ/Services/JT808ReplyMsgService.cs new file mode 100644 index 0000000..1497533 --- /dev/null +++ b/src/JT808.Gateway.InMemoryMQ/Services/JT808ReplyMsgService.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Channels; +using System.Threading.Tasks; + +namespace JT808.Gateway.InMemoryMQ.Services +{ + public class JT808ReplyMsgService + { + private readonly Channel<(string TerminalNo, byte[] Data)> _channel; + + public JT808ReplyMsgService() + { + _channel = Channel.CreateUnbounded<(string TerminalNo, byte[] Data)>(); + } + + public async ValueTask WriteAsync(string terminalNo, byte[] data) + { + await _channel.Writer.WriteAsync((terminalNo, data)); + } + + public bool TryRead(out (string TerminalNo, byte[] Data) item) + { + return _channel.Reader.TryRead(out item); + } + } +} diff --git a/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj b/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj index fc29cfc..473cae1 100644 --- a/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj +++ b/src/JT808.Gateway.Kafka/JT808.Gateway.Kafka.csproj @@ -21,11 +21,11 @@ - - - - - + + + + + diff --git a/src/JT808.Gateway.Kafka/JT808ServerKafkaExtensions.cs b/src/JT808.Gateway.Kafka/JT808ServerKafkaExtensions.cs index e4e493b..c70a6a0 100644 --- a/src/JT808.Gateway.Kafka/JT808ServerKafkaExtensions.cs +++ b/src/JT808.Gateway.Kafka/JT808ServerKafkaExtensions.cs @@ -11,7 +11,7 @@ namespace JT808.Gateway.Kafka /// /// /// - /// + /// /// GetSection("JT808MsgProducerConfig") /// public static IJT808GatewayBuilder AddJT808ServerKafkaMsgProducer(this IJT808GatewayBuilder jT808GatewayBuilder, IConfiguration configuration) @@ -23,7 +23,7 @@ namespace JT808.Gateway.Kafka /// /// /// - /// + /// /// GetSection("JT808MsgReplyConsumerConfig") /// public static IJT808GatewayBuilder AddJT808ServerKafkaMsgReplyConsumer(this IJT808GatewayBuilder jT808GatewayBuilder, IConfiguration configuration) @@ -35,7 +35,7 @@ namespace JT808.Gateway.Kafka /// /// /// - /// + /// /// GetSection("JT808SessionProducerConfig") /// public static IJT808GatewayBuilder AddJT808ServerKafkaSessionProducer(this IJT808GatewayBuilder jT808GatewayBuilder, IConfiguration configuration) diff --git a/src/JT808.Gateway.Services/JT808.Gateway.MsgIdHandler/JT808.Gateway.MsgIdHandler.csproj b/src/JT808.Gateway.Services/JT808.Gateway.MsgIdHandler/JT808.Gateway.MsgIdHandler.csproj index 65cddcf..11a9963 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.MsgIdHandler/JT808.Gateway.MsgIdHandler.csproj +++ b/src/JT808.Gateway.Services/JT808.Gateway.MsgIdHandler/JT808.Gateway.MsgIdHandler.csproj @@ -21,10 +21,6 @@ 基于JT808消息业务处理程序服务 LICENSE - - - - diff --git a/src/JT808.Gateway.Services/JT808.Gateway.MsgIdHandler/JT808MsgIdHandlerExtensions.cs b/src/JT808.Gateway.Services/JT808.Gateway.MsgIdHandler/JT808MsgIdHandlerExtensions.cs index 46d2417..aeb54b6 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.MsgIdHandler/JT808MsgIdHandlerExtensions.cs +++ b/src/JT808.Gateway.Services/JT808.Gateway.MsgIdHandler/JT808MsgIdHandlerExtensions.cs @@ -8,10 +8,10 @@ namespace JT808.Gateway.MsgIdHandler { public static class JT808MsgIdHandlerExtensions { - public static IJT808ClientBuilder AddJT808MsgIdHandler(this IJT808ClientBuilder jT808ClientBuilder) - where TJT808DotNettyMsgIdHandler: IJT808MsgIdHandler + public static IJT808ClientBuilder AddJT808MsgIdHandler(this IJT808ClientBuilder jT808ClientBuilder) + where TJT808MsgIdHandler: IJT808MsgIdHandler { - jT808ClientBuilder.JT808Builder.Services.AddSingleton(typeof(IJT808MsgIdHandler),typeof(TJT808DotNettyMsgIdHandler)); + jT808ClientBuilder.JT808Builder.Services.AddSingleton(typeof(IJT808MsgIdHandler),typeof(TJT808MsgIdHandler)); jT808ClientBuilder.JT808Builder.Services.AddHostedService(); return jT808ClientBuilder; } 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 c520ffb..0a4b424 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 @@ -22,9 +22,7 @@ LICENSE - - - + 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 2798ad3..e8c090e 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 @@ -21,9 +21,7 @@ LICENSE - - - + diff --git a/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageExtensions.cs b/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageExtensions.cs index 88ac45e..2675ba8 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageExtensions.cs +++ b/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageExtensions.cs @@ -10,50 +10,52 @@ namespace JT808.Gateway.ReplyMessage public static class JT808ReplyMessageExtensions { /// - /// 独享消息应答服务（不同的消费者实例） + /// 消息应答服务（不同的消费者实例） /// /// /// - public static IJT808ClientBuilder AddInprocJT808ReplyMessage(this IJT808ClientBuilder jT808ClientBuilder) + public static IJT808ClientBuilder AddJT808InPlugReplyMessage(this IJT808ClientBuilder jT808ClientBuilder) { - jT808ClientBuilder.JT808Builder.Services.AddSingleton(); + jT808ClientBuilder.JT808Builder.Services.AddSingleton(); jT808ClientBuilder.JT808Builder.Services.AddHostedService(); return jT808ClientBuilder; } /// - /// 独享消息应答服务（不同的消费者实例） + /// 消息应答服务（不同的消费者实例） /// /// 自定义消息回复服务 /// /// - public static IJT808ClientBuilder AddInprocJT808ReplyMessage(this IJT808ClientBuilder jT808ClientBuilder) - where TReplyMessageService : JT808ReplyMessageService + public static IJT808ClientBuilder AddJT808InPlugReplyMessage(this IJT808ClientBuilder jT808ClientBuilder) + where TReplyMessageHandler : JT808ReplyMessageHandler { - jT808ClientBuilder.JT808Builder.Services.AddSingleton(); + jT808ClientBuilder.JT808Builder.Services.AddSingleton(); jT808ClientBuilder.JT808Builder.Services.AddHostedService(); return jT808ClientBuilder; } /// - /// 共享消息应答服务（消费者单实例） + /// 消息应答服务（消费者单实例） /// /// 自定义消息回复服务 - /// + /// /// - public static IJT808ClientBuilder AddShareJT808ReplyMessage(this IJT808ClientBuilder jT808ClientBuilder) - where TReplyMessageService : JT808ReplyMessageService + public static IJT808GatewayBuilder AddJT808InMemoryReplyMessage(this IJT808GatewayBuilder jT808GatewayBuilder) + where TReplyMessageHandler : JT808ReplyMessageHandler { - jT808ClientBuilder.JT808Builder.Services.AddSingleton(); - return jT808ClientBuilder; + jT808GatewayBuilder.JT808Builder.Services.AddSingleton(); + jT808GatewayBuilder.JT808Builder.Services.AddHostedService(); + return jT808GatewayBuilder; } /// - /// 共享消息应答服务（消费者单实例） + /// 消息应答服务（消费者单实例） /// - /// + /// /// - public static IJT808ClientBuilder AddShareJT808ReplyMessage(this IJT808ClientBuilder jT808ClientBuilder) + public static IJT808GatewayBuilder AddJT808InMemoryReplyMessage(this IJT808GatewayBuilder jT808GatewayBuilder) { - jT808ClientBuilder.JT808Builder.Services.AddSingleton(); - return jT808ClientBuilder; + jT808GatewayBuilder.JT808Builder.Services.AddSingleton(); + jT808GatewayBuilder.JT808Builder.Services.AddHostedService(); + return jT808GatewayBuilder; } } } diff --git a/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageHostedService.cs b/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageHostedService.cs index 07e26eb..41937ae 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageHostedService.cs +++ b/src/JT808.Gateway.Services/JT808.Gateway.ReplyMessage/JT808ReplyMessageHostedService.cs @@ -8,20 +8,20 @@ namespace JT808.Gateway.ReplyMessage public class JT808ReplyMessageHostedService : IHostedService { private readonly IJT808MsgConsumer jT808MsgConsumer; - private readonly JT808ReplyMessageService jT808ReplyMessageService; + private readonly JT808ReplyMessageHandler jT808ReplyMessageHandler; public JT808ReplyMessageHostedService( - JT808ReplyMessageService jT808ReplyMessageService, + JT808ReplyMessageHandler jT808ReplyMessageHandler, IJT808MsgConsumer jT808MsgConsumer) { this.jT808MsgConsumer = jT808MsgConsumer; - this.jT808ReplyMessageService = jT808ReplyMessageService; + this.jT808ReplyMessageHandler = jT808ReplyMessageHandler; } public Task StartAsync(CancellationToken cancellationToken) { jT808MsgConsumer.Subscribe(); - jT808MsgConsumer.OnMessage(jT808ReplyMessageService.Processor); + jT808MsgConsumer.OnMessage(jT808ReplyMessageHandler.Processor); return Task.CompletedTask; } 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 3c560ca..4ecab27 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 @@ -22,9 +22,7 @@ LICENSE - - - + diff --git a/src/JT808.Gateway.Services/JT808.Gateway.SessionNotice/JT808SessionNoticeExtensions.cs b/src/JT808.Gateway.Services/JT808.Gateway.SessionNotice/JT808SessionNoticeExtensions.cs index 201187e..ca78dc7 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.SessionNotice/JT808SessionNoticeExtensions.cs +++ b/src/JT808.Gateway.Services/JT808.Gateway.SessionNotice/JT808SessionNoticeExtensions.cs @@ -10,11 +10,11 @@ namespace JT808.Gateway.SessionNotice public static class JT808SessionNoticeExtensions { /// - /// 独享消息会话通知服务（不同的消费者实例） + /// 会话通知服务（不同的消费者实例） /// /// /// - public static IJT808ClientBuilder AddInprocJT808SessionNotice(this IJT808ClientBuilder jT808ClientBuilder) + public static IJT808ClientBuilder AddJT808InPlugSessionNotice(this IJT808ClientBuilder jT808ClientBuilder) { jT808ClientBuilder.JT808Builder.Services.AddSingleton(); jT808ClientBuilder.JT808Builder.Services.AddHostedService(); @@ -22,12 +22,12 @@ namespace JT808.Gateway.SessionNotice } /// - /// 独享消息会话通知服务（不同的消费者实例） + /// 消息会话通知服务（不同的消费者实例） /// /// 自定义会话通知服务 /// /// - public static IJT808ClientBuilder AddInprocJT808SessionNotice(this IJT808ClientBuilder jT808ClientBuilder) + public static IJT808ClientBuilder AddJT808InPlugSessionNotice(this IJT808ClientBuilder jT808ClientBuilder) where TSessionNoticeService : JT808SessionNoticeService { jT808ClientBuilder.JT808Builder.Services.AddSingleton(); @@ -36,27 +36,29 @@ namespace JT808.Gateway.SessionNotice } /// - /// 共享消息会话通知服务（消费者单实例） + /// 消息会话通知服务（消费者单实例） /// /// 自定义会话通知服务 - /// + /// /// - public static IJT808ClientBuilder AddShareJT808SessionNotice(this IJT808ClientBuilder jT808ClientBuilder) + public static IJT808GatewayBuilder AddJT808InMemorySessionNotice(this IJT808GatewayBuilder jT808GatewayBuilder) where TSessionNoticeService : JT808SessionNoticeService { - jT808ClientBuilder.JT808Builder.Services.AddSingleton(); - return jT808ClientBuilder; + jT808GatewayBuilder.JT808Builder.Services.AddSingleton(); + jT808GatewayBuilder.JT808Builder.Services.AddHostedService(); + return jT808GatewayBuilder; } /// - /// 共享消息会话通知服务（消费者单实例） + /// 消息会话通知服务（消费者单实例） /// - /// + /// /// - public static IJT808ClientBuilder AddShareJT808SessionNotice(this IJT808ClientBuilder jT808ClientBuilder) - { - jT808ClientBuilder.JT808Builder.Services.AddSingleton(); - return jT808ClientBuilder; - } + //public static IJT808GatewayBuilder AddJT808InMemorySessionNotice(this IJT808GatewayBuilder jT808GatewayBuilder) + //{ + // jT808GatewayBuilder.JT808Builder.Services.AddSingleton(); + // jT808GatewayBuilder.JT808Builder.Services.AddHostedService(); + // return jT808GatewayBuilder; + //} } } diff --git a/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808.Gateway.Traffic.csproj b/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808.Gateway.Traffic.csproj index 643a756..4d74b28 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808.Gateway.Traffic.csproj +++ b/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808.Gateway.Traffic.csproj @@ -21,10 +21,8 @@ LICENSE - - - - + + diff --git a/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808TrafficServiceExtensions.cs b/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808TrafficServiceExtensions.cs index fc8878e..d292a4a 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808TrafficServiceExtensions.cs +++ b/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808TrafficServiceExtensions.cs @@ -9,26 +9,27 @@ namespace JT808.Gateway.Traffic public static class JT808TrafficServiceExtensions { /// - /// 独享消息流量统计服务（不同的消费者实例） + /// 消息流量统计服务（不同的消费者实例） /// /// /// - public static IJT808ClientBuilder AddInprocJT808Traffic(this IJT808ClientBuilder jT808ClientBuilder) + public static IJT808ClientBuilder AddJT808InPlugTraffic(this IJT808ClientBuilder jT808ClientBuilder) { jT808ClientBuilder.JT808Builder.Services.AddSingleton(); jT808ClientBuilder.JT808Builder.Services.AddHostedService(); return jT808ClientBuilder; } /// - /// 共享消息流量统计服务（消费者单实例） + /// 消息流量统计服务（消费者单实例） /// /// - /// + /// /// - public static IJT808ClientBuilder AddShareJT808Traffic(this IJT808ClientBuilder jT808ClientBuilder) - { - jT808ClientBuilder.JT808Builder.Services.AddSingleton(); - return jT808ClientBuilder; - } + //public static IJT808GatewayBuilder AddJT808InMemoryTraffic(this IJT808GatewayBuilder jT808GatewayBuilder) + //{ + // jT808GatewayBuilder.JT808Builder.Services.AddSingleton(); + // jT808GatewayBuilder.JT808Builder.Services.AddHostedService(); + // return jT808GatewayBuilder; + //} } } diff --git a/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808TrafficServiceHostedService.cs b/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808TrafficServiceHostedService.cs index ce0e70f..8c7d0b5 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808TrafficServiceHostedService.cs +++ b/src/JT808.Gateway.Services/JT808.Gateway.Traffic/JT808TrafficServiceHostedService.cs @@ -23,7 +23,7 @@ namespace JT808.Gateway.Traffic { jT808MsgConsumer.Subscribe(); jT808MsgConsumer.OnMessage((item)=> { - string str = item.Data.ToHexString(); + //string str = item.Data.ToHexString(); jT808TrafficService.Processor(item.TerminalNo, item.Data.Length); }); return Task.CompletedTask; 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 6d706d4..f42cb63 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 @@ -25,9 +25,7 @@ - - - + diff --git a/src/JT808.Gateway.Services/JT808.Gateway.Transmit/JT808TransmitExtensions.cs b/src/JT808.Gateway.Services/JT808.Gateway.Transmit/JT808TransmitExtensions.cs index 5667ea2..b6e497d 100644 --- a/src/JT808.Gateway.Services/JT808.Gateway.Transmit/JT808TransmitExtensions.cs +++ b/src/JT808.Gateway.Services/JT808.Gateway.Transmit/JT808TransmitExtensions.cs @@ -12,12 +12,12 @@ namespace JT808.Gateway.Transmit public static class JT808TransmitExtensions { /// - /// 独享转发服务（不同的消费者实例） + /// 转发服务（不同的消费者实例） /// /// /// /// - public static IJT808ClientBuilder AddInprocJT808Transmit(this IJT808ClientBuilder jT808ClientBuilder,IConfiguration configuration) + public static IJT808ClientBuilder AddJT808InPlugTransmit(this IJT808ClientBuilder jT808ClientBuilder,IConfiguration configuration) { jT808ClientBuilder.JT808Builder.Services.Configure(configuration.GetSection("RemoteServerOptions")); jT808ClientBuilder.JT808Builder.Services.AddSingleton(); @@ -25,16 +25,17 @@ namespace JT808.Gateway.Transmit return jT808ClientBuilder; } /// - /// 共享转发服务（消费者单实例） + /// 转发服务（消费者单实例） /// - /// + /// /// /// - public static IJT808ClientBuilder AddShareJT808Transmit(this IJT808ClientBuilder jT808ClientBuilder, IConfiguration configuration) - { - jT808ClientBuilder.JT808Builder.Services.Configure(configuration.GetSection("RemoteServerOptions")); - jT808ClientBuilder.JT808Builder.Services.AddSingleton(); - return jT808ClientBuilder; - } + //public static IJT808GatewayBuilder AddJT808InMemoryTransmit(this IJT808GatewayBuilder jT808GatewayBuilder, IConfiguration configuration) + //{ + // jT808GatewayBuilder.JT808Builder.Services.Configure(configuration.GetSection("RemoteServerOptions")); + // jT808GatewayBuilder.JT808Builder.Services.AddSingleton(); + // jT808GatewayBuilder.JT808Builder.Services.AddHostedService(); + // return jT808GatewayBuilder; + //} } } diff --git a/src/JT808.Gateway.Test/JT808.Gateway.Test.csproj b/src/JT808.Gateway.Test/JT808.Gateway.Test.csproj index e07a52b..e2363f8 100644 --- a/src/JT808.Gateway.Test/JT808.Gateway.Test.csproj +++ b/src/JT808.Gateway.Test/JT808.Gateway.Test.csproj @@ -7,7 +7,7 @@ - + @@ -15,7 +15,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/JT808.Gateway.TestHosting/Configs/nlog.Win32NT.config b/src/JT808.Gateway.TestHosting/Configs/nlog.Win32NT.config index 5a7e44e..a4e9705 100644 --- a/src/JT808.Gateway.TestHosting/Configs/nlog.Win32NT.config +++ b/src/JT808.Gateway.TestHosting/Configs/nlog.Win32NT.config @@ -31,6 +31,6 @@ - + \ No newline at end of file diff --git a/src/JT808.Gateway.TestHosting/JT808.Gateway.TestHosting.csproj b/src/JT808.Gateway.TestHosting/JT808.Gateway.TestHosting.csproj index ef98ad6..f515dd5 100644 --- a/src/JT808.Gateway.TestHosting/JT808.Gateway.TestHosting.csproj +++ b/src/JT808.Gateway.TestHosting/JT808.Gateway.TestHosting.csproj @@ -7,14 +7,16 @@ - - + + + + diff --git a/src/JT808.Gateway.TestHosting/Program.cs b/src/JT808.Gateway.TestHosting/Program.cs index a82a825..001e047 100644 --- a/src/JT808.Gateway.TestHosting/Program.cs +++ b/src/JT808.Gateway.TestHosting/Program.cs @@ -7,8 +7,9 @@ using JT808.Protocol; using Microsoft.Extensions.Configuration; using NLog.Extensions.Logging; using JT808.Gateway.TestHosting.Jobs; -using JT808.Gateway.Enums; using JT808.Gateway.Kafka; +using JT808.Gateway.InMemoryMQ; +using JT808.Gateway.ReplyMessage; namespace JT808.Gateway.TestHosting { @@ -35,18 +36,18 @@ namespace JT808.Gateway.TestHosting services.AddSingleton(); services.AddSingleton(typeof(ILogger<>), typeof(Logger<>)); services.AddJT808Configure() - //用于测试网关 - .AddJT808DevelopmentGateway() - //用于生产环境 //.AddJT808Gateway(options => //{ - // options.TcpPort=8086; - // options.UdpPort=8086; - // options.MessageQueueType = JT808MessageQueueType.InPlug; - //}) + // options.TcpPort = 808; + // options.UdpPort = 808; + //}) + .AddJT808Gateway(hostContext.Configuration) .AddTcp() .AddUdp() .AddGrpc() + //InMemoryMQ + .AddJT808ServerInMemoryMQ() + .AddJT808InMemoryReplyMessage() //kafka插件 //.AddJT808ServerKafkaMsgProducer(hostContext.Configuration) //.AddJT808ServerKafkaMsgReplyConsumer(hostContext.Configuration) diff --git a/src/JT808.Gateway.TestHosting/appsettings.json b/src/JT808.Gateway.TestHosting/appsettings.json index 727447f..d6f0ad1 100644 --- a/src/JT808.Gateway.TestHosting/appsettings.json +++ b/src/JT808.Gateway.TestHosting/appsettings.json @@ -1,9 +1,6 @@ { - "Logging": { - "LogLevel": { - "Default": "Debug", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Warning" - } + "JT808Configuration": { + "TcpPort": 808, + "UdpPort": 808 } } diff --git a/src/JT808.Gateway.sln b/src/JT808.Gateway.sln index dc20363..e70c6e9 100644 --- a/src/JT808.Gateway.sln +++ b/src/JT808.Gateway.sln @@ -27,6 +27,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Gateway.Transmit", "J EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Gateway.Traffic", "JT808.Gateway.Services\JT808.Gateway.Traffic\JT808.Gateway.Traffic.csproj", "{8FCC6D65-8A49-4AE7-8B19-F255100849D6}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Gateway.InMemoryMQ", "JT808.Gateway.InMemoryMQ\JT808.Gateway.InMemoryMQ.csproj", "{F7460E8F-B23E-4407-8802-375DE37BED00}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -77,6 +79,10 @@ Global {8FCC6D65-8A49-4AE7-8B19-F255100849D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {8FCC6D65-8A49-4AE7-8B19-F255100849D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {8FCC6D65-8A49-4AE7-8B19-F255100849D6}.Release|Any CPU.Build.0 = Release|Any CPU + {F7460E8F-B23E-4407-8802-375DE37BED00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7460E8F-B23E-4407-8802-375DE37BED00}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7460E8F-B23E-4407-8802-375DE37BED00}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7460E8F-B23E-4407-8802-375DE37BED00}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/JT808.Gateway/Configurations/JT808Configuration.cs b/src/JT808.Gateway/Configurations/JT808Configuration.cs index c6d3edd..1f3e80c 100644 --- a/src/JT808.Gateway/Configurations/JT808Configuration.cs +++ b/src/JT808.Gateway/Configurations/JT808Configuration.cs @@ -1,5 +1,4 @@ -using JT808.Gateway.Enums; -using System; +using System; using System.Collections.Generic; using System.Text; @@ -34,10 +33,5 @@ namespace JT808.Gateway.Configurations /// Udp 60s检查一次 /// public int UdpReceiveTimeoutCheckTimeSeconds { get; set; } = 60; - /// - /// 队列类型 - /// 默认内存队列 - /// - public JT808MessageQueueType MessageQueueType { get; set; } = JT808MessageQueueType.InMemory; } } diff --git a/src/JT808.Gateway/Enums/JT808MessageQueueType.cs b/src/JT808.Gateway/Enums/JT808MessageQueueType.cs deleted file mode 100644 index a83f6a0..0000000 --- a/src/JT808.Gateway/Enums/JT808MessageQueueType.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace JT808.Gateway.Enums -{ - public enum JT808MessageQueueType:byte - { - /// - /// 使用内存队列 - /// - InMemory=1, - /// - /// 使用第三方队列 - /// - InPlug=2 - } -} diff --git a/src/JT808.Gateway/Internal/JT808MsgReplyConsumerDefault.cs b/src/JT808.Gateway/Internal/JT808MsgReplyConsumerDefault.cs deleted file mode 100644 index 2dad063..0000000 --- a/src/JT808.Gateway/Internal/JT808MsgReplyConsumerDefault.cs +++ /dev/null @@ -1,204 +0,0 @@ -using JT808.Gateway.Abstractions; -using JT808.Protocol; -using JT808.Protocol.Enums; -using JT808.Protocol.Extensions; -using JT808.Protocol.MessageBody; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace JT808.Gateway.Internal -{ - internal class JT808MsgReplyConsumerDefault : IJT808MsgReplyConsumer - { - private readonly JT808MsgService JT808MsgService; - - private readonly JT808Serializer JT808Serializer; - - private delegate byte[] MethodDelegate(JT808HeaderPackage headerPackage); - - private Dictionary HandlerDict; - public JT808MsgReplyConsumerDefault( - IJT808Config jT808Config, - JT808MsgService jT808MsgService) - { - JT808MsgService = jT808MsgService; - this.JT808Serializer = jT808Config.GetSerializer(); - HandlerDict = new Dictionary { - {JT808MsgId.终端通用应答.ToUInt16Value(), Msg0x0001}, - {JT808MsgId.终端鉴权.ToUInt16Value(), Msg0x0102}, - {JT808MsgId.终端心跳.ToUInt16Value(), Msg0x0002}, - {JT808MsgId.终端注销.ToUInt16Value(), Msg0x0003}, - {JT808MsgId.终端注册.ToUInt16Value(), Msg0x0100}, - {JT808MsgId.位置信息汇报.ToUInt16Value(),Msg0x0200 }, - {JT808MsgId.定位数据批量上传.ToUInt16Value(),Msg0x0704 }, - {JT808MsgId.数据上行透传.ToUInt16Value(),Msg0x0900 } - }; - } - public CancellationTokenSource Cts =>new CancellationTokenSource(); - - public string TopicName => JT808GatewayConstants.MsgReplyTopic; - - public void Dispose() - { - Cts.Dispose(); - } - - public void OnMessage(Action<(string TerminalNo, byte[] Data)> callback) - { - Task.Run(() => - { - while (!Cts.IsCancellationRequested) - { - try - { - if(JT808MsgService.TryRead(out var item)) - { - JT808HeaderPackage package = JT808Serializer.HeaderDeserialize(item.Data); - if (HandlerDict.TryGetValue(package.Header.MsgId, out var func)) - { - var buffer = func(package); - if (buffer != null) - { - callback((item.TerminalNo, buffer)); - } - } - } - } - catch - { - - } - } - }, Cts.Token); - } - - public void Subscribe() - { - - } - - public void Unsubscribe() - { - Cts.Cancel(); - } - - /// - /// 终端通用应答 - /// 平台无需回复 - /// 实现自己的业务 - /// - /// - /// - public byte[] Msg0x0001(JT808HeaderPackage request) - { - return null; - } - - /// - /// 终端心跳 - /// - /// - /// - public byte[] Msg0x0002(JT808HeaderPackage request) - { - return JT808Serializer.Serialize(JT808MsgId.平台通用应答.Create(request.Header.TerminalPhoneNo, new JT808_0x8001() - { - AckMsgId = request.Header.MsgId, - JT808PlatformResult = JT808PlatformResult.成功, - MsgNum = request.Header.MsgNum - })); - } - - /// - /// 终端注销 - /// - /// - /// - public byte[] Msg0x0003(JT808HeaderPackage request) - { - return JT808Serializer.Serialize(JT808MsgId.平台通用应答.Create(request.Header.TerminalPhoneNo, new JT808_0x8001() - { - AckMsgId = request.Header.MsgId, - JT808PlatformResult = JT808PlatformResult.成功, - MsgNum = request.Header.MsgNum - })); - } - - /// - /// 终端注册 - /// - /// - /// - public byte[] Msg0x0100(JT808HeaderPackage request) - { - return JT808Serializer.Serialize(JT808MsgId.终端注册应答.Create(request.Header.TerminalPhoneNo, new JT808_0x8100() - { - Code = "J" + request.Header.TerminalPhoneNo, - JT808TerminalRegisterResult = JT808TerminalRegisterResult.成功, - AckMsgNum = request.Header.MsgNum - })); - } - /// - /// 终端鉴权 - /// - /// - /// - public byte[] Msg0x0102(JT808HeaderPackage request) - { - return JT808Serializer.Serialize(JT808MsgId.平台通用应答.Create(request.Header.TerminalPhoneNo, new JT808_0x8001() - { - AckMsgId = request.Header.MsgId, - JT808PlatformResult = JT808PlatformResult.成功, - MsgNum = request.Header.MsgNum - })); - } - - /// - /// 位置信息汇报 - /// - /// - /// - public byte[] Msg0x0200(JT808HeaderPackage request) - { - return JT808Serializer.Serialize(JT808MsgId.平台通用应答.Create(request.Header.TerminalPhoneNo, new JT808_0x8001() - { - AckMsgId = request.Header.MsgId, - JT808PlatformResult = JT808PlatformResult.成功, - MsgNum = request.Header.MsgNum - })); - } - - /// - /// 定位数据批量上传 - /// - /// - /// - public byte[] Msg0x0704(JT808HeaderPackage request) - { - return JT808Serializer.Serialize(JT808MsgId.平台通用应答.Create(request.Header.TerminalPhoneNo, new JT808_0x8001() - { - AckMsgId = request.Header.MsgId, - JT808PlatformResult = JT808PlatformResult.成功, - MsgNum = request.Header.MsgNum - })); - } - - /// - /// 数据上行透传 - /// - /// - /// - public byte[] Msg0x0900(JT808HeaderPackage request) - { - return JT808Serializer.Serialize(JT808MsgId.平台通用应答.Create(request.Header.TerminalPhoneNo, new JT808_0x8001() - { - AckMsgId = request.Header.MsgId, - JT808PlatformResult = JT808PlatformResult.成功, - MsgNum = request.Header.MsgNum - })); - } - } -} diff --git a/src/JT808.Gateway/JT808.Gateway.csproj b/src/JT808.Gateway/JT808.Gateway.csproj index 608880b..c6c4da1 100644 --- a/src/JT808.Gateway/JT808.Gateway.csproj +++ b/src/JT808.Gateway/JT808.Gateway.csproj @@ -21,10 +21,9 @@ - - + + - diff --git a/src/JT808.Gateway/JT808GatewayExtensions.cs b/src/JT808.Gateway/JT808GatewayExtensions.cs index 5bb885a..884a3e7 100644 --- a/src/JT808.Gateway/JT808GatewayExtensions.cs +++ b/src/JT808.Gateway/JT808GatewayExtensions.cs @@ -16,14 +16,6 @@ namespace JT808.Gateway { public static partial class JT808GatewayExtensions { - public static IJT808GatewayBuilder AddJT808DevelopmentGateway(this IJT808Builder jt808Builder) - { - IJT808GatewayBuilder server = new JT808GatewayBuilderDefault(jt808Builder); - server.JT808Builder.Services.TryAddSingleton(); - server.AddJT808Core(); - return server; - } - public static IJT808GatewayBuilder AddJT808Gateway(this IJT808Builder jt808Builder,Action config) { IJT808GatewayBuilder server = new JT808GatewayBuilderDefault(jt808Builder); @@ -63,10 +55,7 @@ namespace JT808.Gateway private static IJT808GatewayBuilder AddJT808Core(this IJT808GatewayBuilder config) { config.JT808Builder.Services.TryAddSingleton(); - config.JT808Builder.Services.TryAddSingleton(); - config.JT808Builder.Services.TryAddSingleton(); config.JT808Builder.Services.TryAddSingleton(); - config.JT808Builder.Services.TryAddSingleton(); config.JT808Builder.Services.AddHostedService(); return config; } diff --git a/src/JT808.Gateway/JT808GrpcServer.cs b/src/JT808.Gateway/JT808GrpcServer.cs index e430873..121f3e5 100644 --- a/src/JT808.Gateway/JT808GrpcServer.cs +++ b/src/JT808.Gateway/JT808GrpcServer.cs @@ -7,6 +7,7 @@ using JT808.Gateway.GrpcService; using JT808.Gateway.Services; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; namespace JT808.Gateway { @@ -18,11 +19,11 @@ namespace JT808.Gateway private Server server; public JT808GrpcServer( IServiceProvider serviceProvider, - JT808Configuration jT808Configuration, + IOptions jT808ConfigurationAccessor, ILoggerFactory loggerFactory) { Logger = loggerFactory.CreateLogger("JT808GrpcServer"); - Configuration = jT808Configuration; + Configuration = jT808ConfigurationAccessor.Value; ServiceProvider = serviceProvider; } diff --git a/src/JT808.Gateway/JT808TcpServer.cs b/src/JT808.Gateway/JT808TcpServer.cs index 5d0d1e6..e4fdd99 100644 --- a/src/JT808.Gateway/JT808TcpServer.cs +++ b/src/JT808.Gateway/JT808TcpServer.cs @@ -10,7 +10,6 @@ using System.Threading.Tasks; using JT808.Gateway.Abstractions; using JT808.Gateway.Abstractions.Enums; using JT808.Gateway.Configurations; -using JT808.Gateway.Enums; using JT808.Gateway.Services; using JT808.Gateway.Session; using JT808.Protocol; @@ -18,6 +17,7 @@ using JT808.Protocol.Exceptions; using JT808.Protocol.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; namespace JT808.Gateway { @@ -38,7 +38,7 @@ namespace JT808.Gateway private readonly JT808Configuration Configuration; public JT808TcpServer( - JT808Configuration jT808Configuration, + IOptions jT808ConfigurationAccessor, IJT808Config jT808Config, ILoggerFactory loggerFactory, JT808SessionManager jT808SessionManager, @@ -50,14 +50,14 @@ namespace JT808.Gateway Serializer = jT808Config.GetSerializer(); MsgProducer = jT808MsgProducer; AtomicCounterService = jT808AtomicCounterServiceFactory.Create(JT808TransportProtocolType.tcp); - Configuration = jT808Configuration; - var IPEndPoint = new System.Net.IPEndPoint(IPAddress.Any, jT808Configuration.TcpPort); + Configuration = jT808ConfigurationAccessor.Value; + var IPEndPoint = new System.Net.IPEndPoint(IPAddress.Any, Configuration.TcpPort); server = new Socket(IPEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp); server.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.NoDelay, true); server.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true); server.LingerState = new LingerOption(false, 0); server.Bind(IPEndPoint); - server.Listen(jT808Configuration.SoBacklog); + server.Listen(Configuration.SoBacklog); } public Task StartAsync(CancellationToken cancellationToken) @@ -106,6 +106,11 @@ namespace JT808.Gateway Logger.LogError($"[Receive Timeout]:{session.Client.RemoteEndPoint}"); break; } + catch (System.Net.Sockets.SocketException ex) + { + Logger.LogError($"[{ex.SocketErrorCode.ToString()},{ex.Message}]:{session.Client.RemoteEndPoint}"); + break; + } catch (Exception ex) { Logger.LogError(ex, $"[Receive Error]:{session.Client.RemoteEndPoint}"); @@ -174,16 +179,8 @@ namespace JT808.Gateway AtomicCounterService.MsgSuccessIncrement(); if (Logger.IsEnabled(LogLevel.Debug)) Logger.LogDebug($"[Atomic Success Counter]:{AtomicCounterService.MsgSuccessCount}"); if (Logger.IsEnabled(LogLevel.Trace)) Logger.LogTrace($"[Accept Hex {session.Client.RemoteEndPoint}]:{package.OriginalData.ToArray().ToHexString()}"); - //设直连模式和转发模式的会话如何处理 SessionManager.TryLink(package.Header.TerminalPhoneNo, session); - if(Configuration.MessageQueueType == JT808MessageQueueType.InMemory) - { - MsgProducer.ProduceAsync(session.SessionID, package.OriginalData.ToArray()); - } - else - { - MsgProducer.ProduceAsync(package.Header.TerminalPhoneNo, package.OriginalData.ToArray()); - } + MsgProducer.ProduceAsync(package.Header.TerminalPhoneNo, package.OriginalData.ToArray()); } catch (JT808Exception ex) { diff --git a/src/JT808.Gateway/JT808UdpServer.cs b/src/JT808.Gateway/JT808UdpServer.cs index 749bcb0..a99e753 100644 --- a/src/JT808.Gateway/JT808UdpServer.cs +++ b/src/JT808.Gateway/JT808UdpServer.cs @@ -10,7 +10,6 @@ using System.Threading.Tasks; using JT808.Gateway.Abstractions; using JT808.Gateway.Abstractions.Enums; using JT808.Gateway.Configurations; -using JT808.Gateway.Enums; using JT808.Gateway.Services; using JT808.Gateway.Session; using JT808.Protocol; @@ -18,6 +17,7 @@ using JT808.Protocol.Exceptions; using JT808.Protocol.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; namespace JT808.Gateway { @@ -40,7 +40,7 @@ namespace JT808.Gateway private IPEndPoint LocalIPEndPoint; public JT808UdpServer( - JT808Configuration jT808Configuration, + IOptions jT808ConfigurationAccessor, IJT808Config jT808Config, ILoggerFactory loggerFactory, JT808SessionManager jT808SessionManager, @@ -52,8 +52,8 @@ namespace JT808.Gateway Serializer = jT808Config.GetSerializer(); MsgProducer = jT808MsgProducer; AtomicCounterService = jT808AtomicCounterServiceFactory.Create(JT808TransportProtocolType.udp); - Configuration = jT808Configuration; - LocalIPEndPoint = new System.Net.IPEndPoint(IPAddress.Any, jT808Configuration.UdpPort); + Configuration = jT808ConfigurationAccessor.Value; + LocalIPEndPoint = new System.Net.IPEndPoint(IPAddress.Any, Configuration.UdpPort); server = new Socket(LocalIPEndPoint.AddressFamily, SocketType.Dgram, ProtocolType.Udp); server.Bind(LocalIPEndPoint); } @@ -95,20 +95,12 @@ namespace JT808.Gateway AtomicCounterService.MsgSuccessIncrement(); if (Logger.IsEnabled(LogLevel.Debug)) Logger.LogDebug($"[Atomic Success Counter]:{AtomicCounterService.MsgSuccessCount}"); if (Logger.IsEnabled(LogLevel.Trace)) Logger.LogTrace($"[Accept Hex {receiveMessageFromResult.RemoteEndPoint}]:{package.OriginalData.ToArray().ToHexString()}"); - //设直连模式和转发模式的会话如何处理 string sessionId= SessionManager.TryLink(package.Header.TerminalPhoneNo, socket, receiveMessageFromResult.RemoteEndPoint); if (Logger.IsEnabled(LogLevel.Information)) { Logger.LogInformation($"[Connected]:{receiveMessageFromResult.RemoteEndPoint}"); } - if (Configuration.MessageQueueType == JT808MessageQueueType.InMemory) - { - MsgProducer.ProduceAsync(sessionId, package.OriginalData.ToArray()); - } - else - { - MsgProducer.ProduceAsync(package.Header.TerminalPhoneNo, package.OriginalData.ToArray()); - } + MsgProducer.ProduceAsync(package.Header.TerminalPhoneNo, package.OriginalData.ToArray()); } catch (JT808Exception ex) { diff --git a/src/JT808.Gateway/Services/JT808MsgReplyHostedService.cs b/src/JT808.Gateway/Services/JT808MsgReplyHostedService.cs index d163715..3d5ed4f 100644 --- a/src/JT808.Gateway/Services/JT808MsgReplyHostedService.cs +++ b/src/JT808.Gateway/Services/JT808MsgReplyHostedService.cs @@ -1,11 +1,7 @@ using JT808.Gateway.Abstractions; using JT808.Gateway.Configurations; -using JT808.Gateway.Enums; using JT808.Gateway.Session; using Microsoft.Extensions.Hosting; -using System; -using System.Collections.Generic; -using System.Text; using System.Threading; using System.Threading.Tasks; @@ -16,36 +12,27 @@ namespace JT808.Gateway.Services private readonly JT808SessionManager JT808SessionManager; private readonly IJT808MsgReplyConsumer JT808MsgReplyConsumer; - private readonly JT808Configuration Configuration; public JT808MsgReplyHostedService( - JT808Configuration jT808Configuration, IJT808MsgReplyConsumer jT808MsgReplyConsumer, JT808SessionManager jT808SessionManager) { JT808MsgReplyConsumer = jT808MsgReplyConsumer; JT808SessionManager = jT808SessionManager; - Configuration = jT808Configuration; } public Task StartAsync(CancellationToken cancellationToken) { - if(Configuration.MessageQueueType== JT808MessageQueueType.InMemory) + JT808MsgReplyConsumer.OnMessage(item => { - JT808MsgReplyConsumer.OnMessage(item => - { - JT808SessionManager.TrySendBySessionId(item.TerminalNo, item.Data); - }); - JT808MsgReplyConsumer.Subscribe(); - } + JT808SessionManager.TrySendByTerminalPhoneNo(item.TerminalNo, item.Data); + }); + JT808MsgReplyConsumer.Subscribe(); return Task.CompletedTask; } public Task StopAsync(CancellationToken cancellationToken) { - if (Configuration.MessageQueueType == JT808MessageQueueType.InMemory) - { - JT808MsgReplyConsumer.Unsubscribe(); - } + JT808MsgReplyConsumer.Unsubscribe(); return Task.CompletedTask; } } diff --git a/src/JT808.Gateway/Services/JT808TcpReceiveTimeoutHostedService.cs b/src/JT808.Gateway/Services/JT808TcpReceiveTimeoutHostedService.cs index 8fdda8c..0d9cb89 100644 --- a/src/JT808.Gateway/Services/JT808TcpReceiveTimeoutHostedService.cs +++ b/src/JT808.Gateway/Services/JT808TcpReceiveTimeoutHostedService.cs @@ -2,6 +2,7 @@ using JT808.Gateway.Session; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using System; using System.Collections.Generic; using System.Text; @@ -18,14 +19,14 @@ namespace JT808.Gateway.Services private readonly JT808Configuration Configuration; public JT808TcpReceiveTimeoutHostedService( - JT808Configuration jT808Configuration, + IOptions jT808ConfigurationAccessor, ILoggerFactory loggerFactory, JT808SessionManager jT808SessionManager ) { SessionManager = jT808SessionManager; Logger = loggerFactory.CreateLogger("JT808TcpReceiveTimeout"); - Configuration = jT808Configuration; + Configuration = jT808ConfigurationAccessor.Value; } protected override async Task ExecuteAsync(CancellationToken stoppingToken) diff --git a/src/JT808.Gateway/Services/JT808UdpReceiveTimeoutHostedService.cs b/src/JT808.Gateway/Services/JT808UdpReceiveTimeoutHostedService.cs index 3f04f30..b969dd5 100644 --- a/src/JT808.Gateway/Services/JT808UdpReceiveTimeoutHostedService.cs +++ b/src/JT808.Gateway/Services/JT808UdpReceiveTimeoutHostedService.cs @@ -2,6 +2,7 @@ using JT808.Gateway.Session; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using System; using System.Collections.Generic; using System.Text; @@ -18,14 +19,14 @@ namespace JT808.Gateway.Services private readonly JT808Configuration Configuration; public JT808UdpReceiveTimeoutHostedService( - JT808Configuration jT808Configuration, + IOptions jT808ConfigurationAccessor, ILoggerFactory loggerFactory, JT808SessionManager jT808SessionManager ) { SessionManager = jT808SessionManager; Logger = loggerFactory.CreateLogger("JT808UdpReceiveTimeout"); - Configuration = jT808Configuration; + Configuration = jT808ConfigurationAccessor.Value; } protected override async Task ExecuteAsync(CancellationToken stoppingToken)