opensource/certimate
3
0
Fork 0
mirror of https://github.com/certimate-go/certimate.git synced 2026-09-01 15:39:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: clean code

Browse Source
This commit is contained in:
Fu Diwei
2026-01-20 14:51:05 +08:00
parent 1120187b2f
commit 8597cfc595
12 changed files with 82 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/domain/access.go
+6 -8
View File
@@ -1,18 +1,16 @@
package domain
import (
"time"
)
import "time"
const CollectionNameAccess = "access"
type Access struct {
Meta
Name string `json:"name" db:"name"`
Provider string `json:"provider" db:"provider"`
Config map[string]any `json:"config" db:"config"`
Reserve string `json:"reserve,omitempty" db:"reserve"`
DeletedAt *time.Time `json:"deleted" db:"deleted"`
Name string `db:"name" json:"name"`
Provider string `db:"provider" json:"provider"`
Config map[string]any `db:"config" json:"config"`
Reserve string `db:"reserve" json:"reserve,omitempty"`
DeletedAt *time.Time `db:"deleted" json:"deleted"`
}
type AccessConfigFor1Panel struct {
internal/domain/acme_account.go
+6 -6
View File
@@ -13,12 +13,12 @@ const CollectionNameACMEAccount = "acme_accounts"
type ACMEAccount struct {
Meta
CA string `json:"ca" db:"ca"`
Email string `json:"email" db:"email"`
PrivateKey string `json:"privateKey" db:"privateKey"`
ACMEAccount *acme.Account `json:"acmeAccount" db:"acmeAccount"`
ACMEAcctUrl string `json:"acmeAcctUrl" db:"acmeAcctUrl"`
ACMEDirUrl string `json:"acmeDirUrl" db:"acmeDirUrl"`
CA string `db:"ca" json:"ca"`
Email string `db:"email" json:"email"`
PrivateKey string `db:"privateKey" json:"privateKey"`
ACMEAccount *acme.Account `db:"acmeAccount" json:"acmeAccount"`
ACMEAcctUrl string `db:"acmeAcctUrl" json:"acmeAcctUrl"`
ACMEDirUrl string `db:"acmeDirUrl" json:"acmeDirUrl"`
}
func (a *ACMEAccount) GetEmail() string {
internal/domain/certificate.go
+20 -20
View File
@@ -17,26 +17,26 @@ const CollectionNameCertificate = "certificate"
type Certificate struct {
Meta
Source CertificateSourceType `json:"source" db:"source"`
SubjectAltNames string `json:"subjectAltNames" db:"subjectAltNames"`
SerialNumber string `json:"serialNumber" db:"serialNumber"`
Certificate string `json:"certificate" db:"certificate"`
PrivateKey string `json:"privateKey" db:"privateKey"`
IssuerOrg string `json:"issuerOrg" db:"issuerOrg"`
IssuerCertificate string `json:"issuerCertificate" db:"issuerCertificate"`
KeyAlgorithm CertificateKeyAlgorithmType `json:"keyAlgorithm" db:"keyAlgorithm"`
ValidityNotBefore time.Time `json:"validityNotBefore" db:"validityNotBefore"`
ValidityNotAfter time.Time `json:"validityNotAfter" db:"validityNotAfter"`
ValidityInterval int32 `json:"validityInterval" db:"validityInterval"`
ACMEAcctUrl string `json:"acmeAcctUrl" db:"acmeAcctUrl"`
ACMECertUrl string `json:"acmeCertUrl" db:"acmeCertUrl"`
ACMECertStableUrl string `json:"acmeCertStableUrl" db:"acmeCertStableUrl"`
IsRenewed bool `json:"isRenewed" db:"isRenewed"`
IsRevoked bool `json:"isRevoked" db:"isRevoked"`
WorkflowId string `json:"workflowId" db:"workflowRef"`
WorkflowRunId string `json:"workflowRunId" db:"workflowRunRef"`
WorkflowNodeId string `json:"workflowNodeId" db:"workflowNodeId"`
DeletedAt *time.Time `json:"deleted" db:"deleted"`
Source CertificateSourceType `db:"source" json:"source"`
SubjectAltNames string `db:"subjectAltNames" json:"subjectAltNames"`
SerialNumber string `db:"serialNumber" json:"serialNumber"`
Certificate string `db:"certificate" json:"certificate"`
PrivateKey string `db:"privateKey" json:"privateKey"`
IssuerOrg string `db:"issuerOrg" json:"issuerOrg"`
IssuerCertificate string `db:"issuerCertificate" json:"issuerCertificate"`
KeyAlgorithm CertificateKeyAlgorithmType `db:"keyAlgorithm" json:"keyAlgorithm"`
ValidityNotBefore time.Time `db:"validityNotBefore" json:"validityNotBefore"`
ValidityNotAfter time.Time `db:"validityNotAfter" json:"validityNotAfter"`
ValidityInterval int32 `db:"validityInterval" json:"validityInterval"`
ACMEAcctUrl string `db:"acmeAcctUrl" json:"acmeAcctUrl"`
ACMECertUrl string `db:"acmeCertUrl" json:"acmeCertUrl"`
ACMECertStableUrl string `db:"acmeCertStableUrl" json:"acmeCertStableUrl"`
IsRenewed bool `db:"isRenewed" json:"isRenewed"`
IsRevoked bool `db:"isRevoked" json:"isRevoked"`
WorkflowId string `db:"workflowRef" json:"workflowId"`
WorkflowRunId string `db:"workflowRunRef" json:"workflowRunId"`
WorkflowNodeId string `db:"workflowNodeId" json:"workflowNodeId"`
DeletedAt *time.Time `db:"deleted" json:"deleted"`
}
func (c *Certificate) PopulateFromX509(certX509 *x509.Certificate) *Certificate {
internal/domain/meta.go
+3 -3
View File
@@ -3,7 +3,7 @@ package domain
import "time"
type Meta struct {
Id string `json:"id" db:"id"`
CreatedAt time.Time `json:"created" db:"created"`
UpdatedAt time.Time `json:"updated" db:"updated"`
Id string `db:"id" json:"id"`
CreatedAt time.Time `db:"created" json:"created"`
UpdatedAt time.Time `db:"updated" json:"updated"`
}
internal/domain/provider.go
+1
View File
@@ -327,6 +327,7 @@ const (
DeploymentProviderTypeQiniuKodo = DeploymentProviderType(AccessProviderTypeQiniu + "-kodo")
DeploymentProviderTypeQiniuPili = DeploymentProviderType(AccessProviderTypeQiniu + "-pili")
DeploymentProviderTypeRainYunRCDN = DeploymentProviderType(AccessProviderTypeRainYun + "-rcdn")
DeploymentProviderTypeRainYunSSLCenter = DeploymentProviderType(AccessProviderTypeRainYun + "-sslcenter")
DeploymentProviderTypeRatPanel = DeploymentProviderType(AccessProviderTypeRatPanel)
DeploymentProviderTypeRatPanelConsole = DeploymentProviderType(AccessProviderTypeRatPanel + "-console")
DeploymentProviderTypeS3 = DeploymentProviderType(AccessProviderTypeS3)
internal/domain/settings.go
+2 -2
View File
@@ -8,8 +8,8 @@ const CollectionNameSettings = "settings"
type Settings struct {
Meta
Name string `json:"name" db:"name"`
Content SettingsContent `json:"content" db:"content"`
Name string `db:"name" json:"name"`
Content SettingsContent `db:"content" json:"content"`
}
const (
internal/domain/workflow.go
+12 -12
View File
@@ -16,18 +16,18 @@ const CollectionNameWorkflow = "workflow"
type Workflow struct {
Meta
Name string `json:"name" db:"name"`
Description string `json:"description" db:"description"`
Trigger WorkflowTriggerType `json:"trigger" db:"trigger"`
TriggerCron string `json:"triggerCron" db:"triggerCron"`
Enabled bool `json:"enabled" db:"enabled"`
GraphDraft *WorkflowGraph `json:"graphDraft" db:"graphDraft"`
GraphContent *WorkflowGraph `json:"graphContent" db:"graphContent"`
HasDraft bool `json:"hasDraft" db:"hasDraft"`
HasContent bool `json:"hasContent" db:"hasContent"`
LastRunId string `json:"lastRunId" db:"lastRunRef"`
LastRunStatus WorkflowRunStatusType `json:"lastRunStatus" db:"lastRunStatus"`
LastRunTime time.Time `json:"lastRunTime" db:"lastRunTime"`
Name string `db:"name" json:"name"`
Description string `db:"description" json:"description"`
Trigger WorkflowTriggerType `db:"trigger" json:"trigger"`
TriggerCron string `db:"triggerCron" json:"triggerCron"`
Enabled bool `db:"enabled" json:"enabled"`
GraphDraft *WorkflowGraph `db:"graphDraft" json:"graphDraft"`
GraphContent *WorkflowGraph `db:"graphContent" json:"graphContent"`
HasDraft bool `db:"hasDraft" json:"hasDraft"`
HasContent bool `db:"hasContent" json:"hasContent"`
LastRunId string `db:"lastRunRef" json:"lastRunId"`
LastRunStatus WorkflowRunStatusType `db:"lastRunStatus" json:"lastRunStatus"`
LastRunTime time.Time `db:"lastRunTime" json:"lastRunTime"`
}
type WorkflowGraph struct {
internal/domain/workflow_log.go
+8 -8
View File
@@ -9,14 +9,14 @@ const CollectionNameWorkflowLog = "workflow_logs"
type WorkflowLog struct {
Meta
WorkflowId string `json:"workflowId" db:"workflowRef"`
RunId string `json:"runId" db:"runRef"`
NodeId string `json:"nodeId" db:"nodeId"`
NodeName string `json:"nodeName" db:"nodeName"`
Timestamp int64 `json:"timestamp" db:"timestamp"` // 毫秒级时间戳
Level int32 `json:"level" db:"level"`
Message string `json:"message" db:"message"`
Data map[string]any `json:"data" db:"data"`
WorkflowId string `db:"workflowRef" json:"workflowId"`
RunId string `db:"runRef" json:"runId"`
NodeId string `db:"nodeId" json:"nodeId"`
NodeName string `db:"nodeName" json:"nodeName"`
TimestampMilli int64 `db:"timestamp" json:"timestamp"`
Level int32 `db:"level" json:"level"`
Message string `db:"message" json:"message"`
Data map[string]any `db:"data" json:"data"`
}
type WorkflowLogs []WorkflowLog
internal/domain/workflow_output.go
+6 -6
View File
@@ -4,12 +4,12 @@ const CollectionNameWorkflowOutput = "workflow_output"
type WorkflowOutput struct {
Meta
WorkflowId string `json:"workflowId" db:"workflowRef"`
RunId string `json:"runId" db:"runRef"`
NodeId string `json:"nodeId" db:"nodeId"`
NodeConfig WorkflowNodeConfig `json:"nodeConfig" db:"nodeConfig"`
Outputs []*WorkflowOutputEntry `json:"outputs" db:"outputs"`
Succeeded bool `json:"succeeded" db:"succeeded"`
WorkflowId string `db:"workflowRef" json:"workflowId"`
RunId string `db:"runRef" json:"runId"`
NodeId string `db:"nodeId" json:"nodeId"`
NodeConfig WorkflowNodeConfig `db:"nodeConfig" json:"nodeConfig"`
Outputs []*WorkflowOutputEntry `db:"outputs" json:"outputs"`
Succeeded bool `db:"succeeded" json:"succeeded"`
}
type WorkflowOutputEntry struct {
internal/domain/workflow_run.go
+7 -7
View File
@@ -8,13 +8,13 @@ const CollectionNameWorkflowRun = "workflow_run"
type WorkflowRun struct {
Meta
WorkflowId string `json:"workflowId" db:"workflowRef"`
Status WorkflowRunStatusType `json:"status" db:"status"`
Trigger WorkflowTriggerType `json:"trigger" db:"trigger"`
StartedAt time.Time `json:"startedAt" db:"startedAt"`
EndedAt time.Time `json:"endedAt" db:"endedAt"`
Graph *WorkflowGraph `json:"graph" db:"graph"`
Error string `json:"error" db:"error"`
WorkflowId string `db:"workflowRef" json:"workflowId"`
Status WorkflowRunStatusType `db:"status" json:"status"`
Trigger WorkflowTriggerType `db:"trigger" json:"trigger"`
StartedAt time.Time `db:"startedAt" json:"startedAt"`
EndedAt time.Time `db:"endedAt" json:"endedAt"`
Graph *WorkflowGraph `db:"graph" json:"graph"`
Error string `db:"error" json:"error"`
}
type WorkflowRunStatusType string
internal/repository/workflow_log.go
+9 -9
View File
@@ -65,7 +65,7 @@ func (r *WorkflowLogRepository) Save(ctx context.Context, workflowLog *domain.Wo
record.Set("runRef", workflowLog.RunId)
record.Set("nodeId", workflowLog.NodeId)
record.Set("nodeName", workflowLog.NodeName)
record.Set("timestamp", workflowLog.Timestamp)
record.Set("timestamp", workflowLog.TimestampMilli)
record.Set("level", workflowLog.Level)
record.Set("message", workflowLog.Message)
record.Set("data", workflowLog.Data)
@@ -98,14 +98,14 @@ func (r *WorkflowLogRepository) castRecordToModel(record *core.Record) (*domain.
CreatedAt: record.GetDateTime("created").Time(),
UpdatedAt: record.GetDateTime("updated").Time(),
},
WorkflowId: record.GetString("workflowRef"),
RunId: record.GetString("runRef"),
NodeId: record.GetString("nodeId"),
NodeName: record.GetString("nodeName"),
Timestamp: int64(record.GetInt("timestamp")),
Level: int32(record.GetInt("level")),
Message: record.GetString("message"),
Data: logdata,
WorkflowId: record.GetString("workflowRef"),
RunId: record.GetString("runRef"),
NodeId: record.GetString("nodeId"),
NodeName: record.GetString("nodeName"),
TimestampMilli: int64(record.GetInt("timestamp")),
Level: int32(record.GetInt("level")),
Message: record.GetString("message"),
Data: logdata,
}
return workflowLog, nil
}
internal/workflow/dispatcher/dispatcher.go
+2 -2
View File
@@ -281,7 +281,7 @@ func (wd *workflowDispatcher) tryExecuteAsync(task *taskInfo) {
log.RunId = task.RunId
log.NodeId = node.Id
log.NodeName = node.Data.Name
log.Timestamp = time.Now().UnixMilli()
log.TimestampMilli = time.Now().UnixMilli()
log.Level = int32(slog.LevelError)
log.Message = err.Error()
log.CreatedAt = time.Now()
@@ -299,7 +299,7 @@ func (wd *workflowDispatcher) tryExecuteAsync(task *taskInfo) {
log.RunId = task.RunId
log.NodeId = node.Id
log.NodeName = node.Data.Name
log.Timestamp = record.Time.UnixMilli()
log.TimestampMilli = record.Time.UnixMilli()
log.Level = int32(record.Level)
log.Message = record.Message
log.Data = record.Data()