Merge pull request #238 from K-Society/develop

Develop
K-Society · Oct 12, 2023 · 5b89fbf · 5b89fbf
2 parents adac789 + d7778ce
commit 5b89fbf
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 56 deletions.
diff --git a/Visual Studio 2022/Visualizers/attribcache140.bin b/Visual Studio 2022/Visualizers/attribcache140.bin
diff --git a/src/01/02/Host/KSociety.Log.Srv.Host/AutoMapperProfile/DataProfile.cs b/src/01/02/Host/KSociety.Log.Srv.Host/AutoMapperProfile/DataProfile.cs
@@ -1,14 +1,14 @@
-namespace KSociety.Log.Srv.Host.AutoMapperProfile
-{
-    using AutoMapper;
-    using KSociety.Log.App.Dto.Req.Biz;
-    using KSociety.Log.Biz.Event;
+//namespace KSociety.Log.Srv.Host.AutoMapperProfile
+//{
+//    using AutoMapper;
+//    using KSociety.Log.App.Dto.Req.Biz;
+//    using KSociety.Log.Biz.Event;
 
-    public class DataProfile : Profile
-    {
-        public DataProfile()
-        {
-            this.CreateMap<WriteLog, WriteLogEvent>();
-        }
-    }
-}
+//    public class DataProfile : Profile
+//    {
+//        public DataProfile()
+//        {
+//            this.CreateMap<WriteLog, WriteLogEvent>();
+//        }
+//    }
+//}
diff --git a/src/01/02/Host/KSociety.Log.Srv.Host/KSociety.Log.Srv.Host.csproj b/src/01/02/Host/KSociety.Log.Srv.Host/KSociety.Log.Srv.Host.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.1.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="KSociety.Base.Srv.Host.Shared" Version="1.2.57" />
+    <PackageReference Include="KSociety.Base.Srv.Host.Shared" Version="1.3.4" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
     <PackageReference Include="protobuf-net.Grpc.AspNetCore" Version="1.1.1" />

diff --git a/src/01/02/Host/KSociety.Log.Srv.Host/Startup.cs b/src/01/02/Host/KSociety.Log.Srv.Host/Startup.cs
@@ -1,4 +1,4 @@
-namespace KSociety.Log.Srv.Host
+namespace KSociety.Log.Srv.Host
 {
     using Autofac;
     using KSociety.Base.EventBus;
@@ -67,8 +67,8 @@ public void ConfigureContainer(ContainerBuilder builder)
                 builder.RegisterModule(new KSociety.Base.Srv.Host.Shared.Bindings.Log());
 
                 //AutoMapper.
-                builder.RegisterModule(
-                    new KSociety.Base.Srv.Host.Shared.Bindings.AutoMapper(AssemblyTool.GetAssembly()));
+                //builder.RegisterModule(
+                //    new KSociety.Base.Srv.Host.Shared.Bindings.AutoMapper(AssemblyTool.GetAssembly()));
 
                 //CommandHdlr.
                 builder.RegisterModule(new CommandHdlr(AssemblyTool.GetAssembly()));
@@ -155,4 +155,4 @@ private static void OnStopped()
             Console.WriteLine(@"OnStopped: ");
         }
     }
