fix: couldn't get certificate effect time or expire time

This commit is contained in:
Fu Diwei 2025-01-05 01:27:21 +08:00
parent 3c70a4f455
commit 8cf1ffd38b
3 changed files with 5 additions and 4 deletions

View File

@ -121,7 +121,7 @@ func record2Workflow(record *models.Record) (*domain.Workflow, error) {
HasDraft: record.GetBool("hasDraft"), HasDraft: record.GetBool("hasDraft"),
LastRunId: record.GetString("lastRunId"), LastRunId: record.GetString("lastRunId"),
LastRunStatus: domain.WorkflowRunStatusType(record.GetString("lastRunStatus")), LastRunStatus: domain.WorkflowRunStatusType(record.GetString("lastRunStatus")),
LastRunTime: record.GetTime("lastRunTime"), LastRunTime: record.GetDateTime("lastRunTime").Time(),
} }
return workflow, nil return workflow, nil
} }

View File

@ -81,8 +81,8 @@ func (w *WorkflowOutputRepository) GetCertificateByNodeId(ctx context.Context, n
Certificate: record.GetString("certificate"), Certificate: record.GetString("certificate"),
PrivateKey: record.GetString("privateKey"), PrivateKey: record.GetString("privateKey"),
IssuerCertificate: record.GetString("issuerCertificate"), IssuerCertificate: record.GetString("issuerCertificate"),
EffectAt: record.GetTime("effectAt"), EffectAt: record.GetDateTime("effectAt").Time(),
ExpireAt: record.GetTime("expireAt"), ExpireAt: record.GetDateTime("expireAt").Time(),
ACMECertUrl: record.GetString("acmeCertUrl"), ACMECertUrl: record.GetString("acmeCertUrl"),
ACMECertStableUrl: record.GetString("acmeCertStableUrl"), ACMECertStableUrl: record.GetString("acmeCertStableUrl"),
WorkflowId: record.GetString("workflowId"), WorkflowId: record.GetString("workflowId"),

View File

@ -41,7 +41,8 @@ type WorkflowOutputRepository interface {
// 申请节点根据申请类型执行不同的操作 // 申请节点根据申请类型执行不同的操作
func (a *applyNode) Run(ctx context.Context) error { func (a *applyNode) Run(ctx context.Context) error {
a.AddOutput(ctx, a.node.Name, "开始执行") a.AddOutput(ctx, a.node.Name, "开始执行")
// 查询是否申请过,已申请过则直接返回(先保持和 v0.2 一致) // 查询是否申请过,已申请过则直接返回
// TODO: 先保持和 v0.2 一致,后续增加是否强制申请的参数
output, err := a.outputRepo.GetByNodeId(ctx, a.node.Id) output, err := a.outputRepo.GetByNodeId(ctx, a.node.Id)
if err != nil && !domain.IsRecordNotFound(err) { if err != nil && !domain.IsRecordNotFound(err) {
a.AddOutput(ctx, a.node.Name, "查询申请记录失败", err.Error()) a.AddOutput(ctx, a.node.Name, "查询申请记录失败", err.Error())