From 2fa7d89c7a4d7c357dfe8c3639c2bc4b9172ecac Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Fri, 5 Jul 2024 14:00:52 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E5=A4=A9=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TyrpAgentModule.cs                        |  2 +-
 .../AgentModule.cs                            |  2 +-
 .../Program.cs                                | 28 ++++++++-----
 .../Win_in.Sfs.Wms.DataExchange.Agent.csproj  |  2 +
 .../serilogsettings.json                      | 39 +++++++++++++++++++
 5 files changed, 61 insertions(+), 12 deletions(-)
 create mode 100644 be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/serilogsettings.json

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/TyrpAgentModule.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/TyrpAgentModule.cs
index 7903cbfe5..68fa6573a 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/TyrpAgentModule.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/TyrpAgentModule.cs
@@ -173,7 +173,7 @@ public class TyrpAgentModule : AbpModule
     {
 
         context.AddBackgroundWorkerAsync<TyrpIncomingBackgroundWorker>();
-        context.AddBackgroundWorkerAsync<TyrpOutgoingBackgroundWorker>();
+        //context.AddBackgroundWorkerAsync<TyrpOutgoingBackgroundWorker>();
     }
 
 }
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs
index 28aa02cc5..59cf323ef 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs
@@ -150,6 +150,6 @@ public class AgentModule : AbpModule
              ApplicationInitializationContext context)
     {
         context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
-        context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
+       // context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
     }
 }
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Program.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Program.cs
index f8458799e..f9e6bd999 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Program.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
@@ -11,18 +12,25 @@ public class Program
 {
     public static async Task<int> Main(string[] args)
     {
+        //        Log.Logger = new LoggerConfiguration()
+        //#if DEBUG
+        //            .MinimumLevel.Debug()
+        //#else
+        //            .MinimumLevel.Information()
+        //#endif
+        //            .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+        //            .Enrich.FromLogContext()
+        //            .WriteTo.Async(c => c.File("Logs/logs.txt"))
+        //            .WriteTo.Async(c => c.Console())
+        //            .CreateLogger();
+        IConfigurationRoot configuration =
+            new ConfigurationBuilder()
+                .AddJsonFile("serilogsettings.json", false, true)
+                .Build();
+
         Log.Logger = new LoggerConfiguration()
-#if DEBUG
-            .MinimumLevel.Debug()
-#else
-            .MinimumLevel.Information()
-#endif
-            .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
-            .Enrich.FromLogContext()
-            .WriteTo.Async(c => c.File("Logs/logs.txt"))
-            .WriteTo.Async(c => c.Console())
+            .ReadFrom.Configuration(configuration)
             .CreateLogger();
-
         try
         {
             Log.Information("Starting console host.");
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Win_in.Sfs.Wms.DataExchange.Agent.csproj b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Win_in.Sfs.Wms.DataExchange.Agent.csproj
index 484c87c87..321251d4b 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Win_in.Sfs.Wms.DataExchange.Agent.csproj
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Win_in.Sfs.Wms.DataExchange.Agent.csproj
@@ -11,10 +11,12 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.12" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.*" />
 		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.12" />
+		<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
 		<PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
 		<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
 		<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+		<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
 		<PackageReference Include="Volo.Abp.Autofac" Version="6.0.2" />
 		<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="5.3.5" />
 		<PackageReference Include="Volo.Abp.BackgroundJobs" Version="5.3.5" />
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/serilogsettings.json b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/serilogsettings.json
new file mode 100644
index 000000000..228c61a68
--- /dev/null
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/serilogsettings.json
@@ -0,0 +1,39 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File", "Serilog.Sinks.Async", "Serilog.Sinks.Console", "Serilog.Sinks.MSSqlServer" ],
+    "MinimumLevel": {
+      "Default": "Debug",
+      "Override": {
+        "Microsoft": "Information",
+        "Microsoft.EntityFrameworkCore": "Warning"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "Async",
+        "Args": {
+          "configure": [
+            {
+              "Name": "File",
+              "Args": {
+                "path": "..//Logs//WmsAgent//WmsAgent_.log",
+                "rollingInterval": "Day",
+                "fileSizeLimitBytes": "52428800",
+                "rollOnFileSizeLimit": "true",
+                "restrictedToMinimumLevel": "Debug"
+              }
+            }
+          ]
+        }
+      },
+      {
+        "Name": "Console",
+        "Args": {
+          "restrictedToMinimumLevel": "Debug",
+          "outputTemplate": "{Timestamp:HH:mm:ss.fff} [{Level:u3}] {Message}  {NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId" ]
+  }
+}