From e21f1ceafd275f08908e7eca80e31a2c13259396 Mon Sep 17 00:00:00 2001 From: smallchi <564952747@qq.com> Date: Fri, 30 Aug 2019 17:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=B8=E9=87=8F=E5=90=8D?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=B8=8E808=E5=B8=B8=E9=87=8F=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{JT808Constants.cs => JT808NettyConstants.cs} | 2 +- .../Impls/JT808MsgProducerDefaultImpl.cs | 2 +- .../Impls/JT808MsgReplyConsumerDefaultImpl.cs | 3 +-- .../Session/JT808SessionManager.cs | 10 +++++----- .../JT808DotNettyWebApiTest.cs | 2 +- .../Handlers/JT808MsgIdDefaultWebApiHandler.cs | 12 ++++++------ 6 files changed, 15 insertions(+), 16 deletions(-) rename src/JT808.DotNetty.Abstractions/{JT808Constants.cs => JT808NettyConstants.cs} (97%) diff --git a/src/JT808.DotNetty.Abstractions/JT808Constants.cs b/src/JT808.DotNetty.Abstractions/JT808NettyConstants.cs similarity index 97% rename from src/JT808.DotNetty.Abstractions/JT808Constants.cs rename to src/JT808.DotNetty.Abstractions/JT808NettyConstants.cs index 5b1ad3b..cb98506 100644 --- a/src/JT808.DotNetty.Abstractions/JT808Constants.cs +++ b/src/JT808.DotNetty.Abstractions/JT808NettyConstants.cs @@ -1,6 +1,6 @@ namespace JT808.DotNetty.Abstractions { - public static class JT808Constants + public static class JT808NettyConstants { public const string SessionOnline= "JT808SessionOnline"; diff --git a/src/JT808.DotNetty.Core/Impls/JT808MsgProducerDefaultImpl.cs b/src/JT808.DotNetty.Core/Impls/JT808MsgProducerDefaultImpl.cs index 5f2cde1..38dfa7c 100644 --- a/src/JT808.DotNetty.Core/Impls/JT808MsgProducerDefaultImpl.cs +++ b/src/JT808.DotNetty.Core/Impls/JT808MsgProducerDefaultImpl.cs @@ -10,7 +10,7 @@ namespace JT808.DotNetty.Core.Impls internal class JT808MsgProducerDefaultImpl : IJT808MsgProducer { private readonly JT808MsgService JT808MsgService; - public string TopicName => JT808Constants.MsgTopic; + public string TopicName => JT808NettyConstants.MsgTopic; public JT808MsgProducerDefaultImpl(JT808MsgService jT808MsgService) { JT808MsgService = jT808MsgService; diff --git a/src/JT808.DotNetty.Core/Impls/JT808MsgReplyConsumerDefaultImpl.cs b/src/JT808.DotNetty.Core/Impls/JT808MsgReplyConsumerDefaultImpl.cs index a5d05f4..6b97be3 100644 --- a/src/JT808.DotNetty.Core/Impls/JT808MsgReplyConsumerDefaultImpl.cs +++ b/src/JT808.DotNetty.Core/Impls/JT808MsgReplyConsumerDefaultImpl.cs @@ -9,7 +9,6 @@ using System.Collections.Generic; using System.Text; using System.Threading; using System.Threading.Tasks; -using JT808Constants = JT808.DotNetty.Abstractions.JT808Constants; namespace JT808.DotNetty.Core.Impls { @@ -37,7 +36,7 @@ namespace JT808.DotNetty.Core.Impls } public CancellationTokenSource Cts =>new CancellationTokenSource(); - public string TopicName => JT808Constants.MsgReplyTopic; + public string TopicName => JT808NettyConstants.MsgReplyTopic; public void Dispose() { diff --git a/src/JT808.DotNetty.Core/Session/JT808SessionManager.cs b/src/JT808.DotNetty.Core/Session/JT808SessionManager.cs index b9d7770..729c4a8 100644 --- a/src/JT808.DotNetty.Core/Session/JT808SessionManager.cs +++ b/src/JT808.DotNetty.Core/Session/JT808SessionManager.cs @@ -200,7 +200,7 @@ namespace JT808.DotNetty.Core.Session //部标的超长待机设备,不会像正常的设备一样一直连着，可能10几分钟连上了，然后发完就关闭连接， //这时候想下发数据需要知道设备什么时候上线，在这边做通知最好不过了。 //有设备关联上来可以进行通知 例如：使用Redis发布订阅 - JT808SessionPublishing.PublishAsync(JT808Constants.SessionOnline, jT808TcpSession.TerminalPhoneNo); + JT808SessionPublishing.PublishAsync(JT808NettyConstants.SessionOnline, jT808TcpSession.TerminalPhoneNo); } } } @@ -230,7 +230,7 @@ namespace JT808.DotNetty.Core.Session //移动很多卡，存储的那个socket地址端口，有效期非常短 //不速度快点下发，那个socket地址端口就可能映射到别的对应卡去了 //所以此处采用跟随设备消息下发指令 - JT808SessionPublishing.PublishAsync(JT808Constants.SessionOnline, terminalPhoneNo); + JT808SessionPublishing.PublishAsync(JT808NettyConstants.SessionOnline, terminalPhoneNo); } public IJT808Session RemoveSession(string terminalPhoneNo) { @@ -254,7 +254,7 @@ namespace JT808.DotNetty.Core.Session } string nos = string.Join(",", terminalPhoneNos); logger.LogInformation($">>>{terminalPhoneNo}-{nos} 1-n Session Remove."); - JT808SessionPublishing.PublishAsync(JT808Constants.SessionOffline, nos); + JT808SessionPublishing.PublishAsync(JT808NettyConstants.SessionOffline, nos); return jT808Session; } else @@ -262,7 +262,7 @@ namespace JT808.DotNetty.Core.Session if (Sessions.TryRemove(terminalPhoneNo, out IJT808Session jT808SessionRemove)) { logger.LogInformation($">>>{terminalPhoneNo} Session Remove."); - JT808SessionPublishing.PublishAsync(JT808Constants.SessionOffline, terminalPhoneNo); + JT808SessionPublishing.PublishAsync(JT808NettyConstants.SessionOffline, terminalPhoneNo); return jT808SessionRemove; } else @@ -284,7 +284,7 @@ namespace JT808.DotNetty.Core.Session } string nos = string.Join(",", terminalPhoneNos); logger.LogInformation($">>>{nos} Channel Remove."); - JT808SessionPublishing.PublishAsync(JT808Constants.SessionOffline, nos); + JT808SessionPublishing.PublishAsync(JT808NettyConstants.SessionOffline, nos); } } public IEnumerable GetAll() diff --git a/src/JT808.DotNetty.Tests/JT808.DotNetty.WebApi.Test/JT808DotNettyWebApiTest.cs b/src/JT808.DotNetty.Tests/JT808.DotNetty.WebApi.Test/JT808DotNettyWebApiTest.cs index 3ef93bd..c0bf1eb 100644 --- a/src/JT808.DotNetty.Tests/JT808.DotNetty.WebApi.Test/JT808DotNettyWebApiTest.cs +++ b/src/JT808.DotNetty.Tests/JT808.DotNetty.WebApi.Test/JT808DotNettyWebApiTest.cs @@ -16,7 +16,7 @@ namespace JT808.DotNetty.WebApi.Test { HttpApi.Register().ConfigureHttpApiConfig(c => { - c.HttpHost = new Uri("http://127.0.0.1:12828" + JT808Constants.JT808WebApiRouteTable.RouteTablePrefix + "/"); + c.HttpHost = new Uri("http://127.0.0.1:12828" + JT808NettyConstants.JT808WebApiRouteTable.RouteTablePrefix + "/"); c.LoggerFactory = new LoggerFactory(); }); var api = HttpApi.Resolve(); diff --git a/src/JT808.DotNetty.WebApi/Handlers/JT808MsgIdDefaultWebApiHandler.cs b/src/JT808.DotNetty.WebApi/Handlers/JT808MsgIdDefaultWebApiHandler.cs index 927fe67..8c7ac70 100644 --- a/src/JT808.DotNetty.WebApi/Handlers/JT808MsgIdDefaultWebApiHandler.cs +++ b/src/JT808.DotNetty.WebApi/Handlers/JT808MsgIdDefaultWebApiHandler.cs @@ -127,22 +127,22 @@ namespace JT808.DotNetty.WebApi.Handlers protected virtual void InitCommontRoute() { - CreateRoute(JT808Constants.JT808WebApiRouteTable.UnificationSend, UnificationSend); - CreateRoute(JT808Constants.JT808WebApiRouteTable.SessionRemoveByTerminalPhoneNo, RemoveSessionByTerminalPhoneNo); + CreateRoute(JT808NettyConstants.JT808WebApiRouteTable.UnificationSend, UnificationSend); + CreateRoute(JT808NettyConstants.JT808WebApiRouteTable.SessionRemoveByTerminalPhoneNo, RemoveSessionByTerminalPhoneNo); } protected virtual void InitTcpRoute() { - CreateRoute(JT808Constants.JT808WebApiRouteTable.GetTcpAtomicCounter, GetTcpAtomicCounter); - CreateRoute(JT808Constants.JT808WebApiRouteTable.SessionTcpGetAll, GetTcpSessionAll); + CreateRoute(JT808NettyConstants.JT808WebApiRouteTable.GetTcpAtomicCounter, GetTcpAtomicCounter); + CreateRoute(JT808NettyConstants.JT808WebApiRouteTable.SessionTcpGetAll, GetTcpSessionAll); } protected virtual void InitUdpRoute() { - CreateRoute(JT808Constants.JT808WebApiRouteTable.GetUdpAtomicCounter, GetUdpAtomicCounter); - CreateRoute(JT808Constants.JT808WebApiRouteTable.SessionUdpGetAll, GetUdpSessionAll); + CreateRoute(JT808NettyConstants.JT808WebApiRouteTable.GetUdpAtomicCounter, GetUdpAtomicCounter); + CreateRoute(JT808NettyConstants.JT808WebApiRouteTable.SessionUdpGetAll, GetUdpSessionAll); } } }