v0.2

internal/applicant/aliyun.go

@@ -3,6 +3,7 @@ package applicant
 import (
 	"certimate/internal/domain"
 	"encoding/json"
+	"fmt"
 	"os"
 
 	"github.com/go-acme/lego/v4/providers/dns/alidns"
@@ -25,6 +26,7 @@ func (a *aliyun) Apply() (*Certificate, error) {
 
 	os.Setenv("ALICLOUD_ACCESS_KEY", access.AccessKeyId)
 	os.Setenv("ALICLOUD_SECRET_KEY", access.AccessKeySecret)
+	os.Setenv("ALICLOUD_PROPAGATION_TIMEOUT", fmt.Sprintf("%d", a.option.Timeout))
 	dnsProvider, err := alidns.NewDNSProvider()
 	if err != nil {
 		return nil, err

internal/applicant/applicant.go

@@ -1,6 +1,7 @@
 package applicant
 
 import (
+	"certimate/internal/domain"
 	"certimate/internal/utils/app"
 	"crypto"
 	"crypto/ecdsa"
@@ -46,6 +47,8 @@ var sslProviderUrls = map[string]string{
 
 const defaultEmail = "536464346@qq.com"
 
+const defaultTimeout = 60
+
 type Certificate struct {
 	CertUrl           string `json:"certUrl"`
 	CertStableUrl     string `json:"certStableUrl"`
@@ -60,6 +63,7 @@ type ApplyOption struct {
 	Domain      string `json:"domain"`
 	Access      string `json:"access"`
 	Nameservers string `json:"nameservers"`
+	Timeout     int64  `json:"timeout"`
 }
 
 type MyUser struct {
@@ -83,8 +87,22 @@ type Applicant interface {
 }
 
 func Get(record *models.Record) (Applicant, error) {
-	access := record.ExpandedOne("access")
-	email := record.GetString("email")
+
+	if record.GetString("applyConfig") == "" {
+		return nil, errors.New("apply config is empty")
+	}
+
+	applyConfig := &domain.ApplyConfig{}
+
+	record.UnmarshalJSONField("applyConfig", applyConfig)
+
+	access, err := app.GetApp().Dao().FindRecordById("access", applyConfig.Access)
+
+	if err != nil {
+		return nil, fmt.Errorf("access record not found: %w", err)
+	}
+
+	email := applyConfig.Email
 	if email == "" {
 		email = defaultEmail
 	}
@@ -92,7 +110,8 @@ func Get(record *models.Record) (Applicant, error) {
 		Email:       email,
 		Domain:      record.GetString("domain"),
 		Access:      access.GetString("config"),
-		Nameservers: record.GetString("nameservers"),
+		Nameservers: applyConfig.Nameservers,
+		Timeout:     applyConfig.Timeout,
 	}
 	switch access.GetString("configType") {
 	case configTypeAliyun:

internal/applicant/cloudflare.go

@@ -3,6 +3,7 @@ package applicant
 import (
 	"certimate/internal/domain"
 	"encoding/json"
+	"fmt"
 	"os"
 
 	cf "github.com/go-acme/lego/v4/providers/dns/cloudflare"
@@ -23,6 +24,7 @@ func (c *cloudflare) Apply() (*Certificate, error) {
 	json.Unmarshal([]byte(c.option.Access), access)
 
 	os.Setenv("CLOUDFLARE_DNS_API_TOKEN", access.DnsApiToken)
+	os.Setenv("CLOUDFLARE_PROPAGATION_TIMEOUT", fmt.Sprintf("%d", c.option.Timeout))
 
 	provider, err := cf.NewDNSProvider()
 	if err != nil {

internal/applicant/godaddy.go

@@ -3,6 +3,7 @@ package applicant
 import (
 	"certimate/internal/domain"
 	"encoding/json"
+	"fmt"
 	"os"
 
 	godaddyProvider "github.com/go-acme/lego/v4/providers/dns/godaddy"
@@ -25,6 +26,7 @@ func (a *godaddy) Apply() (*Certificate, error) {
 
 	os.Setenv("GODADDY_API_KEY", access.ApiKey)
 	os.Setenv("GODADDY_API_SECRET", access.ApiSecret)
+	os.Setenv("GODADDY_PROPAGATION_TIMEOUT", fmt.Sprintf("%d", a.option.Timeout))
 
 	dnsProvider, err := godaddyProvider.NewDNSProvider()
 	if err != nil {

internal/applicant/huaweicloud.go

@@ -3,6 +3,7 @@ package applicant
 import (
 	"certimate/internal/domain"
 	"encoding/json"
+	"fmt"
 	"os"
 
 	huaweicloudProvider "github.com/go-acme/lego/v4/providers/dns/huaweicloud"
@@ -26,6 +27,8 @@ func (t *huaweicloud) Apply() (*Certificate, error) {
 	os.Setenv("HUAWEICLOUD_REGION", access.Region) // 华为云的 SDK 要求必须传一个区域，实际上 DNS-01 流程里用不到，但不传会报错
 	os.Setenv("HUAWEICLOUD_ACCESS_KEY_ID", access.AccessKeyId)
 	os.Setenv("HUAWEICLOUD_SECRET_ACCESS_KEY", access.SecretAccessKey)
+	os.Setenv("HUAWEICLOUD_PROPAGATION_TIMEOUT", fmt.Sprintf("%d", t.option.Timeout))
+	
 	dnsProvider, err := huaweicloudProvider.NewDNSProvider()
 	if err != nil {
 		return nil, err

internal/applicant/namesilo.go

@@ -3,6 +3,7 @@ package applicant
 import (
 	"certimate/internal/domain"
 	"encoding/json"
+	"fmt"
 	"os"
 
 	namesiloProvider "github.com/go-acme/lego/v4/providers/dns/namesilo"
@@ -24,6 +25,7 @@ func (a *namesilo) Apply() (*Certificate, error) {
 	json.Unmarshal([]byte(a.option.Access), access)
 
 	os.Setenv("NAMESILO_API_KEY", access.ApiKey)
+	os.Setenv("NAMESILO_PROPAGATION_TIMEOUT", fmt.Sprintf("%d", a.option.Timeout))
 
 	dnsProvider, err := namesiloProvider.NewDNSProvider()
 	if err != nil {

internal/applicant/tencent.go

@@ -3,6 +3,7 @@ package applicant
 import (
 	"certimate/internal/domain"
 	"encoding/json"
+	"fmt"
 	"os"
 
 	"github.com/go-acme/lego/v4/providers/dns/tencentcloud"
@@ -25,6 +26,8 @@ func (t *tencent) Apply() (*Certificate, error) {
 
 	os.Setenv("TENCENTCLOUD_SECRET_ID", access.SecretId)
 	os.Setenv("TENCENTCLOUD_SECRET_KEY", access.SecretKey)
+	os.Setenv("TENCENTCLOUD_PROPAGATION_TIMEOUT", fmt.Sprintf("%d", t.option.Timeout))
+	
 	dnsProvider, err := tencentcloud.NewDNSProvider()
 	if err != nil {
 		return nil, err