fix: 兼容2种日志输出

Author: jianxuanbing

framework/src/Bing.Logging.Sinks.Exceptionless/Bing.Logging.Sinks.Exceptionless.csproj

@@ -4,4 +4,8 @@
   <Import Project="project.dependency.props" />
 
   <Import Project="..\..\..\framework.props" />
+
+  <ItemGroup>
+    <PackageReference Include="Serilog.Sinks.Exceptionless" Version="3.1.5" />
+  </ItemGroup>
 </Project>

modules/admin/src/Bing.Admin/Apis/TestController.cs

@@ -87,8 +87,11 @@ public async Task<IActionResult> TestDisposed()
         [HttpPost("testMessage")]
         public async Task<IActionResult> TestMessageAsync([FromBody] TestMessage request)
         {
-            await MessageEventBus.PublishAsync(new TestMessageEvent1(request));
-            await UnitOfWork.CommitAsync();
+            Log.Info("测试日志消息Begin");
+            await MessageEventBus.PublishAsync(new TestMessageEvent1(request, request.Send));
+            if (request.NeedCommit)
+                await UnitOfWork.CommitAsync();
+            Log.Info("测试日志消息End");
             return Success();
         }
 

modules/admin/src/Bing.Admin/Bing.Admin.csproj

@@ -22,10 +22,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\framework\src\Bing.Logging.Serilog\Bing.Logging.Serilog.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Bing.Logging.Sinks.Exceptionless\Bing.Logging.Sinks.Exceptionless.csproj" />
     <ProjectReference Include="..\Bing.Admin.Data.EFCore\Bing.Admin.Data.EFCore.csproj" />
     <ProjectReference Include="..\Bing.Admin.EventHandlers\Bing.Admin.EventHandlers.csproj" />
     <ProjectReference Include="..\Bing.Admin.Service\Bing.Admin.Service.csproj" />
   </ItemGroup>
 
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+
 </Project>
 

modules/admin/src/Bing.Admin/Modules/AppModule.cs

@@ -45,6 +45,7 @@ public override IServiceCollection AddServices(IServiceCollection services)
                     o.Filters.Add<BingExceptionFilter>();
                     o.Conventions.Add(new AuthorizeControllerModelConvention());
                 })
+                .AddControllersAsServices()// 解决属性注入无法在控制器中注入的问题
                 .AddNewtonsoftJson(options =>
                 {
                     options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";

modules/admin/src/Bing.Admin/Modules/LogModule.cs

@@ -1,9 +1,12 @@
 using System.ComponentModel;
 using Bing.AspNetCore;
 using Bing.Core.Modularity;
-using Bing.Logs.Exceptionless;
+using Bing.Logging.Serilog;
 using Bing.Logs.NLog;
+using Exceptionless;
 using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using serilog = Serilog;
 
 namespace Bing.Admin.Modules
 {
@@ -24,19 +27,36 @@ public class LogModule : AspNetCoreBingModule
         /// 级别默认为0，表示无依赖，需要在同级别有依赖顺序的时候，再重写为>0的顺序值
         /// </summary>
         public override int Order => 0;
-
+        
         /// <summary>
         /// 添加服务。将模块服务添加到依赖注入服务容器中
         /// </summary>
         /// <param name="services">服务集合</param>
         public override IServiceCollection AddServices(IServiceCollection services)
         {
             //services.AddNLog();
-            services.AddExceptionless(o =>
+            // 同时输出2种方式的日志，可能存在重复 需要陆续兼容
+            Logs.Exceptionless.Extensions.AddExceptionless(services, o =>
             {
                 o.ApiKey = "ez9jumyxVxjTxqSm0oUQhCML3OGCkDfMGyW1hfmn";
                 o.ServerUrl = "http://10.186.132.40:5100";
             });
+            //ExceptionlessClient.Default.Configuration.ApiKey= "ez9jumyxVxjTxqSm0oUQhCML3OGCkDfMGyW1hfmn";
+            //ExceptionlessClient.Default.Configuration.ServerUrl = "http://10.186.132.40:5100";
+            //ExceptionlessClient.Default.Startup();
+            services.AddLogging(loggingBuilder =>
+            {
+                var configuration = services.GetConfiguration();
+                serilog.Log.Logger = new serilog.LoggerConfiguration()
+                    .Enrich.FromLogContext()
+                    .Enrich.WithLogContext()
+                    .Enrich.WithLogLevel()
+                    .WriteTo.Exceptionless()
+                    .ReadFrom.Configuration(configuration)
+                    .ConfigLogLevel(configuration)
+                    .CreateLogger();
+                loggingBuilder.AddSerilog();
+            });
             return services;
         }
     }

modules/admin/src/Bing.Admin/appsettings.json

@@ -16,8 +16,29 @@
   "Logging": {
     "LogLevel": {
       "Default": "Debug",
-      "Microsoft": "Warning" 
+      "Microsoft": "Warning"
     }
   },
+  "Serilog": {
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "d:\\bing.admin\\log.txt",
+          "rollingInterval": "Day",
+          "rollOnFileSizeLimit": true,
+          "fileSizeLimitBytes": 102400,
+          "retainedFileCountLimit": 10,
+          "outputTemplate": "{LogLevel}: {TraceId}  >>  [{SourceContext}] [{Timestamp:yyyy-MM-dd HH:mm:ss.fff}] [{Duration}]{NewLine}{Message}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "Seq",
+        "Args": {
+          "serverUrl": "http://seq.a.com:5341"
+        }
+      }
+    ]
+  },
   "AllowedHosts": "*"
 }