From 6ef95816d550e1edec2029f5d85bf569549c8537 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 7 Apr 2021 14:18:18 +0800
Subject: [PATCH] update
Former-commit-id: f97bf3a862d3e834d0828a9bfa6fdc16d7a1dd88
Former-commit-id: 2316a6317a2aad4e23e0a1eed81fb7f274bae0ed
---
projects/Platform/Platform.csproj | 2 ++
projects/Platform/Program.cs | 15 ++++++---------
projects/Platform/Views/Shared/_Menu.cshtml | 2 +-
projects/Platform/Views/Shared/_TopMenu.cshtml | 2 +-
projects/Platform/appsettings.json | 2 +-
publish/src/linux-x64/publish/docker-compose.yml | 2 +-
6 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/projects/Platform/Platform.csproj b/projects/Platform/Platform.csproj
index 40804fc9..c1b5f42f 100644
--- a/projects/Platform/Platform.csproj
+++ b/projects/Platform/Platform.csproj
@@ -5,11 +5,13 @@
true
true
1.1.1.1
+ Linux
+
diff --git a/projects/Platform/Program.cs b/projects/Platform/Program.cs
index c446f999..e24696c5 100644
--- a/projects/Platform/Program.cs
+++ b/projects/Platform/Program.cs
@@ -18,18 +18,15 @@ namespace Platform
Console.OutputEncoding = Encoding.UTF8;
var config = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
- .AddJsonFile("appsettings.json", optional: true)
+ .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+ .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json", optional: true, reloadOnChange: true)
.Build();
- var logConfig = new LoggerConfiguration()
+ Log.Logger = new LoggerConfiguration()
.ReadFrom.Configuration(config, ConfigurationAssemblySource.AlwaysScanDllFiles)
- .WriteTo.Console();
-
- logConfig = config.GetSection("AppSettings").GetValue("Log", "File") == "File"
- ? logConfig.WriteTo.File("logs/log.txt", rollOnFileSizeLimit: true, fileSizeLimitBytes: 100 * 1024 * 1024, rollingInterval: RollingInterval.Infinite)
- : logConfig.WriteTo.SQLite(Path.Combine(Directory.GetCurrentDirectory(), "log.db"), rollOver: false);
-
- Log.Logger = logConfig.CreateLogger();
+ .WriteTo.Console()
+ //.WriteTo.File("logs/log.txt", rollOnFileSizeLimit: true, fileSizeLimitBytes: 100 * 1024 * 1024, rollingInterval: RollingInterval.Infinite)
+ .CreateLogger();
try
{
diff --git a/projects/Platform/Views/Shared/_Menu.cshtml b/projects/Platform/Views/Shared/_Menu.cshtml
index fc0775fd..5037eb37 100644
--- a/projects/Platform/Views/Shared/_Menu.cshtml
+++ b/projects/Platform/Views/Shared/_Menu.cshtml
@@ -1,6 +1,6 @@