|
|
@@ -101,27 +101,29 @@ func (s *sysJob) JobStart(job *model.SysJob) error {
|
|
|
}
|
|
|
//传参
|
|
|
paramArr := strings.Split(job.JobParams, "|")
|
|
|
+ g.Log().Infof(job.JobParams)
|
|
|
TimeTaskList.EditParams(f.FuncName, paramArr)
|
|
|
- rs := gcron.Search(job.InvokeTarget)
|
|
|
- if rs == nil {
|
|
|
- if job.MisfirePolicy == 1 {
|
|
|
- t, err := gcron.AddSingleton(job.CronExpression, f.Run, job.InvokeTarget)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
- if t == nil {
|
|
|
- return gerror.New("启动任务失败")
|
|
|
- }
|
|
|
- } else {
|
|
|
- t, err := gcron.AddOnce(job.CronExpression, f.Run, job.InvokeTarget)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
- if t == nil {
|
|
|
- return gerror.New("启动任务失败")
|
|
|
- }
|
|
|
+ //rs := gcron.Search(job.InvokeTarget)
|
|
|
+ //if rs == nil {
|
|
|
+ if job.MisfirePolicy == 1 {
|
|
|
+ t, err := gcron.Add(job.CronExpression, f.Run, job.InvokeTarget)
|
|
|
+ //t, err := gcron.AddSingleton(job.CronExpression, f.Run, job.InvokeTarget)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ if t == nil {
|
|
|
+ return gerror.New("启动任务失败")
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ t, err := gcron.AddOnce(job.CronExpression, f.Run, job.InvokeTarget)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ if t == nil {
|
|
|
+ return gerror.New("启动任务失败")
|
|
|
}
|
|
|
}
|
|
|
+ //}
|
|
|
gcron.Start(job.InvokeTarget)
|
|
|
if job.MisfirePolicy == 1 {
|
|
|
job.Status = 0
|