From 87b05014959d2e109bb6c9e2b196b98a50d24686 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, 10 May 2022 07:21:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=BB=98=E8=AE=A4=E6=9F=A5=E8=AF=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Controllers/System/TasksLogController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs index 867ba3d..2fef913 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs @@ -34,8 +34,8 @@ namespace ZR.Admin.WebApi.Controllers.System public IActionResult GetList([FromQuery] PagerInfo pager, [FromQuery] TasksLogQueryDto queryDto) { //开始拼装查询条件 - queryDto.BeginTime = DateTimeHelper.GetBeginTime(queryDto.BeginTime, -1); - queryDto.EndTime = DateTimeHelper.GetBeginTime(queryDto.EndTime, 1); + queryDto.BeginTime = DateTimeHelper.GetBeginTime(queryDto.BeginTime, -7); + queryDto.EndTime = DateTimeHelper.GetBeginTime(queryDto.EndTime, 7); var predicate = Expressionable.Create().And(it => it.CreateTime >= queryDto.BeginTime && it.CreateTime <= queryDto.EndTime); predicate = predicate.AndIF(queryDto.JobName.IfNotEmpty(), m => m.JobName.Contains(queryDto.JobName)); From d7ee352f3aa7ef66f29c0f338c425dde1e6a84ea 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, 10 May 2022 08:17:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Controllers/System/TasksController.cs | 4 ++++ ZR.Model/System/Dto/TasksDto.cs | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index 754eef6..933dd7c 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -95,6 +95,10 @@ namespace ZR.Admin.WebApi.Controllers { throw new CustomException($"地址不能为空"); } + if (parm.TaskType == 1 && (parm.AssemblyName.IsEmpty() || parm.ClassName.IsEmpty())) + { + throw new CustomException($"程序集或者类名不能为空"); + } //从 Dto 映射到 实体 var tasksQz = parm.Adapt().ToCreate(); var worker = new IdWorker(1, 1); diff --git a/ZR.Model/System/Dto/TasksDto.cs b/ZR.Model/System/Dto/TasksDto.cs index 9b0d9a9..198f439 100644 --- a/ZR.Model/System/Dto/TasksDto.cs +++ b/ZR.Model/System/Dto/TasksDto.cs @@ -53,7 +53,7 @@ namespace ZR.Model.System.Dto /// 默认 : /// [Display(Name = "程序集名称")] - [Required(ErrorMessage = "程序集名称不能为空")] + //[Required(ErrorMessage = "程序集名称不能为空")] public string AssemblyName { get; set; } /// @@ -62,7 +62,7 @@ namespace ZR.Model.System.Dto /// 默认 : /// [Display(Name = "任务所在类")] - [Required(ErrorMessage = "任务所在类不能为空")] + //[Required(ErrorMessage = "任务所在类不能为空")] public string ClassName { get; set; } /// From 7cec15db34823b12a9d699bf68d760bf4c90d455 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, 10 May 2022 11:18:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8Capi=E8=AF=B7=E6=B1=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Controllers/System/TasksController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index 933dd7c..0f34da6 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -111,7 +111,7 @@ namespace ZR.Admin.WebApi.Controllers if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2) { tasksQz.AssemblyName = "ZR.Tasks"; - tasksQz.ClassName = "TaskScheduler.HttpResultfulJob"; + tasksQz.ClassName = "TaskScheduler.Job_HttpRequest"; } return SUCCESS(_tasksQzService.Add(tasksQz)); } @@ -146,7 +146,7 @@ namespace ZR.Admin.WebApi.Controllers if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2) { parm.AssemblyName = "ZR.Tasks"; - parm.ClassName = "TaskScheduler.HttpResultfulJob"; + parm.ClassName = "TaskScheduler.Job_HttpRequest"; } if (tasksQz.IsStart) { From ac277c92300479c0ef5575190d8e3d8b98b4c91f 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, 10 May 2022 11:18:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8Capi=E8=AF=B7=E6=B1=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/System/TasksController.cs | 4 ++-- ZR.Tasks/TaskScheduler/Job_HttpRequest.cs | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index 933dd7c..0f34da6 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -111,7 +111,7 @@ namespace ZR.Admin.WebApi.Controllers if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2) { tasksQz.AssemblyName = "ZR.Tasks"; - tasksQz.ClassName = "TaskScheduler.HttpResultfulJob"; + tasksQz.ClassName = "TaskScheduler.Job_HttpRequest"; } return SUCCESS(_tasksQzService.Add(tasksQz)); } @@ -146,7 +146,7 @@ namespace ZR.Admin.WebApi.Controllers if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2) { parm.AssemblyName = "ZR.Tasks"; - parm.ClassName = "TaskScheduler.HttpResultfulJob"; + parm.ClassName = "TaskScheduler.Job_HttpRequest"; } if (tasksQz.IsStart) { diff --git a/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs b/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs index b65a9ad..7778ed2 100644 --- a/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs +++ b/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs @@ -3,11 +3,15 @@ using Infrastructure.Attribute; using Quartz; using Quartz.Impl; using Quartz.Impl.Triggers; +using System; using System.Threading.Tasks; using ZR.Service.System.IService; namespace ZR.Tasks.TaskScheduler { + /// + /// 定时任务http请求 + /// [AppService(ServiceType = typeof(Job_HttpRequest), ServiceLifetime = LifeTime.Scoped)] internal class Job_HttpRequest : JobBase, IJob { @@ -25,9 +29,11 @@ namespace ZR.Tasks.TaskScheduler { AbstractTrigger trigger = (context as JobExecutionContextImpl).Trigger as AbstractTrigger; var info = await tasksQzService.GetByIdAsync(trigger.Name); - - var result = await HttpHelper.HttpPostAsync("http://" + info.ApiUrl, info.JobParams); - //Console.WriteLine(result); + if (info != null) + { + var result = await HttpHelper.HttpGetAsync("http://" + info.ApiUrl); + Console.WriteLine(result); + } } } } From 4bbaa9d029a8d5f96921de2ce51ef03dae9e17a3 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, 10 May 2022 13:27:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E8=BF=87=E9=95=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs | 2 +- ZR.Service/System/SysOperLogService.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs b/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs index edd7fe9..db875f8 100644 --- a/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs +++ b/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs @@ -93,6 +93,7 @@ namespace ZR.Admin.WebApi.Middleware operLocation = ip_info.Province + " " + ip_info.City, operTime = DateTime.Now }; + HttpContextExtension.GetRequestValue(context, sysOperLog); var endpoint = GetEndpoint(context); if (endpoint != null) { @@ -105,7 +106,6 @@ namespace ZR.Admin.WebApi.Middleware sysOperLog.jsonResult = logAttribute.IsSaveResponseData ? sysOperLog.jsonResult : ""; } } - HttpContextExtension.GetRequestValue(context, sysOperLog); LogEventInfo ei = new(logLevel, "GlobalExceptionMiddleware", error); ei.Exception = ex; diff --git a/ZR.Service/System/SysOperLogService.cs b/ZR.Service/System/SysOperLogService.cs index c4636a8..c17ed66 100644 --- a/ZR.Service/System/SysOperLogService.cs +++ b/ZR.Service/System/SysOperLogService.cs @@ -27,6 +27,10 @@ namespace ZR.Service.System /// 日志对象 public void InsertOperlog(SysOperLog operLog) { + if (operLog.operParam.Length >= 1000) + { + operLog.operParam = operLog.operParam.Substring(0, 1000); + } sysOperLogRepository.AddSysOperLog(operLog); }