wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'net5.0'

Browse Source
This commit is contained in:
不做码农 2022-05-10 13:54:16 +08:00
commit 34be422eef
6 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Admin.WebApi/Controllers/System/TasksController.cs
View File

@ -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<SysTasksQz>().ToCreate();
var worker = new IdWorker(1, 1);
@ -107,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));
}
@ -142,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)
{

4
ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
View File

@ -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<SysTasksLog>().And(it => it.CreateTime >= queryDto.BeginTime && it.CreateTime <= queryDto.EndTime);
predicate = predicate.AndIF(queryDto.JobName.IfNotEmpty(), m => m.JobName.Contains(queryDto.JobName));

2
ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs
View File

@ -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;

4
ZR.Model/System/Dto/TasksDto.cs
View File

@ -53,7 +53,7 @@ namespace ZR.Model.System.Dto
/// 默认 :
/// </summary>
[Display(Name = "程序集名称")]
[Required(ErrorMessage = "程序集名称不能为空")]
//[Required(ErrorMessage = "程序集名称不能为空")]
public string AssemblyName { get; set; }
/// <summary>
@ -62,7 +62,7 @@ namespace ZR.Model.System.Dto
/// 默认 :
/// </summary>
[Display(Name = "任务所在类")]
[Required(ErrorMessage = "任务所在类不能为空")]
//[Required(ErrorMessage = "任务所在类不能为空")]
public string ClassName { get; set; }
/// <summary>

4
ZR.Service/System/SysOperLogService.cs
View File

@ -27,6 +27,10 @@ namespace ZR.Service.System
/// <param name="operLog">日志对象</param>
public void InsertOperlog(SysOperLog operLog)
{
if (operLog.operParam.Length >= 1000)
{
operLog.operParam = operLog.operParam.Substring(0, 1000);
}
sysOperLogRepository.AddSysOperLog(operLog);
}

12
ZR.Tasks/TaskScheduler/Job_HttpRequest.cs
View File

@ -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
{
/// <summary>
/// 定时任务http请求
/// </summary>
[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);
}
}
}
}