-}
+}
diff --git a/src/01/02/KSociety.Log.Srv.Agent/KSociety.Log.Srv.Agent.csproj b/src/01/02/KSociety.Log.Srv.Agent/KSociety.Log.Srv.Agent.csproj
@@ -4,11 +4,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KSociety.Base.Srv.Agent" Version="1.2.57" />
+    <PackageReference Include="KSociety.Base.Srv.Agent" Version="1.3.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/01/02/KSociety.Log.Srv.Behavior/KSociety.Log.Srv.Behavior.csproj b/src/01/02/KSociety.Log.Srv.Behavior/KSociety.Log.Srv.Behavior.csproj
@@ -4,11 +4,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KSociety.Base.Srv.Shared" Version="1.2.57" />
+    <PackageReference Include="KSociety.Base.Srv.Shared" Version="1.3.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/01/02/KSociety.Log.Srv.Contract/KSociety.Log.Srv.Contract.csproj b/src/01/02/KSociety.Log.Srv.Contract/KSociety.Log.Srv.Contract.csproj
@@ -4,7 +4,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/01/02/KSociety.Log.Srv.Dto/KSociety.Log.Srv.Dto.csproj b/src/01/02/KSociety.Log.Srv.Dto/KSociety.Log.Srv.Dto.csproj
@@ -4,7 +4,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/01/03/KSociety.Log.App.Dto/KSociety.Log.App.Dto.csproj b/src/01/03/KSociety.Log.App.Dto/KSociety.Log.App.Dto.csproj
@@ -4,11 +4,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	  <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KSociety.Base.App.Shared" Version="1.2.57" />
+    <PackageReference Include="KSociety.Base.App.Shared" Version="1.3.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogReqHdlr.cs b/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogReqHdlr.cs
@@ -1,9 +1,8 @@
-namespace KSociety.Log.App.ReqHdlr.Biz
+namespace KSociety.Log.App.ReqHdlr.Biz
 {
     using System;
     using System.Threading;
     using System.Threading.Tasks;
-    using AutoMapper;
     using KSociety.Base.App.Shared;
     using KSociety.Log.App.Dto.Req.Biz;
     using KSociety.Log.Biz.Event;
@@ -17,14 +16,12 @@ public class WriteLogReqHdlr :
         private readonly ILoggerFactory _loggerFactory;
         private readonly ILogger<WriteLogReqHdlr> _logger;
         private readonly IBiz _biz;
-        private readonly IMapper _mapper;
 
-        public WriteLogReqHdlr(ILoggerFactory loggerFactory, IBiz biz, IMapper mapper)
+        public WriteLogReqHdlr(ILoggerFactory loggerFactory, IBiz biz)
         {
             this._loggerFactory = loggerFactory;
             this._logger = this._loggerFactory.CreateLogger<WriteLogReqHdlr>();
             this._biz = biz;
-            this._mapper = mapper;
         }
 
         public Dto.Res.Biz.WriteLog Execute(WriteLog request)
@@ -33,7 +30,7 @@ public Dto.Res.Biz.WriteLog Execute(WriteLog request)
 
             try
             {
-                var message = this._mapper.Map<WriteLogEvent>(request);
+                var message = new WriteLogEvent(request.Message, request.TimeStamp, request.SequenceId, request.Level, request.LoggerName);//this._mapper.Map<WriteLogEvent>(request);
                 this._biz.WriteLog(message);
             }
             catch (Exception ex)
@@ -51,7 +48,7 @@ public Dto.Res.Biz.WriteLog Execute(WriteLog request)
 
             try
             {
-                var message = this._mapper.Map<WriteLogEvent>(request);
+                var message = new WriteLogEvent(request.Message, request.TimeStamp, request.SequenceId, request.Level, request.LoggerName);//this._mapper.Map<WriteLogEvent>(request);
                 await this._biz.WriteLogAsync(message).ConfigureAwait(false);
             }
             catch (Exception ex)
@@ -62,4 +59,4 @@ public Dto.Res.Biz.WriteLog Execute(WriteLog request)
             return output;
         }
     }
-}
+}
diff --git a/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogsReqHdlr.cs b/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogsReqHdlr.cs
@@ -1,10 +1,9 @@
-namespace KSociety.Log.App.ReqHdlr.Biz
+namespace KSociety.Log.App.ReqHdlr.Biz
 {
     using System;
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
-    using AutoMapper;
     using KSociety.Base.App.Shared;
     using KSociety.Log.App.Dto.Req.Biz;
     using KSociety.Log.Biz.Event;
@@ -18,14 +17,12 @@ public class WriteLogsReqHdlr :
         private readonly ILoggerFactory _loggerFactory;
         private readonly ILogger<WriteLogsReqHdlr> _logger;
         private readonly IBiz _biz;
-        private readonly IMapper _mapper;
 
-        public WriteLogsReqHdlr(ILoggerFactory loggerFactory, IBiz biz, IMapper mapper)
+        public WriteLogsReqHdlr(ILoggerFactory loggerFactory, IBiz biz)
         {
             this._loggerFactory = loggerFactory;
             this._logger = this._loggerFactory.CreateLogger<WriteLogsReqHdlr>();
             this._biz = biz;
-            this._mapper = mapper;
         }
 
         public Dto.Res.Biz.WriteLog Execute(Dto.Req.Biz.List.WriteLog request)
@@ -34,7 +31,7 @@ public Dto.Res.Biz.WriteLog Execute(Dto.Req.Biz.List.WriteLog request)
 
             try
             {
-                var list = request.List.Select(message => this._mapper.Map<WriteLogEvent>(message)).ToList();
+                var list = request.List.Select(message => new WriteLogEvent(message.Message, message.TimeStamp, message.SequenceId, message.Level, message.LoggerName) /*this._mapper.Map<WriteLogEvent>(message)*/).ToList();
                 this._biz.WriteLogs(list);
             }
             catch (Exception ex)
@@ -52,7 +49,7 @@ public Dto.Res.Biz.WriteLog Execute(Dto.Req.Biz.List.WriteLog request)
 
             try
             {
-                var list = request.List.Select(message => this._mapper.Map<WriteLogEvent>(message)).ToList();
+                var list = request.List.Select(message => new WriteLogEvent(message.Message, message.TimeStamp, message.SequenceId, message.Level, message.LoggerName)).ToList();
                 await this._biz.WriteLogsAsync(list).ConfigureAwait(false);
             }
             catch (Exception ex)
@@ -63,4 +60,4 @@ public Dto.Res.Biz.WriteLog Execute(Dto.Req.Biz.List.WriteLog request)
             return output;
         }
     }
