chore: 调整目录结构

This commit is contained in:
Fu Diwei
2025-11-24 14:06:04 +08:00
parent 27ee1d3b1e
commit ea653f6930
268 changed files with 175 additions and 169 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
package dispatcher
package dispatcher
import (
"context"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"context"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"context"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"context"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"errors"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"context"
+12 -12
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"crypto/x509"
@@ -18,7 +18,7 @@ import (
"github.com/xhit/go-str2duration/v2"
"github.com/certimate-go/certimate/internal/app"
"github.com/certimate-go/certimate/internal/certapply"
"github.com/certimate-go/certimate/internal/certacme"
"github.com/certimate-go/certimate/internal/domain"
"github.com/certimate-go/certimate/internal/repository"
"github.com/certimate-go/certimate/internal/tools/mproc"
@@ -209,7 +209,7 @@ func (ne *bizApplyNodeExecutor) checkCanSkip(execCtx *NodeExecutionContext, last
return false, ""
}
func (ne *bizApplyNodeExecutor) executeObtain(execCtx *NodeExecutionContext, nodeCfg *domain.WorkflowNodeConfigForBizApply, lastCertificate *domain.Certificate) (*certapply.ObtainCertificateResponse, error) {
func (ne *bizApplyNodeExecutor) executeObtain(execCtx *NodeExecutionContext, nodeCfg *domain.WorkflowNodeConfigForBizApply, lastCertificate *domain.Certificate) (*certacme.ObtainCertificateResponse, error) {
// 读取私钥算法
// 如果复用私钥,则保持算法一致
legoKeyType, err := domain.CertificateKeyAlgorithmType(nodeCfg.KeyAlgorithm).KeyType()
@@ -266,13 +266,13 @@ func (ne *bizApplyNodeExecutor) executeObtain(execCtx *NodeExecutionContext, nod
}
// 初始化 ACME 配置项
legoOptions := &certapply.ACMEConfigOptions{
legoOptions := &certacme.ACMEConfigOptions{
CAProvider: nodeCfg.CAProvider,
CAAccessConfig: caAccessConfig,
CAProviderConfig: nodeCfg.CAProviderConfig,
CertifierKeyType: legoKeyType,
}
legoConfig, err := certapply.NewACMEConfig(legoOptions)
legoConfig, err := certacme.NewACMEConfig(legoOptions)
if err != nil {
ne.logger.Warn("could not initialize acme config")
return nil, err
@@ -282,7 +282,7 @@ func (ne *bizApplyNodeExecutor) executeObtain(execCtx *NodeExecutionContext, nod
// 初始化 ACME 账户
// 注意此步骤仍需在主进程中进行,以保证并发安全
legoUser, err := certapply.NewACMEAccountWithSingleFlight(legoConfig, nodeCfg.ContactEmail)
legoUser, err := certacme.NewACMEAccountWithSingleFlight(legoConfig, nodeCfg.ContactEmail)
if err != nil {
ne.logger.Warn("could not initialize acme account")
return nil, err
@@ -291,7 +291,7 @@ func (ne *bizApplyNodeExecutor) executeObtain(execCtx *NodeExecutionContext, nod
}
// 构造证书申请请求
obtainReq := &certapply.ObtainCertificateRequest{
obtainReq := &certacme.ObtainCertificateRequest{
Domains: nodeCfg.Domains,
PrivateKeyType: legoKeyType,
PrivateKeyPEM: lo.
@@ -364,12 +364,12 @@ func (ne *bizApplyNodeExecutor) executeObtain(execCtx *NodeExecutionContext, nod
// 如果启用多进程模式,发送指令
if useMultiProc {
type InData struct {
Account *certapply.ACMEAccount `json:"account,omitempty"`
Request *certapply.ObtainCertificateRequest `json:"request,omitempty"`
Account *certacme.ACMEAccount `json:"account,omitempty"`
Request *certacme.ObtainCertificateRequest `json:"request,omitempty"`
}
type OutData struct {
Response *certapply.ObtainCertificateResponse `json:"response"`
Response *certacme.ObtainCertificateResponse `json:"response"`
}
msender := mproc.NewSender[InData, OutData]("certapply", ne.logger)
@@ -390,8 +390,8 @@ func (ne *bizApplyNodeExecutor) executeObtain(execCtx *NodeExecutionContext, nod
}
// 初始化 ACME 客户端
legolog.Logger = certapply.NewLegoLogger(app.GetLogger())
legoClient, err := certapply.NewACMEClientWithAccount(legoUser, func(c *lego.Config) error {
legolog.Logger = certacme.NewLegoLogger(app.GetLogger())
legoClient, err := certacme.NewACMEClientWithAccount(legoUser, func(c *lego.Config) error {
c.UserAgent = "certimate"
c.Certificate.KeyType = legoKeyType
return nil
@@ -1,4 +1,4 @@
package engine
package engine
import (
"fmt"
@@ -6,7 +6,7 @@ import (
"maps"
"strings"
"github.com/certimate-go/certimate/internal/certdeploy"
"github.com/certimate-go/certimate/internal/certmgmt"
"github.com/certimate-go/certimate/internal/domain"
"github.com/certimate-go/certimate/internal/repository"
)
@@ -89,8 +89,8 @@ func (ne *bizDeployNodeExecutor) Execute(execCtx *NodeExecutionContext) (*NodeEx
}
// 部署证书
deployer := certdeploy.NewClient(certdeploy.WithLogger(ne.logger))
deployReq := &certdeploy.DeployCertificateRequest{
deployer := certmgmt.NewClient(certmgmt.WithLogger(ne.logger))
deployReq := &certmgmt.DeployCertificateRequest{
Provider: nodeCfg.Provider,
ProviderAccessConfig: providerAccessConfig,
ProviderExtendedConfig: nodeCfg.ProviderConfig,
@@ -1,4 +1,4 @@
package engine
package engine
import (
"crypto/x509"
@@ -1,4 +1,4 @@
package engine
package engine
import (
"fmt"
@@ -1,4 +1,4 @@
package engine
package engine
import (
"crypto/ecdsa"
@@ -1,4 +1,4 @@
package engine
package engine
import (
"errors"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"fmt"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"log/slog"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"log/slog"
@@ -1,4 +1,4 @@
package engine
package engine
import (
"errors"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"log/slog"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"github.com/certimate-go/certimate/internal/domain"
+1 -1
View File
@@ -1,4 +1,4 @@
package engine
package engine
import (
"fmt"