From 568e774d80e11dce63eb84fe3d72feb57aae1fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 20 Dec 2022 16:06:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Extensions/DbExtension.cs   | 2 +-
 ZR.Admin.WebApi/Extensions/LogoExtension.cs | 4 ++--
 ZR.Admin.WebApi/NLog.config                 | 2 +-
 ZR.Common/JnHelper.cs                       | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ZR.Admin.WebApi/Extensions/DbExtension.cs b/ZR.Admin.WebApi/Extensions/DbExtension.cs
index 4476620..2540410 100644
--- a/ZR.Admin.WebApi/Extensions/DbExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/DbExtension.cs
@@ -62,7 +62,7 @@ namespace ZR.Admin.WebApi.Extensions
             string configId = config.ConfigId;
             db.GetConnectionScope(configId).Aop.OnLogExecuting = (sql, pars) =>
             {
-                string log = $"【sql语句】{UtilMethods.GetSqlString(config.DbType, sql, pars)}\n";
+                string log = $"【db{configId} SQL语句】{UtilMethods.GetSqlString(config.DbType, sql, pars)}\n";
                 if (sql.StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
                     logger.Info(log);
                 if (sql.StartsWith("UPDATE", StringComparison.OrdinalIgnoreCase) || sql.StartsWith("INSERT", StringComparison.OrdinalIgnoreCase))
diff --git a/ZR.Admin.WebApi/Extensions/LogoExtension.cs b/ZR.Admin.WebApi/Extensions/LogoExtension.cs
index 27f2126..46f7ddd 100644
--- a/ZR.Admin.WebApi/Extensions/LogoExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/LogoExtension.cs
@@ -11,10 +11,10 @@ namespace ZR.Admin.WebApi.Extensions
         {
             Console.ForegroundColor = ConsoleColor.Blue;
             var contentTpl = JnHelper.ReadTemplate("", "logo.txt");
-            var content = contentTpl.Render();
+            var content = contentTpl?.Render();
 
             Console.WriteLine(content);
-            Console.ForegroundColor = ConsoleColor.Red;
+            Console.ForegroundColor = ConsoleColor.Blue;
             Console.WriteLine("源码地址: https://gitee.com/izory/ZrAdminNetCore");
             Console.WriteLine("官方文档：http://www.izhaorui.cn/doc");
             Console.WriteLine("打赏作者：http://www.izhaorui.cn/doc/support.html");
diff --git a/ZR.Admin.WebApi/NLog.config b/ZR.Admin.WebApi/NLog.config
index 8350280..f52f6b3 100644
--- a/ZR.Admin.WebApi/NLog.config
+++ b/ZR.Admin.WebApi/NLog.config
@@ -51,7 +51,7 @@
 			<highlight-row condition="level == LogLevel.Warn" foregroundColor="Yellow" />
 			<highlight-row condition="level == LogLevel.Error" foregroundColor="Red" />
 			<highlight-row condition="level == LogLevel.Fatal" foregroundColor="Red" backgroundColor="White" />
-			<highlight-word regex="sql语句" foregroundColor="Red" />
+			<highlight-word regex="SQL语句" foregroundColor="Blue" />
 		</target>
 
 		<target name="console" xsi:type="ColoredConsole"
diff --git a/ZR.Common/JnHelper.cs b/ZR.Common/JnHelper.cs
index c0a3b28..85e326b 100644
--- a/ZR.Common/JnHelper.cs
+++ b/ZR.Common/JnHelper.cs
@@ -20,6 +20,8 @@ namespace ZR.Common
             {
                 return Engine.LoadTemplate(fullName);
             }
+            Console.ForegroundColor = ConsoleColor.Red;
+            Console.WriteLine($"未找到路径{fullName}");
             return null;
         }
     }