fix: different cronexpr rules between ui and pocketbase

internal/repository/workflow.go

@@ -24,7 +24,7 @@ func (r *WorkflowRepository) ListEnabledAuto(ctx context.Context) ([]*domain.Wor
 		"enabled={:enabled} && trigger={:trigger}",
 		"-created",
 		0, 0,
-		dbx.Params{"enabled": true, "trigger": domain.WorkflowTriggerTypeAuto},
+		dbx.Params{"enabled": true, "trigger": string(domain.WorkflowTriggerTypeAuto)},
 	)
 	if err != nil {
 		return nil, err

internal/scheduler/certificate.go

@@ -6,6 +6,6 @@ type certificateService interface {
 	InitSchedule(ctx context.Context) error
 }
 
-func NewCertificateScheduler(service certificateService) error {
+func InitCertificateScheduler(service certificateService) error {
 	return service.InitSchedule(context.Background())
 }

internal/scheduler/scheduler.go

@@ -1,6 +1,7 @@
 package scheduler
 
 import (
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/certificate"
 	"github.com/usual2970/certimate/internal/repository"
 	"github.com/usual2970/certimate/internal/workflow"
@@ -14,7 +15,11 @@ func Register() {
 	certificateRepo := repository.NewCertificateRepository()
 	certificateSvc := certificate.NewCertificateService(certificateRepo)
 
-	NewCertificateScheduler(certificateSvc)
+	if err := InitWorkflowScheduler(workflowSvc); err != nil {
+		app.GetLogger().Error("failed to init workflow scheduler", "err", err)
+	}
 
-	NewWorkflowScheduler(workflowSvc)
+	if err := InitCertificateScheduler(certificateSvc); err != nil {
+		app.GetLogger().Error("failed to init certificate scheduler", "err", err)
+	}
 }

internal/scheduler/workflow.go

@@ -6,6 +6,6 @@ type workflowService interface {
 	InitSchedule(ctx context.Context) error
 }
 
-func NewWorkflowScheduler(service workflowService) error {
+func InitWorkflowScheduler(service workflowService) error {
 	return service.InitSchedule(context.Background())
 }

internal/workflow/dispatcher/dispatcher.go

@@ -92,6 +92,7 @@ func (w *WorkflowDispatcher) Dispatch(data *WorkflowWorkerData) {
 	}
 
 	w.enqueueWorker(data)
+
 	select {
 	case w.chWork <- data:
 	default:
@@ -138,6 +139,11 @@ func (w *WorkflowDispatcher) Shutdown() {
 	w.queueMutex.Unlock()
 
 	// 等待所有正在执行的 WorkflowRun 完成
+	w.workerMutex.Lock()
+	for _, worker := range w.workers {
+		worker.Cancel()
+	}
+	w.workerMutex.Unlock()
 	w.wg.Wait()
 	w.workers = make(map[string]*workflowWorker)
 	w.workerIdMap = make(map[string]string)

internal/workflow/event.go

@@ -72,7 +72,6 @@ func onWorkflowRecordCreateOrUpdate(ctx context.Context, record *core.Record) er
 		})
 	})
 	if err != nil {
-		app.GetLogger().Error("add cron job failed", "err", err)
 		return fmt.Errorf("add cron job failed: %w", err)
 	}
 

internal/workflow/service.go

@@ -48,6 +48,8 @@ func (s *WorkflowService) InitSchedule(ctx context.Context) error {
 
 	scheduler := app.GetScheduler()
 	for _, workflow := range workflows {
+		var errs []error
+
 		err := scheduler.Add(fmt.Sprintf("workflow#%s", workflow.Id), workflow.TriggerCron, func() {
 			s.StartRun(ctx, &dtos.WorkflowStartRunReq{
 				WorkflowId: workflow.Id,
@@ -55,7 +57,11 @@ func (s *WorkflowService) InitSchedule(ctx context.Context) error {
 			})
 		})
 		if err != nil {
-			return err
+			errs = append(errs, err)
+		}
+
+		if len(errs) > 0 {
+			return errors.Join(errs...)
 		}
 	}