v3.8.2 更新日志：http://www.izhaorui.cn/doc/changelog.html#v3-8-2

Infrastructure/OptionsSetting.cs

@@ -24,6 +24,7 @@ namespace Infrastructure
         public string Password { get; set; }
         public string Smtp { get; set; }
         public int Port { get; set; }
+        public string Signature { get; set; }
     }
     /// <summary>
     /// 上传

ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs

@@ -106,16 +106,18 @@ namespace ZR.Admin.WebApi.Middleware
                     sysOperLog.jsonResult = logAttribute.IsSaveResponseData ? sysOperLog.jsonResult : "";
                 }
             }
-            LogEventInfo ei = new(logLevel, "GlobalExceptionMiddleware", error);
+            LogEventInfo ei = new(logLevel, "GlobalExceptionMiddleware", error)
-
+            {
-            ei.Exception = ex;
+                Exception = ex,
-            ei.Message = error;
+                Message = error
+            };
             ei.Properties["status"] = 1;//走正常返回都是通过走GlobalExceptionFilter不通过
             ei.Properties["jsonResult"] = responseResult;
             ei.Properties["requestParam"] = sysOperLog.operParam;
             ei.Properties["user"] = HttpContextExtension.GetName(context);
 
             Logger.Log(ei);
+            context.Response.ContentType = "text/json;charset=utf-8";
             await context.Response.WriteAsync(responseResult, System.Text.Encoding.UTF8);
 
             SysOperLogService.InsertOperlog(sysOperLog);

ZR.Admin.WebApi/appsettings.json

@@ -47,7 +47,8 @@
     "Password": "123456",
     //协议
     "Smtp": "smtp.qq.com",
-    "Port": 587
+    "Port": 587,
+    "Signature": "系统邮件，请勿回复！"
   },
   //redis服务配置
   "RedisServer": {

ZR.CodeGenerator/ZR.CodeGenerator.csproj

@@ -12,6 +12,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="JinianNet.JNTemplate" Version="2.3.0" />
-    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.9" />
+		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.9.1" />
 	</ItemGroup>
 </Project>

ZR.Common/MailHelper.cs

@@ -27,10 +27,13 @@ namespace ZR.Common
         /// </summary>
         public int Port { get; set; } = 587;
         /// <summary>
+        /// 邮件签名
+        /// </summary>
+        public string Signature { get; set; }
+        /// <summary>
         /// 是否使用SSL协议
         /// </summary>
         public bool UseSsl { get; set; } = false;
-        public string mailSign = @"邮件来自C# 程序发送";
         private readonly MailOptions mailOptions = new();
 
         public MailHelper()
@@ -56,7 +59,7 @@ namespace ZR.Common
         }
 
         /// <summary>
-        /// 发送一个人
+        /// 发送一个
         /// </summary>
         /// <param name="toAddress"></param>
         /// <param name="subject"></param>
@@ -105,7 +108,7 @@ namespace ZR.Common
             //收件人
             message.To.AddRange(toAddress);
             message.Subject = subject;
-            //message.Date = DateTime.Now;
+            message.Date = DateTime.Now;
             
             //创建附件Multipart
             Multipart multipart = new Multipart("mixed");
@@ -120,14 +123,14 @@ namespace ZR.Common
                 alternative.Add(Html);
             }
             //文本内容
-            if (!string.IsNullOrEmpty(text))
+            //if (!string.IsNullOrEmpty(text))
-            {
+            //{
             var plain = new TextPart(TextFormat.Plain)
             {
-                    Text = text + "\r\n\n\n" + mailSign
+                Text = text + "\r\n\n\n" + mailOptions.Signature
             };
             alternative.Add(plain);
-            }
+            //}
 
             //附件
             if (!string.IsNullOrEmpty(path))

ZR.Common/ZR.Common.csproj

@@ -8,7 +8,7 @@
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
 		<PackageReference Include="CSRedisCore" Version="3.6.9" />
 		<PackageReference Include="EPPlus" Version="6.0.4" />
-    <PackageReference Include="MailKit" Version="3.1.1" />
+		<PackageReference Include="MailKit" Version="3.3.0" />
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
 	</ItemGroup>
 

ZR.Model/ZR.Model.csproj

@@ -7,7 +7,7 @@
 	<ItemGroup>
 		<PackageReference Include="EPPlus" Version="6.0.4" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.9" />
+		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.9.1" />
 		<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
 	</ItemGroup>
 

ZR.Repository/ZR.Repository.csproj

@@ -14,7 +14,7 @@
 		<PackageReference Include="MySql.Data" Version="8.0.29" />
 		<PackageReference Include="NETCore.Encrypt" Version="2.1.0" />
 		<PackageReference Include="SqlSugar.IOC" Version="1.8.0" />
-    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.9" />
+		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.9.1" />
 	</ItemGroup>
 
 	<ItemGroup>

ZR.Tasks/TaskScheduler/Job_HttpRequest.cs

@@ -16,6 +16,7 @@ namespace ZR.Tasks.TaskScheduler
     internal class Job_HttpRequest : JobBase, IJob
     {
         private readonly ISysTasksQzService tasksQzService;
+        private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
 
         public Job_HttpRequest(ISysTasksQzService tasksQzService)
         {
@@ -32,7 +33,11 @@ namespace ZR.Tasks.TaskScheduler
             if (info != null)
             {
                 var result = await HttpHelper.HttpGetAsync("http://" + info.ApiUrl);
-                Console.WriteLine(result);
+                logger.Info($"任务【{info.Name}】网络请求执行结果=" + result);
+            }
+            else
+            {
+                throw new CustomException("任务网络请求执行失败，任务不存在");
             }
         }
     }