diff --git a/protocols/JiShe.CollectBus.Protocol.T1882018/JiSheCollectBusProtocolT1882018Module.cs b/protocols/JiShe.CollectBus.Protocol.T1882018/JiSheCollectBusProtocolT1882018Module.cs index b2f1471..4a5aec8 100644 --- a/protocols/JiShe.CollectBus.Protocol.T1882018/JiSheCollectBusProtocolT1882018Module.cs +++ b/protocols/JiShe.CollectBus.Protocol.T1882018/JiSheCollectBusProtocolT1882018Module.cs @@ -17,14 +17,14 @@ namespace JiShe.CollectBus.Protocol public override async Task OnApplicationInitializationAsync(ApplicationInitializationContext context) { - Console.WriteLine("StandardProtocolPlugin OnApplicationInitializationAsync"); + Console.WriteLine($"{nameof(T1882018ProtocolPlugin)} OnApplicationInitializationAsync"); var standardProtocol = context.ServiceProvider.GetRequiredKeyedService(nameof(T1882018ProtocolPlugin)); await standardProtocol.LoadAsync(); } public override void OnApplicationShutdown(ApplicationShutdownContext context) { - Console.WriteLine("StandardProtocolPlugin OnApplicationShutdown"); + Console.WriteLine($"{nameof(T1882018ProtocolPlugin)} OnApplicationShutdown"); base.OnApplicationShutdown(context); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T1882018/T1882018ProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.T1882018/T1882018ProtocolPlugin.cs index b94c841..ad6e15c 100644 --- a/protocols/JiShe.CollectBus.Protocol.T1882018/T1882018ProtocolPlugin.cs +++ b/protocols/JiShe.CollectBus.Protocol.T1882018/T1882018ProtocolPlugin.cs @@ -44,7 +44,7 @@ namespace JiShe.CollectBus.Protocol T188ControlHandlers = Telemetry1882018PacketBuilder.T1882018ControlHandlers; } - public sealed override ProtocolInfo Info => new(nameof(T1882018ProtocolPlugin), "376.1/188", "TCP", "376.1协议", "DTS1980"); + public sealed override ProtocolInfo Info => new(nameof(T1882018ProtocolPlugin), "376.1/188-2018", "TCP", "376.1/188-2018协议", "HJ-LXS-15 DN15"); public override async Task AnalyzeAsync(ITcpSessionClient client, string messageReceived, Action? sendAction = null) { diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/CollectBusProtocolT37612012Module.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/CollectBusProtocolT37612012Module.cs index a53107c..f3e24f7 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/CollectBusProtocolT37612012Module.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/CollectBusProtocolT37612012Module.cs @@ -18,14 +18,14 @@ namespace JiShe.CollectBus.Protocol.Contracts public override async Task OnApplicationInitializationAsync(ApplicationInitializationContext context) { - Console.WriteLine("StandardProtocolPlugin OnApplicationInitializationAsync"); + Console.WriteLine($"{nameof(T37612012ProtocolPlugin)} OnApplicationInitializationAsync"); var standardProtocol = context.ServiceProvider.GetRequiredKeyedService(nameof(T37612012ProtocolPlugin)); await standardProtocol.LoadAsync(); } public override void OnApplicationShutdown(ApplicationShutdownContext context) { - Console.WriteLine("StandardProtocolPlugin OnApplicationShutdown"); + Console.WriteLine($"{nameof(T37612012ProtocolPlugin)} OnApplicationShutdown"); base.OnApplicationShutdown(context); } diff --git a/protocols/JiShe.CollectBus.Protocol.T6452007/JiSheCollectBusProtocolT6452007Module.cs b/protocols/JiShe.CollectBus.Protocol.T6452007/JiSheCollectBusProtocolT6452007Module.cs index 826ae1e..cbd7422 100644 --- a/protocols/JiShe.CollectBus.Protocol.T6452007/JiSheCollectBusProtocolT6452007Module.cs +++ b/protocols/JiShe.CollectBus.Protocol.T6452007/JiSheCollectBusProtocolT6452007Module.cs @@ -11,33 +11,19 @@ namespace JiShe.CollectBus.Protocol public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddKeyedSingleton(nameof(T6452007ProtocolPlugin)); - //RegisterProtocolAnalysis(context.Services); - LoadAnalysisStrategy(context.Services); } public override async Task OnApplicationInitializationAsync(ApplicationInitializationContext context) { - Console.WriteLine("StandardProtocolPlugin OnApplicationInitializationAsync"); + Console.WriteLine($"{nameof(T6452007ProtocolPlugin)} OnApplicationInitializationAsync"); var standardProtocol = context.ServiceProvider.GetRequiredKeyedService(nameof(T6452007ProtocolPlugin)); await standardProtocol.LoadAsync(); } public override void OnApplicationShutdown(ApplicationShutdownContext context) { - Console.WriteLine("StandardProtocolPlugin OnApplicationShutdown"); + Console.WriteLine($"{nameof(T6452007ProtocolPlugin)} OnApplicationShutdown"); base.OnApplicationShutdown(context); } - - public void LoadAnalysisStrategy(IServiceCollection services) - { - var assembly = Assembly.GetExecutingAssembly(); - var analysisStrategyTypes = assembly.GetTypes().Where(t => !t.IsAbstract && !t.IsInterface && t.GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IAnalysisStrategy<,>))); - foreach (var analysisStrategyType in analysisStrategyTypes) - { - var service = analysisStrategyType.GetInterfaces().First(); - services.AddKeyedSingleton(service, analysisStrategyType.Name,analysisStrategyType); - } - } - } } diff --git a/protocols/JiShe.CollectBus.Protocol.T6452007/T6452007ProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.T6452007/T6452007ProtocolPlugin.cs index d3b6070..8d04a87 100644 --- a/protocols/JiShe.CollectBus.Protocol.T6452007/T6452007ProtocolPlugin.cs +++ b/protocols/JiShe.CollectBus.Protocol.T6452007/T6452007ProtocolPlugin.cs @@ -42,7 +42,7 @@ namespace JiShe.CollectBus.Protocol T645ControlHandlers = Telemetry6452007PacketBuilder.T645ControlHandlers; } - public sealed override ProtocolInfo Info => new(nameof(T6452007ProtocolPlugin), "376.1", "TCP", "376.1协议", "DTS1980"); + public sealed override ProtocolInfo Info => new(nameof(T6452007ProtocolPlugin), "376.1/645-2007", "TCP", "376.1/645-2007协议", "DTS1980"); public override async Task AnalyzeAsync(ITcpSessionClient client, string messageReceived, Action? sendAction = null) {