From 4f429d09a4573ffcd7626626b91115405ac11e0d Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Thu, 15 Aug 2024 22:55:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BB=BB=E5=8A=A1=E4=B8=8D=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bunny.Service/IService/Service/JobService.cs | 6 +- .../Job/JobService/CronJobService.cs | 34 +++++++++++ .../Job/JobService/SimpleJobService.cs | 36 +++++++++++ Bunny.Service/Job/{SimJob.cs => SimpleJob.cs} | 2 +- Bunny.WebApi/Config/BaseConfig.cs | 28 ++------- Bunny.WebApi/Config/FilterConfig.cs | 21 ------- Bunny.WebApi/Config/PluginConfig.cs | 34 ----------- Bunny.WebApi/Config/ServiceRegistration.cs | 56 +++++++++++++++++- Bunny.WebApi/bunny.db | Bin 0 -> 102400 bytes 9 files changed, 134 insertions(+), 83 deletions(-) create mode 100644 Bunny.Service/Job/JobService/CronJobService.cs create mode 100644 Bunny.Service/Job/JobService/SimpleJobService.cs rename Bunny.Service/Job/{SimJob.cs => SimpleJob.cs} (93%) delete mode 100644 Bunny.WebApi/Config/FilterConfig.cs delete mode 100644 Bunny.WebApi/Config/PluginConfig.cs create mode 100644 Bunny.WebApi/bunny.db diff --git a/Bunny.Service/IService/Service/JobService.cs b/Bunny.Service/IService/Service/JobService.cs index 2b2dd41..0924f09 100644 --- a/Bunny.Service/IService/Service/JobService.cs +++ b/Bunny.Service/IService/Service/JobService.cs @@ -17,7 +17,7 @@ public class JobService : IJobService // var scheduler = schedulerFactory.GetScheduler(); var scheduler = schedulerFactory.GetScheduler().GetAwaiter().GetResult(); - var jobDetail = JobBuilder.Create() + var jobDetail = JobBuilder.Create() .UsingJobData("username", "用户名") .UsingJobData("password", "密码") .WithIdentity("simpleJob", "简单的JOB") @@ -46,7 +46,7 @@ public class JobService : IJobService var stdSchedulerFactory = new StdSchedulerFactory(); var scheduler = stdSchedulerFactory.GetScheduler().GetAwaiter().GetResult(); - var jobDetail = JobBuilder.Create() + var jobDetail = JobBuilder.Create() .UsingJobData("username", "用户名") .UsingJobData("password", "密码") // TODO 如果不设置持久的会报错； @@ -81,7 +81,7 @@ public class JobService : IJobService var stdSchedulerFactory = new StdSchedulerFactory(); var scheduler = stdSchedulerFactory.GetScheduler().GetAwaiter().GetResult(); - var jobDetail = JobBuilder.Create() + var jobDetail = JobBuilder.Create() .UsingJobData("username", "用户名") .UsingJobData("password", "密码") .StoreDurably() // 设置作业为持久的 diff --git a/Bunny.Service/Job/JobService/CronJobService.cs b/Bunny.Service/Job/JobService/CronJobService.cs new file mode 100644 index 0000000..5a67003 --- /dev/null +++ b/Bunny.Service/Job/JobService/CronJobService.cs @@ -0,0 +1,34 @@ +using Microsoft.AspNetCore.Builder; +using Quartz; +using Quartz.Impl; + +namespace Bunny.Service.Job.JobService; + +public static class CronJobService +{ + public static void AddCronJobService(this WebApplicationBuilder builder) + { + var stdSchedulerFactory = new StdSchedulerFactory(); + var scheduler = stdSchedulerFactory.GetScheduler().GetAwaiter().GetResult(); + + var jobDetail = JobBuilder.Create() + .UsingJobData("username", "用户名") + .UsingJobData("password", "密码") + .StoreDurably() // 设置作业为持久的 + .WithIdentity("simpleJob", "简单的JOB") + .Build(); + + scheduler.AddJob(jobDetail, true).GetAwaiter().GetResult(); + + var trigger = TriggerBuilder.Create() + .ForJob(jobDetail) + .UsingJobData("trigger", "trigger值") + .WithIdentity("testTrigger", "测试发出器") + .StartNow() + .WithCronSchedule("0/1 * * * * ?") + .Build(); + + scheduler.ScheduleJob(trigger).GetAwaiter().GetResult(); + scheduler.Start().GetAwaiter().GetResult(); + } +} \ No newline at end of file diff --git a/Bunny.Service/Job/JobService/SimpleJobService.cs b/Bunny.Service/Job/JobService/SimpleJobService.cs new file mode 100644 index 0000000..9ba9561 --- /dev/null +++ b/Bunny.Service/Job/JobService/SimpleJobService.cs @@ -0,0 +1,36 @@ +using Microsoft.AspNetCore.Builder; +using Quartz; +using Quartz.Impl; + +namespace Bunny.Service.Job.JobService; + +public static class SimpleJobService +{ + public static void AddCreateSimpleJobService(this WebApplicationBuilder builder) + { + var schedulerFactory = new StdSchedulerFactory(); + // TODO 如果使用异步，必须使用await 和 async + // var scheduler = schedulerFactory.GetScheduler(); + var scheduler = schedulerFactory.GetScheduler().GetAwaiter().GetResult(); + + var jobDetail = JobBuilder.Create() + .UsingJobData("username", "用户名") + .UsingJobData("password", "密码") + .WithIdentity("simpleJob", "简单的JOB") + .Build(); + var trigger = TriggerBuilder.Create() + .WithIdentity("testTrigger", "测试发出器") + .StartNow() + // 每隔5秒执行一次，一共重复10次 + .WithSimpleSchedule(x => x.WithIntervalInSeconds(1).WithRepeatCount(10)) + .Build(); + + // 使用同步方法 + scheduler.ScheduleJob(jobDetail, trigger).GetAwaiter().GetResult(); + scheduler.Start().GetAwaiter().GetResult(); + + // TODO 使用异步 + // await _scheduler.ScheduleJob(jobDetail, trigger); + // await _scheduler.Start(); + } +} \ No newline at end of file diff --git a/Bunny.Service/Job/SimJob.cs b/Bunny.Service/Job/SimpleJob.cs similarity index 93% rename from Bunny.Service/Job/SimJob.cs rename to Bunny.Service/Job/SimpleJob.cs index 13925e0..8649433 100644 --- a/Bunny.Service/Job/SimJob.cs +++ b/Bunny.Service/Job/SimpleJob.cs @@ -2,7 +2,7 @@ namespace Bunny.Service.Job; -public class SimJob : IJob +public class SimpleJob : IJob { public Task Execute(IJobExecutionContext context) { diff --git a/Bunny.WebApi/Config/BaseConfig.cs b/Bunny.WebApi/Config/BaseConfig.cs index 18d19ea..5bf3015 100644 --- a/Bunny.WebApi/Config/BaseConfig.cs +++ b/Bunny.WebApi/Config/BaseConfig.cs @@ -11,40 +11,22 @@ public class BaseConfig(WebApplicationBuilder builder) /// public void Initialize() { - // 注入服务依赖、Host服务、插件等 - AddApplicationService(); - // 使用扩展，第三方如Redis、Minio、SQLSugar - UseExtend(); // 配置跨域 UseCors(); - } - - /// - /// 注入控制器、服务依赖、Host服务等 - /// - private void AddApplicationService() - { // 配置日志相关 // builder.Logging.AddLog4Net("Config/log4net.config"); - // 添加Service服务 - builder.AddApplicationServices(); - // 添加后台服务 - builder.AddApplicationBackendServices(); // 添加使用自定义配置文件 builder.Services.AddSingleton(new AppSettings(builder.Configuration)); // 添加 SignalR builder.Services.AddSignalR(); + // 添加Service服务 + builder.AddApplicationServices(); + // 添加后台服务 + builder.AddApplicationBackendServices(); // 添加验证码 builder.AddCaptcha(); - } - - /// - /// 扩展服务 - /// - private void UseExtend() - { // 设置过滤器 - builder.FilterConfigInitialize(); + builder.AddFilterConfigInitialize(); // 初始化Redis builder.AddRedisContext(); // 初始化Minio diff --git a/Bunny.WebApi/Config/FilterConfig.cs b/Bunny.WebApi/Config/FilterConfig.cs deleted file mode 100644 index 1a93188..0000000 --- a/Bunny.WebApi/Config/FilterConfig.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Bunny.Common.Filter; -using Bunny.Service.Filter; - -namespace Bunny.WebApi.Config; - -public static class FilterConfig -{ - /// - /// 配置过滤器 - /// - /// - public static void FilterConfigInitialize(this WebApplicationBuilder builder) - { - // 添加自定义过滤器---全局异常捕获 - builder.Services.AddControllers(option => - { - option.Filters.Add(); - option.Filters.Add(); - }); - } -} \ No newline at end of file diff --git a/Bunny.WebApi/Config/PluginConfig.cs b/Bunny.WebApi/Config/PluginConfig.cs deleted file mode 100644 index 93c5f3e..0000000 --- a/Bunny.WebApi/Config/PluginConfig.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Lazy.Captcha.Core; -using Lazy.Captcha.Core.Generator; -using SkiaSharp; - -namespace Bunny.WebApi.Config; - -public static class PluginConfig -{ - public static void AddCaptcha(this WebApplicationBuilder builder) - { - var service = builder.Services; - // 使用图形验证码 - service.AddDistributedMemoryCache(); - // 验证码相关配置内容 - service.AddCaptcha(options => - { - options.CaptchaType = CaptchaType.DEFAULT; // 验证码类型 - options.CodeLength = 4; // 验证码长度 - options.ExpirySeconds = 60; // 过期时间(单位/秒) - options.IgnoreCase = true; // 比较忽略大小写 - options.ImageOption.Animation = true; // 是否启用动画 - options.ImageOption.Width = 130; // 验证码宽度 - options.ImageOption.Height = 48; // 验证码高度 - options.ImageOption.BackgroundColor = SKColors.White; - options.ImageOption.BubbleCount = 6; // 气泡数量 - options.ImageOption.BubbleMinRadius = 2; // 气泡最小半径 - options.ImageOption.BubbleMaxRadius = 6; // 气泡最大半径 - options.ImageOption.BubbleThickness = 2; // 气泡边沿厚度 - options.ImageOption.InterferenceLineCount = 2; // 干扰线数量 - options.ImageOption.FontSize = 36; // 字体大小 - options.ImageOption.FontFamily = DefaultFontFamilys.Instance.Kaiti; // 字体，中文使用kaiti，其他字符可根据喜好设置 - }); - } -} \ No newline at end of file diff --git a/Bunny.WebApi/Config/ServiceRegistration.cs b/Bunny.WebApi/Config/ServiceRegistration.cs index b2e22a8..9398b0c 100644 --- a/Bunny.WebApi/Config/ServiceRegistration.cs +++ b/Bunny.WebApi/Config/ServiceRegistration.cs @@ -1,6 +1,12 @@ using Bunny.Common.Connect; +using Bunny.Common.Filter; +using Bunny.Service.Filter; using Bunny.Service.IService; using Bunny.Service.IService.Service; +using Bunny.Service.Job.JobService; +using Lazy.Captcha.Core; +using Lazy.Captcha.Core.Generator; +using SkiaSharp; namespace Bunny.WebApi.Config; @@ -20,11 +26,59 @@ public static class ServiceRegistration /// /// 注入后台服务相关 + /// 用于添加所以Job服务，之后在BaseConfig中进行调用 /// /// public static void AddApplicationBackendServices(this WebApplicationBuilder builder) { // 测试注入后台服务 - // builder.Services.AddHostedService(); + // builder.Services.AddHostedService().Clear(); + // https://github.com/quartznet/quartznet/tree/main/database/tables + // builder.AddCreateSimpleJobService(); + builder.AddCronJobService(); + } + + /// + /// 配置过滤器 + /// + /// + public static void AddFilterConfigInitialize(this WebApplicationBuilder builder) + { + // 添加自定义过滤器---全局异常捕获 + builder.Services.AddControllers(option => + { + option.Filters.Add(); + option.Filters.Add(); + }); + } + + /// + /// 添加验证码配置内容 + /// + /// + public static void AddCaptcha(this WebApplicationBuilder builder) + { + var service = builder.Services; + // 使用图形验证码 + service.AddDistributedMemoryCache(); + // 验证码相关配置内容 + service.AddCaptcha(options => + { + options.CaptchaType = CaptchaType.DEFAULT; // 验证码类型 + options.CodeLength = 4; // 验证码长度 + options.ExpirySeconds = 60; // 过期时间(单位/秒) + options.IgnoreCase = true; // 比较忽略大小写 + options.ImageOption.Animation = true; // 是否启用动画 + options.ImageOption.Width = 130; // 验证码宽度 + options.ImageOption.Height = 48; // 验证码高度 + options.ImageOption.BackgroundColor = SKColors.White; + options.ImageOption.BubbleCount = 6; // 气泡数量 + options.ImageOption.BubbleMinRadius = 2; // 气泡最小半径 + options.ImageOption.BubbleMaxRadius = 6; // 气泡最大半径 + options.ImageOption.BubbleThickness = 2; // 气泡边沿厚度 + options.ImageOption.InterferenceLineCount = 2; // 干扰线数量 + options.ImageOption.FontSize = 36; // 字体大小 + options.ImageOption.FontFamily = DefaultFontFamilys.Instance.Kaiti; // 字体，中文使用kaiti，其他字符可根据喜好设置 + }); } } \ No newline at end of file diff --git a/Bunny.WebApi/bunny.db b/Bunny.WebApi/bunny.db new file mode 100644 index 0000000000000000000000000000000000000000..6bcda78a43c0321d5f310266d97f1098f6edc606 GIT binary patch literal 102400 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 Q2!H?xfB*=9K!(8o0MUlITmS$7 literal 0 HcmV?d00001