ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 定时任务计划相关

Browse Source
This commit is contained in:
ky_yusj
2021-07-15 15:53:11 +08:00
parent 82460caf6a
commit 231e998277
14 changed files with 1452 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Api/Ewide.Core/Const/CommonConst.cs
View File

@@ -35,5 +35,15 @@
/// 区域缓存 /// 区域缓存
/// </summary> /// </summary>
public const string CACHE_AREA_CODE = "areaCode"; public const string CACHE_AREA_CODE = "areaCode";
/// <summary>
/// 所有缓存关键字集合
/// </summary>
public const string CACHE_KEY_ALL = "allkey";
/// <summary>
/// 定时任务缓存
/// </summary>
public const string CACHE_KEY_TIMER_JOB = "timerjob";
} }
} }

35
Api/Ewide.Core/Entity/SysTimer.cs
View File

@@ -1,4 +1,4 @@
using Ewide.Core.Service; using Furion.TaskScheduler;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System; using System;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
@@ -19,12 +19,31 @@ namespace Ewide.Core
[Comment("任务名称")] [Comment("任务名称")]
public string JobName { get; set; } public string JobName { get; set; }
/// <summary>
/// 只执行一次
/// </summary>
[Comment("只执行一次")]
public bool DoOnce { get; set; } = false;
/// <summary> /// <summary>
/// 任务分组 /// 任务分组
/// </summary> /// </summary>
/// <example>ewide</example> /// <example>ewide</example>
[Comment("任务分组")] //[Comment("任务分组")]
public string JobGroup { get; set; } //public string JobGroup { get; set; }
/// <summary>
/// 立即执行（默认等待启动）
/// </summary>
[Comment("立即执行")]
public bool StartNow { get; set; } = false;
// <summary>
/// 执行类型(并行、列队)
/// </summary>
[Comment("执行类型")]
public SpareTimeExecuteTypes ExecuteType { get; set; } = SpareTimeExecuteTypes.Parallel;
/// <summary> /// <summary>
/// 开始时间 /// 开始时间
@@ -63,8 +82,14 @@ namespace Ewide.Core
/// <summary> /// <summary>
/// 触发器类型 /// 触发器类型
/// </summary> /// </summary>
[Comment("触发器类型")] //[Comment("触发器类型")]
public TriggerTypeEnum TriggerType { get; set; } = TriggerTypeEnum.Simple; //public TriggerTypeEnum TriggerType { get; set; } = TriggerTypeEnum.Simple;
/// <summary>
/// 定时器类型
/// </summary>
[Comment("定时器类型")]
public SpareTimeTypes TimerType { get; set; } = SpareTimeTypes.Interval;
/// <summary> /// <summary>
/// 请求url /// 请求url

39
Api/Ewide.Core/Enum/RequestTypeEnum.cs Normal file
View File

@@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Ewide.Core
{
/// <summary>
/// http请求类型
/// </summary>
public enum RequestTypeEnum
{
/// <summary>
/// 执行内部方法
/// </summary>
Run = 0,
/// <summary>
/// GET请求
/// </summary>
Get = 1,
/// <summary>
/// POST请求
/// </summary>
Post = 2,
/// <summary>
/// PUT请求
/// </summary>
Put = 3,
/// <summary>
/// DELETE请求
/// </summary>
Delete = 4
}
}

3
Api/Ewide.Core/Ewide.Core.csproj
View File

@@ -16,6 +16,9 @@
<Compile Remove="OAuth\AuthorizeResult.cs" /> <Compile Remove="OAuth\AuthorizeResult.cs" />
<Compile Remove="OAuth\IUserInfoModel.cs" /> <Compile Remove="OAuth\IUserInfoModel.cs" />
<Compile Remove="OAuth\OAuthLoginBase.cs" /> <Compile Remove="OAuth\OAuthLoginBase.cs" />
<Compile Remove="Service\Timer\HttpJob.cs" />
<Compile Remove="Service\Timer\SchedulerCenter.cs" />
<Compile Remove="Service\Timer\SchedulerDef.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

510
Api/Ewide.Core/Ewide.Core.xml
View File

@@ -308,6 +308,16 @@
区域缓存 区域缓存
</summary> </summary>
</member> </member>
<member name="F:Ewide.Core.CommonConst.CACHE_KEY_ALL">
<summary>
所有缓存关键字集合
</summary>
</member>
<member name="F:Ewide.Core.CommonConst.CACHE_KEY_TIMER_JOB">
<summary>
定时任务缓存
</summary>
</member>
<member name="T:Ewide.Core.Controller.AreaCodeController"> <member name="T:Ewide.Core.Controller.AreaCodeController">
<summary> <summary>
区域代码相关服务 区域代码相关服务
@@ -1617,12 +1627,17 @@
</summary> </summary>
<example>ewide</example> <example>ewide</example>
</member> </member>
<member name="P:Ewide.Core.SysTimer.JobGroup"> <member name="P:Ewide.Core.SysTimer.DoOnce">
<summary> <summary>
任务分组 只执行一次
</summary> </summary>
<example>ewide</example>
</member> </member>
<member name="P:Ewide.Core.SysTimer.StartNow">
<summary>
立即执行（默认等待启动）
</summary>
</member>
<!-- Badly formed XML comment ignored for member "P:Ewide.Core.SysTimer.ExecuteType" -->
<member name="P:Ewide.Core.SysTimer.BeginTime"> <member name="P:Ewide.Core.SysTimer.BeginTime">
<summary> <summary>
开始时间 开始时间
@@ -1652,9 +1667,9 @@
</summary> </summary>
<example>5</example> <example>5</example>
</member> </member>
<member name="P:Ewide.Core.SysTimer.TriggerType"> <member name="P:Ewide.Core.SysTimer.TimerType">
<summary> <summary>
触发器类型 定时器类型
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.SysTimer.RequestUrl"> <member name="P:Ewide.Core.SysTimer.RequestUrl">
@@ -2537,6 +2552,36 @@
结合于 LIKE %Param 结合于 LIKE %Param
</summary> </summary>
</member> </member>
<member name="T:Ewide.Core.RequestTypeEnum">
<summary>
http请求类型
</summary>
</member>
<member name="F:Ewide.Core.RequestTypeEnum.Run">
<summary>
执行内部方法
</summary>
</member>
<member name="F:Ewide.Core.RequestTypeEnum.Get">
<summary>
GET请求
</summary>
</member>
<member name="F:Ewide.Core.RequestTypeEnum.Post">
<summary>
POST请求
</summary>
</member>
<member name="F:Ewide.Core.RequestTypeEnum.Put">
<summary>
PUT请求
</summary>
</member>
<member name="F:Ewide.Core.RequestTypeEnum.Delete">
<summary>
DELETE请求
</summary>
</member>
<member name="T:Ewide.Core.YesOrNot"> <member name="T:Ewide.Core.YesOrNot">
<summary> <summary>
菜单激活类型 菜单激活类型
@@ -3475,6 +3520,13 @@
<param name="key"></param> <param name="key"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Ewide.Core.Service.SysCacheService.Exists(System.String)">
<summary>
检查给定 key 是否存在
</summary>
<param name="cacheKey">键</param>
<returns></returns>
</member>
<member name="T:Ewide.Core.Service.CodeGenConfigService"> <member name="T:Ewide.Core.Service.CodeGenConfigService">
<summary> <summary>
代码生成详细配置服务 代码生成详细配置服务
@@ -6397,92 +6449,198 @@
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:Ewide.Core.Service.JobInput"> <member name="T:Ewide.Core.Service.JobPageInput">
<summary> <summary>
任务调度参数 任务调度参数
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.JobName"> <member name="P:Ewide.Core.Service.JobPageInput.JobName">
<summary> <summary>
任务名称 任务名称
</summary> </summary>
<example>ewide</example>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.JobGroup"> <member name="P:Ewide.Core.Service.JobPageInput.DoOnce">
<summary> <summary>
任务分组 只执行一次
</summary>
<example>ewide</example>
</member>
<member name="P:Ewide.Core.Service.JobInput.BeginTime">
<summary>
开始时间
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.EndTime"> <member name="P:Ewide.Core.Service.JobPageInput.StartNow">
<summary> <summary>
结束时间 立即执行（默认等待启动）
</summary> </summary>
<example>null</example>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.Cron"> <member name="P:Ewide.Core.Service.JobPageInput.ExecuteType">
<summary> <summary>
Cron表达式 执行类型(并行、列队)
</summary> </summary>
<example></example>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.RunNumber"> <member name="P:Ewide.Core.Service.JobPageInput.Interval">
<summary> <summary>
执行次数（默认无限循环） 执行间隔时间（单位秒）
</summary>
<example>10</example>
</member>
<member name="P:Ewide.Core.Service.JobInput.Interval">
<summary>
执行间隔时间，单位秒（如果有Cron，则IntervalSecond失效）
</summary> </summary>
<example>5</example> <example>5</example>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.TriggerType"> <member name="P:Ewide.Core.Service.JobPageInput.Cron">
<summary> <summary>
触发器类型 Cron表达式
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.RequestUrl"> <member name="P:Ewide.Core.Service.JobPageInput.TimerType">
<summary>
定时器类型
</summary>
</member>
<member name="P:Ewide.Core.Service.JobPageInput.RequestUrl">
<summary> <summary>
请求url 请求url
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.RequestParameters"> <member name="P:Ewide.Core.Service.JobPageInput.RequestParameters">
<summary> <summary>
请求参数（Post，Put请求用） 请求参数（Post，Put请求用）
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.Headers"> <member name="P:Ewide.Core.Service.JobPageInput.Headers">
<summary> <summary>
Headers(可以包含如：Authorization授权认证) Headers(可以包含如：Authorization授权认证)
格式：{"Authorization":"userpassword.."} 格式：{"Authorization":"userpassword.."}
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.RequestType"> <member name="P:Ewide.Core.Service.JobPageInput.RequestType">
<summary>
请求类型
</summary>
</member>
<member name="P:Ewide.Core.Service.JobPageInput.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.JobName">
<summary>
任务名称
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.DoOnce">
<summary>
只执行一次
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.StartNow">
<summary>
立即执行（默认等待启动）
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.ExecuteType">
<summary>
执行类型(并行、列队)
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.Interval">
<summary>
执行间隔时间（单位秒）
</summary>
<example>5</example>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.Cron">
<summary>
Cron表达式
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.TimerType">
<summary>
定时器类型
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.RequestUrl">
<summary>
请求url
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.RequestParameters">
<summary>
请求参数（Post，Put请求用）
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.Headers">
<summary>
Headers(可以包含如：Authorization授权认证)
格式：{"Authorization":"userpassword.."}
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.RequestType">
<summary>
请求类型
</summary>
</member>
<member name="P:Ewide.Core.Service.AddJobInput.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.JobName">
<summary>
任务名称
</summary>
<example>dilon</example>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.DoOnce">
<summary>
只执行一次
</summary>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.StartNow">
<summary>
立即执行（默认等待启动）
</summary>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.ExecuteType">
<summary>
执行类型(并行、列队)
</summary>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.Interval">
<summary>
执行间隔时间（单位秒）
</summary>
<example>5</example>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.Cron">
<summary>
Cron表达式
</summary>
<example></example>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.TimerType">
<summary>
定时器类型
</summary>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.RequestUrl">
<summary>
请求url
</summary>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.RequestParameters">
<summary>
请求参数（Post，Put请求用）
</summary>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.Headers">
<summary>
Headers(可以包含如：Authorization授权认证)
格式：{"Authorization":"userpassword.."}
</summary>
</member>
<member name="P:Ewide.Core.Service.UpdateJobInput.RequestType">
<summary> <summary>
请求类型 请求类型
</summary> </summary>
<example>2</example> <example>2</example>
</member> </member>
<member name="P:Ewide.Core.Service.JobInput.Remark"> <member name="P:Ewide.Core.Service.UpdateJobInput.Remark">
<summary> <summary>
描述 备注
</summary>
</member>
<member name="P:Ewide.Core.Service.JobInput.DisplayState">
<summary>
任务状态
</summary>
</member>
<member name="P:Ewide.Core.Service.DeleteJobInput.Id">
<summary>
任务Id
</summary> </summary>
</member> </member>
<member name="T:Ewide.Core.Service.JobOutput"> <member name="T:Ewide.Core.Service.JobOutput">
@@ -6490,226 +6648,141 @@
任务信息---任务详情 任务信息---任务详情
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobOutput.Id">
<summary>
Id
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.RunNumber">
<summary>
已执行次数
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.TimerStatus">
<summary>
定时器状态
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.Exception">
<summary>
异常信息
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.JobName"> <member name="P:Ewide.Core.Service.JobOutput.JobName">
<summary> <summary>
任务名称 任务名称
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobOutput.JobGroup"> <member name="P:Ewide.Core.Service.JobOutput.DoOnce">
<summary> <summary>
任务组名 只执行一次
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobOutput.NextFireTime"> <member name="P:Ewide.Core.Service.JobOutput.StartNow">
<summary> <summary>
下次执行时间 立即执行（默认等待启动）
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobOutput.PreviousFireTime"> <member name="P:Ewide.Core.Service.JobOutput.ExecuteType">
<summary> <summary>
上次执行时间 执行类型(并行、列队)
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.BeginTime">
<summary>
开始时间
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.EndTime">
<summary>
结束时间
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.LastErrMsg">
<summary>
上次执行的异常信息
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.TriggerState">
<summary>
任务状态
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.Remark">
<summary>
描述
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.DisplayState">
<summary>
显示状态
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobOutput.Interval"> <member name="P:Ewide.Core.Service.JobOutput.Interval">
<summary> <summary>
时间间隔 执行间隔时间（单位秒）
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.Cron">
<summary>
Cron表达式
</summary>
</member>
<member name="P:Ewide.Core.Service.JobOutput.TimerType">
<summary>
定时器类型
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobOutput.RequestUrl"> <member name="P:Ewide.Core.Service.JobOutput.RequestUrl">
<summary> <summary>
请求地址 请求url
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.Service.JobOutput.RequestType"> <member name="P:Ewide.Core.Service.JobOutput.RequestType">
<summary> <summary>
请求类型 请求类型
</summary> </summary>
<example>2</example>
</member> </member>
<member name="P:Ewide.Core.Service.JobOutput.RunNumber"> <member name="P:Ewide.Core.Service.JobOutput.Remark">
<summary> <summary>
已经执行的次数 备注
</summary> </summary>
</member> </member>
<member name="T:Ewide.Core.Service.SchedulerCenter"> <member name="T:Ewide.Core.Service.TaskMethodInfo">
<summary> <summary>
任务调度中心 任务方法信息
</summary> </summary>
</member> </member>
<member name="M:Ewide.Core.Service.SchedulerCenter.StartScheduleAsync"> <member name="P:Ewide.Core.Service.TaskMethodInfo.MethodName">
<summary> <summary>
开启调度器 方法名
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.StopScheduleAsync">
<summary>
停止调度器
</summary> </summary>
</member> </member>
<member name="M:Ewide.Core.Service.SchedulerCenter.AddScheduleJobAsync(Ewide.Core.Service.JobInput)"> <member name="P:Ewide.Core.Service.TaskMethodInfo.DeclaringType">
<summary> <summary>
添加一个工作任务 方法所属类的Type对象
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.StopScheduleJobAsync(Ewide.Core.Service.JobInput)">
<summary>
暂停任务
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.DeleteScheduleJobAsync(Ewide.Core.Service.DeleteJobInput)">
<summary>
删除任务
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.ResumeJobAsync(Ewide.Core.Service.JobInput)">
<summary>
恢复运行暂停的任务
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.QueryJobAsync(Ewide.Core.Service.JobInput)">
<summary>
查询任务
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.TriggerJobAsync(Ewide.Core.Service.JobInput)">
<summary>
立即执行
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.GetJobLogsAsync(Ewide.Core.Service.JobInput)">
<summary>
获取任务日志
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.GetRunNumberAsync(Ewide.Core.Service.JobInput)">
<summary>
获取任务运行次数
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.GetJobList">
<summary>
获取所有任务详情
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.InitAllJob">
<summary>
从数据库里面获取所有任务并初始化
</summary> </summary>
</member> </member>
<member name="M:Ewide.Core.Service.SchedulerCenter.CreateSimpleTrigger(Ewide.Core.Service.JobInput)"> <member name="P:Ewide.Core.Service.TaskMethodInfo.JobName">
<summary> <summary>
创建类型Simple的触发器 任务名称
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SchedulerCenter.CreateCronTrigger(Ewide.Core.Service.JobInput)">
<summary>
创建类型Cron的触发器
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="T:Ewide.Core.Service.SchedulerDef">
<summary>
任务调度相关常量
</summary> </summary>
</member> </member>
<member name="F:Ewide.Core.Service.SchedulerDef.REQUESTURL"> <member name="P:Ewide.Core.Service.TaskMethodInfo.DoOnce">
<summary> <summary>
请求url RequestUrl 只执行一次
</summary> </summary>
</member> </member>
<member name="F:Ewide.Core.Service.SchedulerDef.REQUESTPARAMETERS"> <member name="P:Ewide.Core.Service.TaskMethodInfo.StartNow">
<summary> <summary>
请求参数 RequestParameters 立即执行（默认等待启动）
</summary> </summary>
</member> </member>
<member name="F:Ewide.Core.Service.SchedulerDef.HEADERS"> <member name="P:Ewide.Core.Service.TaskMethodInfo.ExecuteType">
<summary> <summary>
Headers（可以包含：Authorization授权认证） 执行类型(并行、列队)
</summary> </summary>
</member> </member>
<member name="F:Ewide.Core.Service.SchedulerDef.REQUESTTYPE"> <member name="P:Ewide.Core.Service.TaskMethodInfo.Interval">
<summary> <summary>
请求类型 RequestType 执行间隔时间（单位秒）
</summary> </summary>
</member> </member>
<member name="F:Ewide.Core.Service.SchedulerDef.LOGLIST"> <member name="P:Ewide.Core.Service.TaskMethodInfo.Cron">
<summary> <summary>
日志 LogList Cron表达式
</summary> </summary>
</member> </member>
<member name="F:Ewide.Core.Service.SchedulerDef.EXCEPTION"> <member name="P:Ewide.Core.Service.TaskMethodInfo.TimerType">
<summary> <summary>
异常 Exception 定时器类型
</summary> </summary>
</member> </member>
<member name="F:Ewide.Core.Service.SchedulerDef.RUNNUMBER"> <member name="P:Ewide.Core.Service.TaskMethodInfo.RequestUrl">
<summary> <summary>
执行次数 请求url
</summary> </summary>
</member> </member>
<member name="F:Ewide.Core.Service.SchedulerDef.ENDAT"> <member name="P:Ewide.Core.Service.TaskMethodInfo.RequestType">
<summary> <summary>
任务结束时间 请求类型
</summary> </summary>
<example>2</example>
</member> </member>
<member name="T:Ewide.Core.Service.RequestTypeEnum"> <member name="P:Ewide.Core.Service.TaskMethodInfo.Remark">
<summary> <summary>
http请求类型 备注
</summary>
</member>
<member name="T:Ewide.Core.Service.TriggerTypeEnum">
<summary>
触发器类型
</summary> </summary>
</member> </member>
<member name="T:Ewide.Core.Service.SysTimerService"> <member name="T:Ewide.Core.Service.SysTimerService">
@@ -6717,28 +6790,34 @@
任务调度服务 任务调度服务
</summary> </summary>
</member> </member>
<member name="M:Ewide.Core.Service.SysTimerService.GetJobPageList(Ewide.Core.Service.JobInput)"> <member name="M:Ewide.Core.Service.SysTimerService.GetTimerPageList(Ewide.Core.Service.JobPageInput)">
<summary> <summary>
分页获取任务列表 分页获取任务列表
</summary> </summary>
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Ewide.Core.Service.SysTimerService.AddJob(Ewide.Core.Service.JobInput)"> <member name="M:Ewide.Core.Service.SysTimerService.GetLocalJobList">
<summary>
获取所有本地任务
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SysTimerService.AddTimer(Ewide.Core.Service.AddJobInput)">
<summary> <summary>
增加任务 增加任务
</summary> </summary>
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Ewide.Core.Service.SysTimerService.DeleteJob(Ewide.Core.Service.DeleteJobInput)"> <member name="M:Ewide.Core.Service.SysTimerService.DeleteTimer(Ewide.Core.Service.DeleteJobInput)">
<summary> <summary>
删除任务 删除任务
</summary> </summary>
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Ewide.Core.Service.SysTimerService.UpdateJob(Ewide.Core.Service.UpdateJobInput)"> <member name="M:Ewide.Core.Service.SysTimerService.UpdateTimber(Ewide.Core.Service.UpdateJobInput)">
<summary> <summary>
修改任务 修改任务
</summary> </summary>
@@ -6752,20 +6831,37 @@
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Ewide.Core.Service.SysTimerService.StopScheduleJobAsync(Ewide.Core.Service.JobInput)"> <member name="M:Ewide.Core.Service.SysTimerService.StopTimerJob(Ewide.Core.Service.StopJobInput)">
<summary> <summary>
停止任务 停止任务
</summary> </summary>
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Ewide.Core.Service.SysTimerService.TriggerJobAsync(Ewide.Core.Service.JobInput)"> <member name="M:Ewide.Core.Service.SysTimerService.StartTimerJob(Ewide.Core.Service.AddJobInput)">
<summary> <summary>
启动任务 启动任务
</summary> </summary>
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Ewide.Core.Service.SysTimerService.AddTimerJob(Ewide.Core.Service.AddJobInput)">
<summary>
新增定时任务
</summary>
<param name="input"></param>
</member>
<member name="M:Ewide.Core.Service.SysTimerService.StartTimerJob">
<summary>
启动自启动任务
</summary>
</member>
<member name="M:Ewide.Core.Service.SysTimerService.GetTaskMethods">
<summary>
获取所有本地任务
</summary>
<returns></returns>
</member>
<member name="T:Ewide.Core.Service.AuthToken"> <member name="T:Ewide.Core.Service.AuthToken">
<summary> <summary>
AuthToken参数 AuthToken参数

1
Api/Ewide.Core/Service/Cache/ISysCacheService.cs
View File

@@ -19,5 +19,6 @@ namespace Ewide.Core.Service
Task<bool> SetAsync(string key, object value); Task<bool> SetAsync(string key, object value);
Task<string> GetAsync(string key); Task<string> GetAsync(string key);
Task<T> GetAsync<T>(string key); Task<T> GetAsync<T>(string key);
bool Exists(string cacheKey);
} }
} }

11
Api/Ewide.Core/Service/Cache/SysCacheService.cs
View File

@@ -174,5 +174,16 @@ namespace Ewide.Core.Service
{ {
await _cache.SetAsync(CommonConst.CACHE_AREA_CODE, areaCodes); await _cache.SetAsync(CommonConst.CACHE_AREA_CODE, areaCodes);
} }
/// <summary>
/// 检查给定 key 是否存在
/// </summary>
/// <param name="cacheKey">键</param>
/// <returns></returns>
[NonAction]
public bool Exists(string cacheKey)
{
return _cache.Equals(cacheKey);
}
} }
} }

213
Api/Ewide.Core/Service/Timer/Dto/JobInput.cs
View File

@@ -1,4 +1,5 @@
using Furion.DataValidation; using Furion.DataValidation;
using Furion.TaskScheduler;
using System; using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
@@ -7,53 +8,44 @@ namespace Ewide.Core.Service
/// <summary> /// <summary>
/// 任务调度参数 /// 任务调度参数
/// </summary> /// </summary>
public class JobInput : PageInputBase public class JobPageInput : PageInputBase
{ {
/// <summary> /// <summary>
/// 任务名称 /// 任务名称
/// </summary> /// </summary>
/// <example>ewide</example>
public string JobName { get; set; } public string JobName { get; set; }
/// <summary> /// <summary>
/// 任务分组 /// 只执行一次
/// </summary> /// </summary>
/// <example>ewide</example> public bool DoOnce { get; set; } = false;
public string JobGroup { get; set; }
/// <summary> /// <summary>
/// 开始时间 /// 立即执行（默认等待启动）
/// </summary> /// </summary>
public DateTime BeginTime { get; set; } = DateTime.Now; public bool StartNow { get; set; } = false;
/// <summary> /// <summary>
/// 结束时间 /// 执行类型(并行、列队)
/// </summary> /// </summary>
/// <example>null</example> public SpareTimeExecuteTypes ExecuteType { get; set; }
public DateTime? EndTime { get; set; }
/// <summary>
/// 执行间隔时间（单位秒）
/// </summary>
/// <example>5</example>
public int Interval { get; set; }
/// <summary> /// <summary>
/// Cron表达式 /// Cron表达式
/// </summary> /// </summary>
/// <example></example>
public string Cron { get; set; } public string Cron { get; set; }
/// <summary> /// <summary>
/// 执行次数（默认无限循环） /// 定时器类型
/// </summary> /// </summary>
/// <example>10</example> public SpareTimeTypes TimerType { get; set; }
public int? RunNumber { get; set; }
/// <summary>
/// 执行间隔时间，单位秒（如果有Cron，则IntervalSecond失效）
/// </summary>
/// <example>5</example>
public int? Interval { get; set; }
/// <summary>
/// 触发器类型
/// </summary>
public TriggerTypeEnum TriggerType { get; set; } = TriggerTypeEnum.Simple;
/// <summary> /// <summary>
/// 请求url /// 请求url
@@ -71,6 +63,152 @@ namespace Ewide.Core.Service
/// </summary> /// </summary>
public string Headers { get; set; } public string Headers { get; set; }
/// <summary>
/// 请求类型
/// </summary>
public RequestTypeEnum RequestType { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
public class AddJobInput
{
/// <summary>
/// 任务名称
/// </summary>
public string JobName { get; set; }
/// <summary>
/// 只执行一次
/// </summary>
public bool DoOnce { get; set; } = false;
/// <summary>
/// 立即执行（默认等待启动）
/// </summary>
public bool StartNow { get; set; } = false;
/// <summary>
/// 执行类型(并行、列队)
/// </summary>
public SpareTimeExecuteTypes ExecuteType { get; set; }
/// <summary>
/// 执行间隔时间（单位秒）
/// </summary>
/// <example>5</example>
public int Interval { get; set; }
/// <summary>
/// Cron表达式
/// </summary>
public string Cron { get; set; }
/// <summary>
/// 定时器类型
/// </summary>
public SpareTimeTypes TimerType { get; set; }
/// <summary>
/// 请求url
/// </summary>
public string RequestUrl { get; set; }
/// <summary>
/// 请求参数（Post，Put请求用）
/// </summary>
public string RequestParameters { get; set; }
/// <summary>
/// Headers(可以包含如：Authorization授权认证)
/// 格式：{"Authorization":"userpassword.."}
/// </summary>
public string Headers { get; set; }
/// <summary>
/// 请求类型
/// </summary>
public RequestTypeEnum RequestType { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
public class StopJobInput
{
public string JobName { get; set; }
}
public class DeleteJobInput : QueryJobInput
{
}
public class UpdateJobInput : QueryJobInput
{
/// <summary>
/// 任务名称
/// </summary>
/// <example>dilon</example>
[Required, MaxLength(20)]
public string JobName { get; set; }
/// <summary>
/// 只执行一次
/// </summary>
public bool DoOnce { get; set; } = false;
/// <summary>
/// 立即执行（默认等待启动）
/// </summary>
public bool StartNow { get; set; } = false;
/// <summary>
/// 执行类型(并行、列队)
/// </summary>
public SpareTimeExecuteTypes ExecuteType { get; set; } = SpareTimeExecuteTypes.Parallel;
/// <summary>
/// 执行间隔时间（单位秒）
/// </summary>
/// <example>5</example>
public int? Interval { get; set; } = 5;
/// <summary>
/// Cron表达式
/// </summary>
/// <example></example>
[MaxLength(20)]
public string Cron { get; set; }
/// <summary>
/// 定时器类型
/// </summary>
public SpareTimeTypes TimerType { get; set; } = SpareTimeTypes.Interval;
/// <summary>
/// 请求url
/// </summary>
[MaxLength(200)]
public string RequestUrl { get; set; }
/// <summary>
/// 请求参数（Post，Put请求用）
/// </summary>
public string RequestParameters { get; set; }
/// <summary>
/// Headers(可以包含如：Authorization授权认证)
/// 格式：{"Authorization":"userpassword.."}
/// </summary>
public string Headers { get; set; }
/// <summary> /// <summary>
/// 请求类型 /// 请求类型
/// </summary> /// </summary>
@@ -78,32 +216,15 @@ namespace Ewide.Core.Service
public RequestTypeEnum RequestType { get; set; } = RequestTypeEnum.Post; public RequestTypeEnum RequestType { get; set; } = RequestTypeEnum.Post;
/// <summary> /// <summary>
/// 描述 /// 备注
/// </summary> /// </summary>
[MaxLength(100)]
public string Remark { get; set; } public string Remark { get; set; }
/// <summary>
/// 任务状态
/// </summary>
public string DisplayState { get; set; }
} }
public class DeleteJobInput : JobInput public class QueryJobInput
{ {
/// <summary> [Required(ErrorMessage = "Id不能为空")]
/// 任务Id
/// </summary>
[Required(ErrorMessage = "任务Id不能为空")]
public string Id { get; set; } public string Id { get; set; }
} }
public class UpdateJobInput : DeleteJobInput
{
}
public class QueryJobInput : DeleteJobInput
{
}
} }

158
Api/Ewide.Core/Service/Timer/Dto/JobOutput.cs
View File

@@ -1,4 +1,5 @@
using Quartz; using Furion.TaskScheduler;
using Quartz;
using System; using System;
namespace Ewide.Core.Service namespace Ewide.Core.Service
@@ -8,89 +9,142 @@ namespace Ewide.Core.Service
/// </summary> /// </summary>
public class JobOutput public class JobOutput
{ {
/// <summary>
/// Id
/// </summary>
public string Id { get; set; }
/// <summary>
/// 已执行次数
/// </summary>
public long? RunNumber { get; set; }
/// <summary>
/// 定时器状态
/// </summary>
public SpareTimeStatus TimerStatus { get; set; } = SpareTimeStatus.Stopped;
/// <summary>
/// 异常信息
/// </summary>
public string Exception { get; set; }
/// <summary> /// <summary>
/// 任务名称 /// 任务名称
/// </summary> /// </summary>
public string JobName { get; set; } public string JobName { get; set; }
/// <summary> /// <summary>
/// 任务组名 /// 只执行一次
/// </summary> /// </summary>
public string JobGroup { get; set; } public bool DoOnce { get; set; } = false;
/// <summary> /// <summary>
/// 下次执行时间 /// 立即执行（默认等待启动）
/// </summary> /// </summary>
public DateTime? NextFireTime { get; set; } public bool StartNow { get; set; } = false;
/// <summary> /// <summary>
/// 上次执行时间 /// 执行类型(并行、列队)
/// </summary> /// </summary>
public DateTime? PreviousFireTime { get; set; } public SpareTimeExecuteTypes ExecuteType { get; set; }
/// <summary> /// <summary>
/// 开始时间 /// 执行间隔时间（单位秒）
/// </summary> /// </summary>
public DateTime BeginTime { get; set; } public int Interval { get; set; }
/// <summary> /// <summary>
/// 结束时间 /// Cron表达式
/// </summary> /// </summary>
public DateTime? EndTime { get; set; } public string Cron { get; set; }
/// <summary> /// <summary>
/// 上次执行的异常信息 /// 定时器类型
/// </summary> /// </summary>
public string LastErrMsg { get; set; } public SpareTimeTypes TimerType { get; set; }
/// <summary> /// <summary>
/// 任务状态 /// 请求url
/// </summary>
public TriggerState TriggerState { get; set; }
/// <summary>
/// 描述
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 显示状态
/// </summary>
public string DisplayState
{
get
{
return TriggerState switch
{
TriggerState.Normal => "正常",
TriggerState.Paused => "暂停",
TriggerState.Complete => "完成",
TriggerState.Error => "异常",
TriggerState.Blocked => "阻塞",
TriggerState.None => "不存在",
_ => "未知",
};
}
}
/// <summary>
/// 时间间隔
/// </summary>
public string Interval { get; set; }
/// <summary>
/// 请求地址
/// </summary> /// </summary>
public string RequestUrl { get; set; } public string RequestUrl { get; set; }
/// <summary> /// <summary>
/// 请求类型 /// 请求类型
/// </summary> /// </summary>
public string RequestType { get; set; } /// <example>2</example>
public RequestTypeEnum RequestType { get; set; }
/// <summary> /// <summary>
/// 已经执行的次数 /// 备注
/// </summary> /// </summary>
public string RunNumber { get; set; } public string Remark { get; set; }
}
/// <summary>
/// 任务方法信息
/// </summary>
public class TaskMethodInfo
{
/// <summary>
/// 方法名
/// </summary>
public string MethodName { get; set; }
/// <summary>
/// 方法所属类的Type对象
/// </summary>
public Type DeclaringType { get; set; }
/// <summary>
/// 任务名称
/// </summary>
public string JobName { get; set; }
/// <summary>
/// 只执行一次
/// </summary>
public bool DoOnce { get; set; } = false;
/// <summary>
/// 立即执行（默认等待启动）
/// </summary>
public bool StartNow { get; set; } = false;
/// <summary>
/// 执行类型(并行、列队)
/// </summary>
public SpareTimeExecuteTypes ExecuteType { get; set; }
/// <summary>
/// 执行间隔时间（单位秒）
/// </summary>
public int Interval { get; set; }
/// <summary>
/// Cron表达式
/// </summary>
public string Cron { get; set; }
/// <summary>
/// 定时器类型
/// </summary>
public SpareTimeTypes TimerType { get; set; }
/// <summary>
/// 请求url
/// </summary>
public string RequestUrl { get; set; }
/// <summary>
/// 请求类型
/// </summary>
/// <example>2</example>
public RequestTypeEnum RequestType { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }
} }

13
Api/Ewide.Core/Service/Timer/ISysTimerService.cs
View File

@@ -1,16 +1,17 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Ewide.Core.Service namespace Ewide.Core.Service
{ {
public interface ISysTimerService public interface ISysTimerService
{ {
Task AddJob(JobInput input); Task<dynamic> GetTimerPageList([FromQuery] JobPageInput input);
Task DeleteJob(DeleteJobInput input); Task<dynamic> GetLocalJobList();
Task<dynamic> GetJobPageList([FromQuery] JobInput input); Task AddTimer(AddJobInput input);
Task DeleteTimer(DeleteJobInput input);
Task UpdateTimber(UpdateJobInput input);
Task<dynamic> GetTimer([FromQuery] QueryJobInput input); Task<dynamic> GetTimer([FromQuery] QueryJobInput input);
Task StopScheduleJobAsync(JobInput input); Task<IEnumerable<TaskMethodInfo>> GetTaskMethods();
Task TriggerJobAsync(JobInput input);
Task UpdateJob(UpdateJobInput input);
} }
} }

236
Api/Ewide.Core/Service/Timer/SysTimerService.cs
View File

@@ -1,12 +1,20 @@
using Furion.DatabaseAccessor; using Ewide.Core.Extension;
using Furion;
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions; using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection; using Furion.DependencyInjection;
using Furion.DynamicApiController; using Furion.DynamicApiController;
using Furion.FriendlyException; using Furion.FriendlyException;
using Furion.JsonSerialization;
using Furion.RemoteRequest.Extensions;
using Furion.TaskScheduler;
using Mapster; using Mapster;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Ewide.Core.Service namespace Ewide.Core.Service
@@ -18,12 +26,14 @@ namespace Ewide.Core.Service
public class SysTimerService : ISysTimerService, IDynamicApiController, IScoped public class SysTimerService : ISysTimerService, IDynamicApiController, IScoped
{ {
private readonly IRepository<SysTimer> _sysTimerRep; // 任务表仓储 private readonly IRepository<SysTimer> _sysTimerRep; // 任务表仓储
private readonly SchedulerCenter _schedulerCenter; private readonly ISysCacheService _cache;
public SysTimerService(IRepository<SysTimer> sysTimerRep, SchedulerCenter schedulerCenter) //private readonly SchedulerCenter _schedulerCenter; //随框架更新已弃用
public SysTimerService(IRepository<SysTimer> sysTimerRep, ISysCacheService cache)
{ {
_sysTimerRep = sysTimerRep; _sysTimerRep = sysTimerRep;
_schedulerCenter = schedulerCenter; _cache = cache;
} }
/// <summary> /// <summary>
@@ -32,21 +42,37 @@ namespace Ewide.Core.Service
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/sysTimers/page")] [HttpPost("/sysTimers/page")]
public async Task<dynamic> GetJobPageList([FromBody] JobInput input) public async Task<dynamic> GetTimerPageList([FromBody] JobPageInput input)
{ {
var jobList = await _schedulerCenter.GetJobList(); var workers = SpareTime.GetWorkers().ToList();
var jobName = !string.IsNullOrEmpty(input.JobName?.Trim());
var timers = await _sysTimerRep.DetachedEntities var timers = await _sysTimerRep.DetachedEntities
.Where((jobName, u => EF.Functions.Like(u.JobName, $"%{input.JobName.Trim()}%"))) .Where(!string.IsNullOrEmpty(input.JobName?.Trim()), u => EF.Functions.Like(u.JobName, $"%{input.JobName.Trim()}%"))
.Select(u => u.Adapt<JobInput>()) .Select(u => u.Adapt<JobOutput>())
.ToPagedListAsync(input.PageIndex, input.PageSize); .ToPagedListAsync(input.PageIndex, input.PageSize);
timers.Items.ToList().ForEach(u => timers.Items.ToList().ForEach(u =>
{ {
u.DisplayState = jobList.Find(m => m.JobName == u.JobName)?.DisplayState; var timer = workers.FirstOrDefault(m => m.WorkerName == u.JobName);
if (timer != null)
{
u.TimerStatus = timer.Status;
u.RunNumber = timer.Tally;
u.Exception = Newtonsoft.Json.JsonConvert.SerializeObject(timer.Exception);
}
}); });
return PageDataResult<JobInput>.PageResult(timers); return PageDataResult<JobOutput>.PageResult(timers);
}
/// <summary>
/// 获取所有本地任务
/// </summary>
/// <returns></returns>
[HttpGet("/sysTimers/localJobList")]
public async Task<dynamic> GetLocalJobList()
{
// 获取本地所有任务方法
return await GetTaskMethods();
} }
/// <summary> /// <summary>
@@ -55,7 +81,7 @@ namespace Ewide.Core.Service
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/sysTimers/add")] [HttpPost("/sysTimers/add")]
public async Task AddJob(JobInput input) public async Task AddTimer(AddJobInput input)
{ {
var isExist = await _sysTimerRep.AnyAsync(u => u.JobName == input.JobName, false); var isExist = await _sysTimerRep.AnyAsync(u => u.JobName == input.JobName, false);
if (isExist) if (isExist)
@@ -64,8 +90,8 @@ namespace Ewide.Core.Service
var timer = input.Adapt<SysTimer>(); var timer = input.Adapt<SysTimer>();
await _sysTimerRep.InsertAsync(timer); await _sysTimerRep.InsertAsync(timer);
// 添加到调度 // 添加到任务调度里
await _schedulerCenter.AddScheduleJobAsync(input); AddTimerJob(input);
} }
/// <summary> /// <summary>
@@ -74,7 +100,7 @@ namespace Ewide.Core.Service
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/sysTimers/delete")] [HttpPost("/sysTimers/delete")]
public async Task DeleteJob(DeleteJobInput input) public async Task DeleteTimer(DeleteJobInput input)
{ {
var timer = await _sysTimerRep.FirstOrDefaultAsync(u => u.Id == input.Id); var timer = await _sysTimerRep.FirstOrDefaultAsync(u => u.Id == input.Id);
if (timer == null) if (timer == null)
@@ -82,8 +108,8 @@ namespace Ewide.Core.Service
await timer.DeleteAsync(); await timer.DeleteAsync();
// 从调度器里删除 // 从调度器里取消
await _schedulerCenter.DeleteScheduleJobAsync(input); SpareTime.Cancel(timer.JobName);
} }
/// <summary> /// <summary>
@@ -92,21 +118,21 @@ namespace Ewide.Core.Service
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/sysTimers/edit")] [HttpPost("/sysTimers/edit")]
public async Task UpdateJob(UpdateJobInput input) public async Task UpdateTimber(UpdateJobInput input)
{ {
// 排除自己并且判断与其他是否相同 // 排除自己并且判断与其他是否相同
var isExist = await _sysTimerRep.AnyAsync(u => u.JobName == input.JobName && u.Id != input.Id, false); var isExist = await _sysTimerRep.AnyAsync(u => u.JobName == input.JobName && u.Id != input.Id, false);
if (isExist) throw Oops.Oh(ErrorCode.D1100); if (isExist) throw Oops.Oh(ErrorCode.D1100);
// 先从调度器里取消
var oldTimer = await _sysTimerRep.FirstOrDefaultAsync(u => u.Id == input.Id, false);
SpareTime.Cancel(oldTimer.JobName);
var timer = input.Adapt<SysTimer>(); var timer = input.Adapt<SysTimer>();
await timer.UpdateAsync(ignoreNullValues: true); await timer.UpdateAsync(ignoreNullValues: true);
var addJobInput = input.Adapt<AddJobInput>();
// 先从调度器里删除 // 再添加到任务调度里
var oldTimer = await _sysTimerRep.FirstOrDefaultAsync(u => u.Id == input.Id, false); AddTimerJob(addJobInput);
await _schedulerCenter.DeleteScheduleJobAsync(oldTimer.Adapt<DeleteJobInput>());
// 再加到调度里
await _schedulerCenter.AddScheduleJobAsync(timer.Adapt<JobInput>());
} }
/// <summary> /// <summary>
@@ -126,9 +152,9 @@ namespace Ewide.Core.Service
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/sysTimers/stop")] [HttpPost("/sysTimers/stop")]
public async Task StopScheduleJobAsync(JobInput input) public void StopTimerJob(StopJobInput input)
{ {
await _schedulerCenter.StopScheduleJobAsync(input); SpareTime.Stop(input.JobName);
} }
/// <summary> /// <summary>
@@ -137,9 +163,161 @@ namespace Ewide.Core.Service
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/sysTimers/start")] [HttpPost("/sysTimers/start")]
public async Task TriggerJobAsync(JobInput input) public void StartTimerJob(AddJobInput input)
{ {
await _schedulerCenter.TriggerJobAsync(input); var timer = SpareTime.GetWorkers().ToList().Find(u => u.WorkerName == input.JobName);
if (timer == null)
//AddTimerJob(input);
throw Oops.Oh("启动失败：任务不存在");
// 如果 StartNow 为 flase , 执行 AddTimerJob 并不会启动任务
SpareTime.Start(input.JobName);
}
/// <summary>
/// 新增定时任务
/// </summary>
/// <param name="input"></param>
[NonAction]
public void AddTimerJob(AddJobInput input)
{
Action<SpareTimer, long> action = null;
switch (input.RequestType)
{
// 创建本地方法委托
case RequestTypeEnum.Run:
{
// 查询符合条件的任务方法
var taskMethod = GetTaskMethods()?.Result.FirstOrDefault(m => m.RequestUrl == input.RequestUrl);
if (taskMethod == null) break;
// 创建任务对象
var typeInstance = Activator.CreateInstance(taskMethod.DeclaringType);
// 创建委托
action = (Action<SpareTimer, long>)Delegate.CreateDelegate(typeof(Action<SpareTimer, long>), typeInstance, taskMethod.MethodName);
break;
}
// 创建网络任务委托
default:
{
action = async (_, _) =>
{
var requestUrl = input.RequestUrl.Trim();
requestUrl = requestUrl?.IndexOf("http") == 0 ? requestUrl : "http://" + requestUrl;
var requestParameters = input.RequestParameters;
var headersString = input.Headers;
var headers = string.IsNullOrEmpty(headersString)
? null
: JSON.Deserialize<Dictionary<string, string>>(headersString);
switch (input.RequestType)
{
case RequestTypeEnum.Get:
await requestUrl.SetHeaders(headers).GetAsync();
break;
case RequestTypeEnum.Post:
await requestUrl.SetHeaders(headers).SetQueries(requestParameters).PostAsync();
break;
case RequestTypeEnum.Put:
await requestUrl.SetHeaders(headers).SetQueries(requestParameters).PutAsync();
break;
case RequestTypeEnum.Delete:
await requestUrl.SetHeaders(headers).DeleteAsync();
break;
}
};
break;
}
}
if (action == null) return;
// 缓存任务配置参数，以供任务运行时读取
if (input.RequestType == RequestTypeEnum.Run)
{
var jobParametersName = $"{input.JobName}_Parameters";
var jobParameters = _cache.Exists(jobParametersName);
var requestParametersIsNull = string.IsNullOrEmpty(input.RequestParameters);
// 如果没有任务配置却又存在缓存，则删除缓存
if (requestParametersIsNull && jobParameters)
_cache.DelAsync(jobParametersName);
else if (!requestParametersIsNull)
_cache.SetAsync(jobParametersName, JSON.Deserialize<Dictionary<string, string>>(input.RequestParameters));
}
// 创建定时任务
switch (input.TimerType)
{
case SpareTimeTypes.Interval:
if (input.DoOnce)
SpareTime.DoOnce(input.Interval * 1000, action, input.JobName, input.Remark, input.StartNow, executeType: input.ExecuteType);
else
SpareTime.Do(input.Interval * 1000, action, input.JobName, input.Remark, input.StartNow, executeType: input.ExecuteType);
break;
case SpareTimeTypes.Cron:
SpareTime.Do(input.Cron, action, input.JobName, input.Remark, input.StartNow, executeType: input.ExecuteType);
break;
}
}
/// <summary>
/// 启动自启动任务
/// </summary>
[NonAction]
public void StartTimerJob()
{
var sysTimerList = _sysTimerRep.DetachedEntities.Where(t => t.StartNow).Select(u => u.Adapt<AddJobInput>()).ToList();
sysTimerList.ForEach(AddTimerJob);
}
/// <summary>
/// 获取所有本地任务
/// </summary>
/// <returns></returns>
[NonAction]
public async Task<IEnumerable<TaskMethodInfo>> GetTaskMethods()
{
// 有缓存就返回缓存
var taskMethods = await _cache.GetAsync<IEnumerable<TaskMethodInfo>>(CommonConst.CACHE_KEY_TIMER_JOB);
if (taskMethods != null) return taskMethods;
// 获取所有本地任务方法，必须有spareTimeAttribute特性
taskMethods = App.EffectiveTypes
.Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && typeof(ISpareTimeWorker).IsAssignableFrom(u))
.SelectMany(u => u.GetMethods(BindingFlags.Public | BindingFlags.Instance)
.Where(m => m.IsDefined(typeof(SpareTimeAttribute), false) &&
m.GetParameters().Length == 2 &&
m.GetParameters()[0].ParameterType == typeof(SpareTimer) &&
m.GetParameters()[1].ParameterType == typeof(long) && m.ReturnType == typeof(void))
.Select(m =>
{
// 默认获取第一条任务特性
var spareTimeAttribute = m.GetCustomAttribute<SpareTimeAttribute>();
return new TaskMethodInfo
{
JobName = spareTimeAttribute.WorkerName,
RequestUrl = $"{m.DeclaringType.Name}/{m.Name}",
Cron = spareTimeAttribute.CronExpression,
DoOnce = spareTimeAttribute.DoOnce,
ExecuteType = spareTimeAttribute.ExecuteType,
Interval = (int)spareTimeAttribute.Interval / 1000,
StartNow = spareTimeAttribute.StartNow,
RequestType = RequestTypeEnum.Run,
Remark = spareTimeAttribute.Description,
TimerType = string.IsNullOrEmpty(spareTimeAttribute.CronExpression) ? SpareTimeTypes.Interval : SpareTimeTypes.Cron,
MethodName = m.Name,
DeclaringType = m.DeclaringType
};
}));
await _cache.SetAsync(CommonConst.CACHE_KEY_TIMER_JOB, taskMethods);
return taskMethods;
} }
} }
} }

6
Api/Ewide.Core/applicationconfig.json
View File

@@ -8,6 +8,12 @@
"Title": "Admin.NET通用权限管理平台", "Title": "Admin.NET通用权限管理平台",
"Description": "前后端分离架构，开箱即用，紧随前沿技术。<br/>后台.NET5平台基于Furion框架，前端基于XiaoNuo生态技术框架的vue版本。<br/><a href='https://dotnetchina.gitee.io/furion/'>Furion框架,让 .NET 开发更简单，更通用，更流行</a><br/><a href='https://gitee.com/xiaonuobase/xiaonuo-vue/'>XiaoNuo前端框架采用Vue2.x + AntDesign Vue pro1.x + Axios</a>", "Description": "前后端分离架构，开箱即用，紧随前沿技术。<br/>后台.NET5平台基于Furion框架，前端基于XiaoNuo生态技术框架的vue版本。<br/><a href='https://dotnetchina.gitee.io/furion/'>Furion框架,让 .NET 开发更简单，更通用，更流行</a><br/><a href='https://gitee.com/xiaonuobase/xiaonuo-vue/'>XiaoNuo前端框架采用Vue2.x + AntDesign Vue pro1.x + Axios</a>",
"Version": "1.0.0" "Version": "1.0.0"
},
{
"Group": "HouseBusiness",
"Title": "城镇房屋业务接口",
"Description": "城镇房屋业务接口</a>",
"Version": "1.0.1"
} }
] ]
}, },

