feat: ✨ cron表达式选择器 (#92)

2025-06-19 18:28:17 +08:00 · 2024-02-26 18:17:18 +08:00
parent 6c2d1676e4
commit bde9fb1ea2
90 changed files with 394 additions and 22302 deletions
--- a/src/backend/NetAdmin.Infrastructure/Constant/Chars.cs
+++ b/src/backend/NetAdmin.Infrastructure/Constant/Chars.cs
@ -77,7 +77,7 @@ public static class Chars
        = """^(?:赵|钱|孙|李|周|吴|郑|王|冯|陈|褚|卫|蒋|沈|韩|杨|朱|秦|尤|许|何|吕|施|张|孔|曹|严|华|金|魏|陶|姜|戚|谢|邹|喻|柏|水|窦|章|云|苏|潘|葛|奚|范|彭|郎|鲁|韦|昌|马|苗|凤|花|方|俞|任|袁|柳|酆|鲍|史|唐|费|廉|岑|薛|雷|贺|倪|汤|滕|殷|罗|毕|郝|邬|安|常|乐|于|时|傅|皮|卞|齐|康|伍|余|元|卜|顾|孟|平|黄|和|穆|萧|尹|姚|邵|湛|汪|祁|毛|禹|狄|米|贝|明|臧|计|伏|成|戴|谈|宋|茅|庞|熊|纪|舒|屈|项|祝|董|梁|杜|阮|蓝|闵|席|季|麻|强|贾|路|娄|危|江|童|颜|郭|梅|盛|林|刁|钟|徐|邱|骆|高|夏|蔡|田|樊|胡|凌|霍|虞|万|支|柯|昝|管|卢|莫|经|房|裘|缪|干|解|应|宗|丁|宣|贲|邓|郁|单|杭|洪|包|诸|左|石|崔|吉|钮|龚|程|嵇|邢|滑|裴|陆|荣|翁|荀|羊|於|惠|甄|曲|家|封|芮|羿|储|靳|汲|邴|糜|松|井|段|富|巫|乌|焦|巴|弓|牧|隗|山|谷|车|侯|宓|蓬|全|郗|班|仰|秋|仲|伊|宫|宁|仇|栾|暴|甘|钭|厉|戎|祖|武|符|刘|景|詹|束|龙|叶|幸|司|韶|郜|黎|蓟|薄|印|宿|白|怀|蒲|邰|从|鄂|索|咸|籍|赖|卓|蔺|屠|蒙|池|乔|阴|胥|能|苍|双|闻|莘|党|翟|谭|贡|劳|逄|姬|申|扶|堵|冉|宰|郦|雍|郤|璩|桑|桂|濮|牛|寿|通|边|扈|燕|冀|郏|浦|尚|农|温|别|庄|晏|柴|瞿|阎|充|慕|连|茹|习|宦|艾|鱼|容|向|古|易|慎|戈|廖|庾|终|暨|居|衡|步|都|耿|满|弘|匡|国|文|寇|广|禄|阙|东|欧|殳|沃|利|蔚|越|夔|隆|师|巩|厍|聂|晁|勾|敖|融|冷|訾|辛|阚|那|简|饶|空|曾|毋|沙|乜|养|鞠|须|丰|巢|关|蒯|相|查|後|荆|红|游|竺|权|逯|盖|益|桓|公|万俟|司马|上官|欧阳|夏侯|诸葛|闻人|东方|赫连|皇甫|尉迟|公羊|澹台|公冶|宗政|濮阳|淳于|单于|太叔|申屠|公孙|仲孙|轩辕|令狐|钟离|宇文|长孙|慕容|鲜于|闾丘|司徒|司空|亓官|司寇|仉|督|子车|颛孙|端木|巫马|公西|漆雕|乐正|壤驷|公良|拓跋|夹谷|宰父|谷梁|晋|楚|闫|法|汝|鄢|涂|钦|段干|百里|东郭|南门|呼延|归|海|羊舌|微生|岳|帅|缑|亢|况|后|有|琴|梁丘|左丘|东门|西门|商|牟|佘|佴|伯|赏|南宫|墨|哈|谯|笪|年|爱|阳|佟|第五|言|福)[\u4e00-\u9fa5]{1,3}$""";

    public const string RGX_CRON
-        = """^(?:[0-5]?[0-9]|[0-9]|[1-5]?[0-9](?:,[0-5]?[0-9])?|\*|\*/[0-5]?[0-9])\s+(?:[01]?[0-9]|2[0-3]|\*)\s+(?:[0-2]?[0-9]|3[01]|\*)\s+(?:0?[0-9]|1[0-1]|\*)\s+(?:[0-6]|\*)$""";
+        = "^\\s*($|#|\\w+\\s*=|(\\?|\\*|(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?(?:,(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?)*)\\s+(\\?|\\*|(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?(?:,(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?)*)\\s+(\\?|\\*|(?:[01]?\\d|2[0-3])(?:(?:-|\\/|\\,)(?:[01]?\\d|2[0-3]))?(?:,(?:[01]?\\d|2[0-3])(?:(?:-|\\/|\\,)(?:[01]?\\d|2[0-3]))?)*)\\s+(\\?|\\*|(?:0?[1-9]|[12]\\d|3[01])(?:(?:-|\\/|\\,)(?:0?[1-9]|[12]\\d|3[01]))?(?:,(?:0?[1-9]|[12]\\d|3[01])(?:(?:-|\\/|\\,)(?:0?[1-9]|[12]\\d|3[01]))?)*)\\s+(\\?|\\*|(?:[1-9]|1[012])(?:(?:-|\\/|\\,)(?:[1-9]|1[012]))?(?:L|W)?(?:,(?:[1-9]|1[012])(?:(?:-|\\/|\\,)(?:[1-9]|1[012]))?(?:L|W)?)*|\\?|\\*|(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)(?:(?:-)(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC))?(?:,(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)(?:(?:-)(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC))?)*)\\s+(\\?|\\*|(?:[0-6])(?:(?:-|\\/|\\,|#)(?:[0-6]))?(?:L)?(?:,(?:[0-6])(?:(?:-|\\/|\\,|#)(?:[0-6]))?(?:L)?)*|\\?|\\*|(?:MON|TUE|WED|THU|FRI|SAT|SUN)(?:(?:-)(?:MON|TUE|WED|THU|FRI|SAT|SUN))?(?:,(?:MON|TUE|WED|THU|FRI|SAT|SUN)(?:(?:-)(?:MON|TUE|WED|THU|FRI|SAT|SUN))?)*)(|\\s)+(\\?|\\*|(?:|\\d{4})(?:(?:-|\\/|\\,)(?:|\\d{4}))?(?:,(?:|\\d{4})(?:(?:-|\\/|\\,)(?:|\\d{4}))?)*))$";

    public const string RGX_EMAIL
        = """^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$""";
--- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs
+++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs
@ -14,6 +14,11 @@ public interface IJobModule : ICrudModule<CreateJobReq, QueryJobRsp // 创建类
  , DelReq                                                          // 删除类型
 >
 {
+    /// <summary>
+    ///     编辑作业
+    /// </summary>
+    Task<QueryJobRsp> EditAsync(UpdateJobReq req);
+
    /// <summary>
    ///     获取单个作业记录
    /// </summary>
--- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs
+++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs
@ -31,7 +31,7 @@ public sealed class JobService(DefaultRepository<Sys_Job> rpo, IJobRecordService
    public async Task<QueryJobRsp> CreateAsync(CreateJobReq req)
    {
        req.ThrowIfInvalid();
-        var nextExecTime = CronExpression.Parse(req.ExecutionCron).GetNextOccurrence(DateTime.UtcNow, TimeZoneInfo.Utc);
+        var nextExecTime = GetNextExecTime(req.ExecutionCron);
        var ret = await Rpo.InsertAsync(req with {
                                                     NextExecTime = nextExecTime
                                                   , NextTimeId = nextExecTime?.TimeUnixUtc()
@ -49,6 +49,23 @@ public sealed class JobService(DefaultRepository<Sys_Job> rpo, IJobRecordService
        return ret.Count;
    }

+    /// <inheritdoc />
+    public async Task<QueryJobRsp> EditAsync(UpdateJobReq req)
+    {
+        req.ThrowIfInvalid();
+        var ret = await Rpo.UpdateDiy.Set(a => a.ExecutionCron == req.ExecutionCron)
+                           .Set(a => a.HttpMethod              == req.HttpMethod)
+                           .Set(a => a.JobName                 == req.JobName)
+                           .Set(a => a.RequestHeader           == req.RequestHeader)
+                           .Set(a => a.RequestBody             == req.RequestBody)
+                           .Set(a => a.RequestUrl              == req.RequestUrl)
+                           .Set(a => a.UserId                  == req.UserId)
+                           .Where(a => a.Id                    == req.Id)
+                           .ExecuteUpdatedAsync()
+                           .ConfigureAwait(false);
+        return ret[0].Adapt<QueryJobRsp>();
+    }
+
    /// <inheritdoc />
    public Task<bool> ExistAsync(QueryReq<QueryJobReq> req)
    {
@ -59,7 +76,7 @@ public sealed class JobService(DefaultRepository<Sys_Job> rpo, IJobRecordService
    /// <inheritdoc />
    public async Task FinishJobAsync(UpdateJobReq req)
    {
-        var nextExecTime = CronExpression.Parse(req.ExecutionCron).GetNextOccurrence(DateTime.UtcNow, TimeZoneInfo.Utc);
+        var nextExecTime = GetNextExecTime(req.ExecutionCron);
        _ = await UpdateAsync(req with {
                                           Status = JobStatues.Idle
                                         , NextExecTime = nextExecTime
@ -183,6 +200,12 @@ public sealed class JobService(DefaultRepository<Sys_Job> rpo, IJobRecordService
        return req;
    }

+    private static DateTime? GetNextExecTime(string cron)
+    {
+        return CronExpression.Parse(cron, CronFormat.IncludeSeconds)
+                             .GetNextOccurrence(DateTime.UtcNow, TimeZoneInfo.Utc);
+    }
+
    private ISelect<Sys_Job> QueryInternal(QueryReq<QueryJobReq> req, bool orderByRandom = false)
    {
        var ret = Rpo.Select.Include(a => a.User)
--- a/src/backend/NetAdmin.SysComponent.Cache/Sys/JobCache.cs
+++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/JobCache.cs
@ -29,6 +29,12 @@ public sealed class JobCache(IDistributedCache cache, IJobService service)
        return Service.DeleteAsync(req);
    }

+    /// <inheritdoc />
+    public Task<QueryJobRsp> EditAsync(UpdateJobReq req)
+    {
+        return Service.EditAsync(req);
+    }
+
    /// <inheritdoc />
    public Task<bool> ExistAsync(QueryReq<QueryJobReq> req)
    {
--- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs
+++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs
@ -42,6 +42,15 @@ public sealed class JobController(IJobCache cache) : ControllerBase<IJobCache, I
        return Cache.DeleteAsync(req);
    }

+    /// <summary>
+    ///     编辑作业
+    /// </summary>
+    [Transaction]
+    public Task<QueryJobRsp> EditAsync(UpdateJobReq req)
+    {
+        return Cache.EditAsync(req);
+    }
+
    /// <summary>
    ///     计划作业是否存在
    /// </summary>
@ -102,6 +111,7 @@ public sealed class JobController(IJobCache cache) : ControllerBase<IJobCache, I
    ///     更新计划作业
    /// </summary>
    [Transaction]
+    [NonAction]
    public Task<QueryJobRsp> UpdateAsync(UpdateJobReq req)
    {
        return Cache.UpdateAsync(req);
--- a/src/backend/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs
+++ b/src/backend/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs
@ -14,11 +14,9 @@ public static class ServiceCollectionExtensions
    /// </summary>
    public static IServiceCollection AddSchedules(this IServiceCollection me)
    {
-        return App.WebHostEnvironment.EnvironmentName != Environments.Production
-            ? me
-            : me.AddSchedule(      //
-                builder => builder //
-                           .AddJob<ScheduledJob>(false,     Triggers.PeriodSeconds(5).SetRunOnStart(true))
-                           .AddJob<FreeScheduledJob>(false, Triggers.PeriodMinutes(1).SetRunOnStart(true)));
+        return me.AddSchedule( //
+            builder => builder //
+                       .AddJob<ScheduledJob>(false,     Triggers.PeriodSeconds(5).SetRunOnStart(true))
+                       .AddJob<FreeScheduledJob>(false, Triggers.PeriodMinutes(1).SetRunOnStart(true)));
    }
 }