From 8cf1ffd38b605ae4e7399bf4e6b52392d8239f46 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Sun, 5 Jan 2025 01:27:21 +0800 Subject: [PATCH] fix: couldn't get certificate effect time or expire time --- internal/repository/workflow.go | 2 +- internal/repository/workflow_output.go | 4 ++-- internal/workflow/node-processor/apply_node.go | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/repository/workflow.go b/internal/repository/workflow.go index 31e1e606..7c0fc46e 100644 --- a/internal/repository/workflow.go +++ b/internal/repository/workflow.go @@ -121,7 +121,7 @@ func record2Workflow(record *models.Record) (*domain.Workflow, error) { HasDraft: record.GetBool("hasDraft"), LastRunId: record.GetString("lastRunId"), LastRunStatus: domain.WorkflowRunStatusType(record.GetString("lastRunStatus")), - LastRunTime: record.GetTime("lastRunTime"), + LastRunTime: record.GetDateTime("lastRunTime").Time(), } return workflow, nil } diff --git a/internal/repository/workflow_output.go b/internal/repository/workflow_output.go index 5a8c2c77..074dd85d 100644 --- a/internal/repository/workflow_output.go +++ b/internal/repository/workflow_output.go @@ -81,8 +81,8 @@ func (w *WorkflowOutputRepository) GetCertificateByNodeId(ctx context.Context, n Certificate: record.GetString("certificate"), PrivateKey: record.GetString("privateKey"), IssuerCertificate: record.GetString("issuerCertificate"), - EffectAt: record.GetTime("effectAt"), - ExpireAt: record.GetTime("expireAt"), + EffectAt: record.GetDateTime("effectAt").Time(), + ExpireAt: record.GetDateTime("expireAt").Time(), ACMECertUrl: record.GetString("acmeCertUrl"), ACMECertStableUrl: record.GetString("acmeCertStableUrl"), WorkflowId: record.GetString("workflowId"), diff --git a/internal/workflow/node-processor/apply_node.go b/internal/workflow/node-processor/apply_node.go index 15466c95..336cbbd7 100644 --- a/internal/workflow/node-processor/apply_node.go +++ b/internal/workflow/node-processor/apply_node.go @@ -41,7 +41,8 @@ type WorkflowOutputRepository interface { // 申请节点根据申请类型执行不同的操作 func (a *applyNode) Run(ctx context.Context) error { a.AddOutput(ctx, a.node.Name, "开始执行") - // 查询是否申请过，已申请过则直接返回（先保持和 v0.2 一致） + // 查询是否申请过，已申请过则直接返回 + // TODO: 先保持和 v0.2 一致，后续增加是否强制申请的参数 output, err := a.outputRepo.GetByNodeId(ctx, a.node.Id) if err != nil && !domain.IsRecordNotFound(err) { a.AddOutput(ctx, a.node.Name, "查询申请记录失败", err.Error())