243
web-react/src/pages/system/timers/form.jsx Normal file
View File

@@ -0,0 +1,243 @@
import React, { Component } from 'react'
import { Row, Col, Form, Input, Spin, Radio, Switch } from 'antd'
import { AntIcon } from 'components'
import { cloneDeep } from 'lodash'
import { api } from 'common/api'
const initialValues = { requestType: 2, startNow: 0, doOnce: 1, timerType: 1, executeType: 1 }
export default class form extends Component {
state = {
// 加载状态
loading: true,
timerType: 1,
requestType: 2,
}
// 表单实例
form = React.createRef()
// 初始化数据
record = {}
/**
* mount后回调
*/
componentDidMount() {
this.props.created && this.props.created(this)
}
/**
* 填充数据
* 可以在设置this.record之后对其作出数据结构调整
* [异步,必要]
* @param {*} params
*/
async fillData(params) {
if (params.id) {
this.record = (await api.sysTimersDetail({ id: params.id })).data
}
this.record = {
...this.record,
}
//#region 从后端转换成前段所需格式
//#endregion
this.form.current && this.form.current.setFieldsValue(this.record)
this.setState({
loading: false,
})
}
/**
* 获取数据
* 可以对postData进行数据结构调整
* [异步,必要]
* @returns
*/
async getData() {
const form = this.form.current
const valid = await form.validateFields()
if (valid) {
const postData = form.getFieldsValue()
if (this.record) {
postData.id = this.record.id
}
//#region 从前段转换后端所需格式
//#endregion
return postData
}
}
render() {
const { requestType, timerType } = this.state
return (
<Spin spinning={this.state.loading} indicator={<AntIcon type="loading" />}>
<Form initialValues={initialValues} ref={this.form} className="yo-form">
<div className="yo-form-group">
<Row gutter={24}>
<Col span={12}>
<Form.Item
name="jobName"
label="任务名称"
rules={[{ required: true, message: '请选择任务名称' }]}
>
<Input autoComplete="off" placeholder="请输入任务名称" />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="请求地址"
name="requestUrl"
rules={[{ required: true, message: '请输入请求地址' }]}
>
<Input autoComplete="off" placeholder="请输入请求地址" />
</Form.Item>
</Col>
</Row>
<Form.Item
label="请求类型"
name="requestType"
rules={[{ required: true, message: '请选择请求类型' }]}
>
<Radio.Group
// disabled={this.state.exist}
// buttonStyle="solid"
onChange={e => this.setState({ requestType: e.target.value })}
>
{/* <Radio value={0}>
<span>Run</span>
</Radio> */}
<Radio value={1}>
<span>Get</span>
</Radio>
<Radio value={2}>
<span>Post</span>
</Radio>
<Radio value={3}>
<span>Put</span>
</Radio>
<Radio value={4}>
<span>Delete</span>
</Radio>
</Radio.Group>
</Form.Item>
{requestType != 0 && (
<Form.Item name="requestHeader" label="请求头">
<Input autoComplete="off" placeholder="请输入请求头" />
</Form.Item>
)}
<Form.Item
name="requestParameters"
label={requestType == 0 ? '配置项参数' : '请求参数'}
>
<Input
autoComplete="off"
placeholder={
requestType == 0 ? '请输入配置项参数' : '请输入请求参数'
}
/>
</Form.Item>
<Row gutter={24}>
<Col span={12}>
<Form.Item
name="timerType"
label="定时器类型"
rules={[{ required: true, message: '请选择定时器类型' }]}
>
<Radio.Group
buttonStyle="solid"
onChange={e => this.setState({ timerType: e.target.value })}
>
<Radio.Button value={1}>
<span>间隔方式</span>
</Radio.Button>
<Radio.Button value={2}>
<span>Cron表达式</span>
</Radio.Button>
</Radio.Group>
</Form.Item>
</Col>
<Col span={12}>
{timerType == 1 && (
<Form.Item
label="执行间隔（秒）"
name="interval"
rules={[
{ required: true, message: '请输入执行间隔（秒）' },
]}
>
<Input
autoComplete="off"
placeholder="请输入执行间隔（秒）"
/>
</Form.Item>
)}
{timerType == 2 && (
<Form.Item
label="任务表达式"
name="cron"
rules={[{ required: true, message: '请输入任务表达式' }]}
>
<Input
autoComplete="off"
placeholder="请输入任务表达式"
addonAfter={
<a
href="https://www.bejson.com/othertools/cron/"
target="_Blank"
rel="noreferrer"
>
参考
</a>
}
/>
</Form.Item>
)}
</Col>
</Row>
<Row gutter={24}>
<Col span={12}>
<Form.Item name="startNow" label="立即执行">
<Switch checkedChildren="是" unCheckedChildren="否" />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item name="doOnce" label="只执行一次">
<Switch checkedChildren="是" unCheckedChildren="否" />
</Form.Item>
</Col>
</Row>
<Row gutter={24}>
<Col span={12}>
<Form.Item
name="executeType"
label="执行类型"
rules={[{ required: true, message: '请选择执行类型' }]}
>
<Radio.Group
buttonStyle="solid"
// onChange={e => this.onHouseTypeChange(e)}
>
<Radio.Button value={1}>
<span>并行方式</span>
</Radio.Button>
<Radio.Button value={2}>
<span>串行方式</span>
</Radio.Button>
</Radio.Group>
</Form.Item>
</Col>
<Col span={12}>
<Form.Item label="备注" name="remark">
<Input autoComplete="off" placeholder="请输入备注" />
</Form.Item>
</Col>
</Row>
</div>
</Form>
</Spin>
)
}
}

