From f89d8c2dc4416a2bbd1f0c83e8584e10c0f00e5a Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Wed, 25 Oct 2023 16:02:16 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=97=A5=E5=BF=97=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ems.CollectService.Common/NLog.config             | 8 ++++----
 Ems.CollectService.SqlSugarCore/SqlSugarHelper.cs | 2 +-
 Ems.CollectService.sln                            | 8 +-------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Ems.CollectService.Common/NLog.config b/Ems.CollectService.Common/NLog.config
index 7ce6fdd..82564fb 100644
--- a/Ems.CollectService.Common/NLog.config
+++ b/Ems.CollectService.Common/NLog.config
@@ -39,7 +39,7 @@
     <default-target-parameters xsi:type="File" createDirs="true" keepFileOpen="true" autoFlush="false" openFileFlushTimeout="10" openFileCacheTimeout="30" archiveAboveSize="52428800"
 								   archiveNumbering="Sequence" concurrentWrites="true" encoding="UTF-8" />
     <!-- 输出到文件,这个文件记录错误日志 -->
-    <target xsi:type="File" name="Error" fileName="Log\${shortdate}\Error.txt"
+    <target xsi:type="File" name="Error" fileName="Log/${shortdate}/Error.txt"
 				layout="
 				【时间】：${date} ${newline}
 				【级别】：${level:uppercase=true} ${newline}
@@ -49,17 +49,17 @@
 				【异常信息】：${exception:format=ToString}${newline}
 				【内容】：${message}${newline}" />
     <!-- 输出到文件,这个文件记录警告日志 -->
-    <target xsi:type="File" name="Warn" fileName="Log\${shortdate}\Warn.txt"
+    <target xsi:type="File" name="Warn" fileName="Log/${shortdate}/Warn.txt"
 					layout="
 				【时间】：${date} ${newline}
 				【内容】：${message}${newline}" />
     <!-- 输出到文件,这个文件记录消息日志 -->
-    <target xsi:type="File" name="Info" fileName="Log\${shortdate}\Info.txt"
+    <target xsi:type="File" name="Info" fileName="Log/${shortdate}/Info.txt"
 						layout="
 				【时间】：${date} ${newline}
 				【内容】：${message}${newline}" />
     <!-- 输出到文件,这个文件记录操作日志 -->
-    <target xsi:type="File" name="Trace" fileName="Log\${shortdate}\Trace.txt"
+    <target xsi:type="File" name="Trace" fileName="Log/${shortdate}/Trace.txt"
 				layout="
 				【时间】：${date} ${newline}
 				【内容】：${message}${newline}" />
diff --git a/Ems.CollectService.SqlSugarCore/SqlSugarHelper.cs b/Ems.CollectService.SqlSugarCore/SqlSugarHelper.cs
index b26ee4d..dfff25c 100644
--- a/Ems.CollectService.SqlSugarCore/SqlSugarHelper.cs
+++ b/Ems.CollectService.SqlSugarCore/SqlSugarHelper.cs
@@ -14,7 +14,7 @@ namespace Ems.CollectService.SqlSugarCore
         
         private static IConfiguration _configuration = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory)
             .AddJsonFile("App.json").Build();
-        
+
         //用单例模式
         public static SqlSugarScope Db = new SqlSugarScope(new ConnectionConfig()
         {
diff --git a/Ems.CollectService.sln b/Ems.CollectService.sln
index 24104ff..f11c4c3 100644
--- a/Ems.CollectService.sln
+++ b/Ems.CollectService.sln
@@ -17,9 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ems.CollectService.Redis",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ems.CollectService.Analysis", "Ems.CollectService.Analysis\Ems.CollectService.Analysis.csproj", "{61813461-23F9-45B7-A002-D058A2610DBB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ems.CollectService.Timer", "Ems.CollectService.Timer\Ems.CollectService.Timer.csproj", "{68E1353B-AF61-4DBA-A956-90BA2D8FE8F5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ems.CollectService.Console", "Ems.CollectService.Console\Ems.CollectService.Console.csproj", "{B1F71EE9-86AA-49F1-BBA9-FBD5132B92F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ems.CollectService.Timer", "Ems.CollectService.Timer\Ems.CollectService.Timer.csproj", "{68E1353B-AF61-4DBA-A956-90BA2D8FE8F5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -59,10 +57,6 @@ Global
 		{68E1353B-AF61-4DBA-A956-90BA2D8FE8F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{68E1353B-AF61-4DBA-A956-90BA2D8FE8F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68E1353B-AF61-4DBA-A956-90BA2D8FE8F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1F71EE9-86AA-49F1-BBA9-FBD5132B92F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1F71EE9-86AA-49F1-BBA9-FBD5132B92F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1F71EE9-86AA-49F1-BBA9-FBD5132B92F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1F71EE9-86AA-49F1-BBA9-FBD5132B92F6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE