xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

单例redis、rabbitmq更新、任务调度更新

Browse Source
This commit is contained in:
陈淳
2022-08-13 18:10:11 +08:00
parent 7fe9a6c900
commit 63920e034a
5 changed files with 95 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
Yi.Framework.Net6/Yi.Framework.Core/Quartz/QuartzInvoker.cs
View File

@@ -18,6 +18,8 @@ namespace Yi.Framework.Core
private IScheduler _scheduler;
private ILogger<QuartzInvoker> _logger;
private IJobFactory _jobFactory;
private const string JobDllName = "Yi.Framework.Job";
public QuartzInvoker(ISchedulerFactory schedulerFactory, ILogger<QuartzInvoker> logger, IJobFactory jobFactory)
{
_schedulerFactory = schedulerFactory;
@@ -29,27 +31,28 @@ namespace Yi.Framework.Core
/// 开始任务
/// </summary>
/// <param name="cron"></param>
/// <param name="jobKey"></param>
/// <param name="jobClass"></param>
/// <param name="jobName"></param>
/// <param name="jobGroup"></param>
/// <param name="second"></param>
/// <param name="data"></param>
/// <returns></returns>
public async Task start(string cron, JobKey jobKey, string dllName,string jobClass, long second = 0, IDictionary<string, object> data = null)
public async Task StartAsync(string cron, string jobClass, string jobName = "", string jobGroup = "default", long startAtSecondTime = 0, IDictionary<string, object> data = null)
{
jobName = jobName == "" ? jobClass : jobName;
if (data == null)
{
data = new Dictionary<string, object>();
}
var myClass = AssemblyHelper.GetClass(dllName, jobClass).FirstOrDefault();
JobKey jobKey = new JobKey(jobName, jobGroup);
var myClass = AssemblyHelper.GetClass(JobDllName, jobClass).FirstOrDefault();
_scheduler = await _schedulerFactory.GetScheduler();
_scheduler.JobFactory = _jobFactory;
//开启调度器
await _scheduler.Start();
//创建一个触发器
var trigger = TriggerBuilder.Create()
.StartAt(DateTimeOffset.Now.AddSeconds(second))
.StartAt(DateTimeOffset.Now.AddSeconds(startAtSecondTime))
.WithCronSchedule(cron)
.Build();
//创建任务
@@ -57,18 +60,78 @@ namespace Yi.Framework.Core
.UsingJobData(new JobDataMap(data))
.WithIdentity(jobKey.Name, jobKey.Group)
.Build();
//await _scheduler.AddJob(jobDetail,false);
//await _scheduler.ScheduleJob(trigger);
//将触发器和任务器绑定到调度器中
await _scheduler.ScheduleJob(jobDetail, trigger);
//开启调度器
await _scheduler.Start();
_logger.LogWarning($"开始任务:{jobKey.Name},组别：{jobKey.Group}");
}
/// <summary>
/// 开始任务
/// </summary>
/// <param name="cron"></param>
/// <param name="jobClass"></param>
/// <param name="jobName"></param>
/// <param name="jobGroup"></param>
/// <param name="second"></param>
/// <param name="data"></param>
/// <returns></returns>
public async Task StartAsync(int milliSecondTime, string jobClass, string jobName = "", string jobGroup = "default", long startAtSecondTime = 0, IDictionary<string, object> data = null)
{
jobName = jobName == "" ? jobClass : jobName;
if (data == null)
{
data = new Dictionary<string, object>();
}
JobKey jobKey = new JobKey(jobName, jobGroup);
var myClass = AssemblyHelper.GetClass(JobDllName, jobClass).FirstOrDefault();
_scheduler = await _schedulerFactory.GetScheduler();
_scheduler.JobFactory = _jobFactory;
//创建一个触发器
var trigger = TriggerBuilder.Create()
.StartAt(DateTimeOffset.Now.AddSeconds(startAtSecondTime))
.WithSimpleSchedule(option =>
{
option.WithInterval(TimeSpan.FromMilliseconds(milliSecondTime)).RepeatForever();
})
.Build();
//创建任务
var jobDetail = JobBuilder.Create(myClass)
.UsingJobData(new JobDataMap(data))
.WithIdentity(jobKey.Name, jobKey.Group)
.Build();
//await _scheduler.AddJob(jobDetail,false);
//await _scheduler.ScheduleJob(trigger);
//将触发器和任务器绑定到调度器中
await _scheduler.ScheduleJob(jobDetail, trigger);
//开启调度器
await _scheduler.Start();
_logger.LogWarning($"开始任务:{jobKey.Name},组别：{jobKey.Group}");
}
/// <summary>
/// 暂停任务
/// </summary>
/// <param name="jobKey"></param>
/// <returns></returns>
public async Task Stop(JobKey jobKey)
public async Task StopAsync(JobKey jobKey)
{
var _scheduler = await _schedulerFactory.GetScheduler();
//LogUtil.Debug($"暂停任务{jobKey.Group},{jobKey.Name}");
@@ -77,7 +140,7 @@ namespace Yi.Framework.Core
}
public async Task Delete(JobKey jobKey)
public async Task DeleteAsync(JobKey jobKey)
{
var _scheduler = await _schedulerFactory.GetScheduler();
//LogUtil.Debug($"暂停任务{jobKey.Group},{jobKey.Name}");
@@ -85,7 +148,7 @@ namespace Yi.Framework.Core
_logger.LogWarning($"删除任务:{jobKey.Name},组别：{jobKey.Group}");
}
public async Task Resume(JobKey jobKey)
public async Task ResumeAsync(JobKey jobKey)
{
var _scheduler = await _schedulerFactory.GetScheduler();
//LogUtil.Debug($"恢复任务{jobKey.Group},{jobKey.Name}");
@@ -98,9 +161,9 @@ namespace Yi.Framework.Core
/// 得到可运行的job列表
/// </summary>
/// <returns></returns>
public List<string> getJobClassList()
public List<string> GetJobClassList()
{
var myClassList = AssemblyHelper.GetClass("Yi.Framework.Job");
var myClassList = AssemblyHelper.GetClass("ETX.Job");
List<string> data = new List<string>();
myClassList.ForEach(k => data.Add(k.Name));
return data;
@@ -126,9 +189,9 @@ namespace Yi.Framework.Core
foreach (ITrigger trigger in triggers)
{
///下一次的执行时间
var utcTime =trigger.GetNextFireTimeUtc();
var utcTime = trigger.GetNextFireTimeUtc();
string str = utcTime.ToString();
//TimeZone.CurrentTimeZone.ToLocalTime(Convert.ToDateTime(str));
//TimeZone.CurrentTimeZone.ToLocalTime(Convert.ToDateTime(str));
}
@@ -142,7 +205,7 @@ namespace Yi.Framework.Core
public class JobKeyModel
{
{
public JobKey jobKey { get; set; }
public DateTime? nextTime { get; set; }
}