318
web-react/src/pages/system/timers/index.jsx Normal file
View File

@@ -0,0 +1,318 @@
import React, { Component } from 'react'
import { Button, Card, Form, Input, message as Message, Popconfirm } from 'antd'
import { AntIcon, Auth, Container, ModalForm, QueryTable, QueryTableActions } from 'components'
import { api } from 'common/api'
import auth from 'components/authorized/handler'
import { isEqual } from 'lodash'
import getDictData from 'util/dic'
import { toCamelCase } from 'util/format'
import FormBody from './form'
/**
* 配置页面所需接口函数
*/
const apiAction = {
page: api.sysTimersPage,
add: api.sysTimersAdd,
edit: api.sysTimersEdit,
delete: api.sysTimersDelete,
start: api.sysTimersStart,
stop: api.sysTimersStop,
}
const name = '任务计划'
const authName = 'sysTimers'
export default class index extends Component {
state = {
codes: {
requestType: [
{ code: '0', value: 'Run' },
{ code: '1', value: 'Get' },
{ code: '2', value: 'Post' },
{ code: '3', value: 'Put' },
{ code: '4', value: 'Delete' },
],
timerStatus: [
{ code: '0', value: '运行中' },
{ code: '1', value: '已停止' },
{ code: '2', value: '执行失败' },
{ code: '3', value: '已取消' },
],
},
}
// 表格实例
table = React.createRef()
// 新增窗口实例
addForm = React.createRef()
// 编辑窗口实例
editForm = React.createRef()
columns = [
{
title: '任务名称',
width: 80,
dataIndex: 'jobName',
},
{
title: '请求地址',
width: 300,
dataIndex: 'requestUrl',
},
{
title: '请求类型',
width: 80,
dataIndex: 'requestType',
render: text => <>{this.bindCodeValue(text, 'request_type')}</>,
},
{
title: '请求参数',
width: 300,
dataIndex: 'requestParameters',
},
{
title: '间隔时间',
width: 80,
dataIndex: 'interval',
},
{
title: 'Cron',
width: 300,
dataIndex: 'cron',
},
{
title: '执行次数',
width: 80,
dataIndex: 'runNumber',
},
{
title: '状态',
width: 80,
dataIndex: 'timerStatus',
render: (text, record) => (
<>
{(text == 0 || text == 1 || text == 2) && (
<Popconfirm
placement="topRight"
title={`是否确认${text == 0 ? '停止' : text == 2 ? '重启' : '启动'}?`}
onConfirm={() =>
text == 0
? this.onStop(record.jobName)
: this.onStart(record.jobName)
}
>
<a>{this.bindCodeValue(text, 'timer_status')}</a>
</Popconfirm>
)}
{text == 3 && this.bindCodeValue(text, 'timer_status')}
</>
),
},
{
title: '备注',
width: 120,
dataIndex: 'remark',
},
]
/**
* 构造函数,在渲染前动态添加操作字段等
* @param {*} props
*/
constructor(props) {
super(props)
const flag = auth({ [authName]: [['edit'], ['delete']] })
if (flag) {
this.columns.push({
title: '操作',
width: 150,
dataIndex: 'actions',
render: (text, { id }) => (
<QueryTableActions>
<Auth auth={{ [authName]: 'edit' }}>
<a onClick={() => this.onOpen(this.editForm, id)}>编辑</a>
</Auth>
<Auth auth={{ [authName]: 'delete' }}>
<Popconfirm
placement="topRight"
title="是否确认删除"
onConfirm={() => this.onDelete(id)}
>
<a>删除</a>
</Popconfirm>
</Auth>
</QueryTableActions>
),
})
}
}
/**
* 阻止外部组件引发的渲染,提升性能
* 可自行添加渲染条件
* [必要]
* @param {*} props
* @param {*} state
* @returns
*/
shouldComponentUpdate(props, state) {
return !isEqual(this.state, state)
}
/**
* 加载字典数据,之后开始加载表格数据
* 如果必须要加载字典数据,可直接对表格设置autoLoad=true
*/
componentDidMount() {
const { onLoading, onLoadData } = this.table.current
onLoading()
onLoadData()
// getDictData('house_company_type').then(codes => {
// this.setState({ codes }, () => {
// onLoadData()
// })
// })
}
/**
* 调用加载数据接口,可在调用前对query进行处理
* [异步,必要]
* @param {*} params
* @param {*} query
* @returns
*/
loadData = async (params, query) => {
const { data } = await apiAction.page({
...params,
...query,
})
return data
}
/**
* 绑定字典数据
* @param {*} code
* @param {*} name
* @returns
*/
bindCodeValue(code, name) {
name = toCamelCase(name)
const codes = this.state.codes[name]
if (codes) {
const c = codes.find(p => p.code == code)
if (c) {
return c.value
}
}
return null
}
/**
* 打开新增/编辑弹窗
* @param {*} modal
* @param {*} id
*/
onOpen(modal, id) {
modal.current.open({ id })
}
/**
* 对表格上的操作进行统一处理
* [异步]
* @param {*} action
* @param {*} successMessage
*/
async onAction(action, successMessage) {
const { onLoading, onLoaded, onReloadData } = this.table.current
onLoading()
try {
if (action) {
await action
}
if (successMessage) {
Message.success(successMessage)
}
onReloadData()
} catch {
onLoaded()
}
}
/**
* 删除
* @param {*} id
*/
onDelete(id) {
this.onAction(apiAction.delete({ id }), '删除成功')
}
onStart(jobName) {
this.onAction(apiAction.start({ jobName }), '启动成功')
}
onStop(jobName) {
this.onAction(apiAction.stop({ jobName }), '停止成功')
}
render() {
return (
<Container mode="fluid">
<br />
<Card bordered={false}>
<QueryTable
ref={this.table}
autoLoad={false}
loadData={this.loadData}
columns={this.columns}
query={
<Auth auth={{ [authName]: 'page' }}>
<Form.Item label="任务名称" name="jobName">
<Input
autoComplete="off"
placeholder="请输入任务名称"
className="w-200"
/>
</Form.Item>
</Auth>
}
operator={
<Auth auth={{ [authName]: 'add' }}>
<Button
icon={<AntIcon type="plus" />}
onClick={() => this.onOpen(this.addForm)}
>
新增{name}
</Button>
</Auth>
}
/>
</Card>
<Auth auth={{ [authName]: 'add' }}>
<ModalForm
width={900}
title={`新增${name}`}
action={apiAction.add}
ref={this.addForm}
onSuccess={() => this.table.current.onReloadData()}
>
<FormBody />
</ModalForm>
</Auth>
<Auth auth={{ [authName]: 'edit' }}>
<ModalForm
width={900}
title={`编辑${name}`}
action={apiAction.edit}
ref={this.editForm}
onSuccess={() => this.table.current.onReloadData()}
>
<FormBody />
</ModalForm>
</Auth>
</Container>
)
}
}