-}
+}
diff --git a/src/01/03/KSociety.Log.App.ReqHdlr/KSociety.Log.App.ReqHdlr.csproj b/src/01/03/KSociety.Log.App.ReqHdlr/KSociety.Log.App.ReqHdlr.csproj
@@ -4,13 +4,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	  <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="12.0.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\04\KSociety.Log.Biz\KSociety.Log.Biz.csproj" />
     <ProjectReference Include="..\KSociety.Log.App.Dto\KSociety.Log.App.Dto.csproj" />

diff --git a/src/01/04/KSociety.Log.Biz.Event/KSociety.Log.Biz.Event.csproj b/src/01/04/KSociety.Log.Biz.Event/KSociety.Log.Biz.Event.csproj
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright © K-Society and contributors. All rights reserved. Licensed under the K-Society License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KSociety.Base.EventBus" Version="1.2.57" />
+    <PackageReference Include="KSociety.Base.EventBus" Version="1.3.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/01/04/KSociety.Log.Biz/KSociety.Log.Biz.csproj b/src/01/04/KSociety.Log.Biz/KSociety.Log.Biz.csproj
@@ -4,11 +4,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	  <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KSociety.Base.EventBusRabbitMQ" Version="1.2.57" />
+    <PackageReference Include="KSociety.Base.EventBusRabbitMQ" Version="1.3.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/KSociety.Log.Serilog.Sinks.RabbitMq.csproj b/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/KSociety.Log.Serilog.Sinks.RabbitMq.csproj
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright © K-Society and contributors. All rights reserved. Licensed under the K-Society License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	  <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KSociety.Base.EventBusRabbitMQ" Version="1.2.57" />
+    <PackageReference Include="KSociety.Base.EventBusRabbitMQ" Version="1.3.4" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Serilog" Version="3.0.1" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />

diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/Sinks/RabbitMq/RabbitMqBatchedSink.cs b/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/Sinks/RabbitMq/RabbitMqBatchedSink.cs
@@ -1,4 +1,4 @@
-namespace KSociety.Log.Serilog.Sinks.RabbitMq.Sinks.RabbitMq
+namespace KSociety.Log.Serilog.Sinks.RabbitMq.Sinks.RabbitMq
 {
     using KSociety.Base.EventBus;
     using KSociety.Base.EventBus.Abstractions.EventBus;
@@ -47,13 +47,20 @@ RabbitMqSinkConfiguration rabbitMqSinkConfiguration
 
         public void Initialize()
         {
-            this._eventBus = new Lazy<IEventBusTyped>(new EventBusRabbitMqTyped(
+            this._eventBus = new Lazy<IEventBusTyped>(this.GetEventBusTyped);
+            this._eventBus.Value.Initialize();
+        }
+
+        private IEventBusTyped GetEventBusTyped()
+        {
+            var eventBus = new EventBusRabbitMqTyped(
                 this._persistentConnection,
                 this._loggerFactory,
                 null,
                 this._eventBusParameters,
-                "LogQueueDriver"));
-            this._eventBus.Value.Initialize();
+                "LogQueueDriver");
+
+            return eventBus;
         }
 
         public async Task EmitBatchAsync(IEnumerable<LogEvent> batch)
@@ -84,4 +91,4 @@ public Task OnEmptyBatchAsync()
             return Task.CompletedTask;
         }
     }
-}
+}
diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR/KSociety.Log.Serilog.Sinks.SignalR.csproj b/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR/KSociety.Log.Serilog.Sinks.SignalR.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.12" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
     <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="3.1.0" />
   </ItemGroup>