Merge remote-tracking branch 'origin/main'

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/go-rat/sessions v1.1.0
 	github.com/go-rat/utils v1.1.5
 	github.com/go-resty/resty/v2 v2.16.5
-	github.com/go-sql-driver/mysql v1.9.2
+	github.com/go-sql-driver/mysql v1.9.3
 	github.com/golang-cz/httplog v0.0.2
 	github.com/gomodule/redigo v1.9.2
 	github.com/google/wire v0.6.0
@@ -56,7 +56,7 @@ require (
 	github.com/spf13/cast v1.9.2
 	github.com/stretchr/testify v1.10.0
 	github.com/tufanbarisyildirim/gonginx v0.0.0-20250429180229-7e931b1d4276
-	github.com/urfave/cli/v3 v3.3.3
+	github.com/urfave/cli/v3 v3.3.8
 	golang.org/x/crypto v0.39.0
 	golang.org/x/net v0.41.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1

go.sum

@@ -85,8 +85,8 @@ github.com/go-rat/utils v1.1.5 h1:nB5qNU4TxqG9BJe7PdeDzznmh6lk+GIWb7hZcvAY4FQ=
 github.com/go-rat/utils v1.1.5/go.mod h1:SUy4Xw44VkZvo2FaURgiIiJlL6Kukll85fVKMp/50+8=
 github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=
 github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
-github.com/go-sql-driver/mysql v1.9.2 h1:4cNKDYQ1I84SXslGddlsrMhc8k4LeDVj6Ad6WRjiHuU=
-github.com/go-sql-driver/mysql v1.9.2/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
 github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
@@ -350,8 +350,8 @@ github.com/tnb-labs/acmez/v3 v3.0.0-20250416074048-0e9f6b5f8ec5 h1:eeJt90c4buPPC
 github.com/tnb-labs/acmez/v3 v3.0.0-20250416074048-0e9f6b5f8ec5/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ=
 github.com/tufanbarisyildirim/gonginx v0.0.0-20250429180229-7e931b1d4276 h1:928VpvLiMWSulfjhKUYj57f70HhOE1ImsQHaeDC2jVc=
 github.com/tufanbarisyildirim/gonginx v0.0.0-20250429180229-7e931b1d4276/go.mod h1:ALbEe81QPWOZjDKCKNWodG2iqCMtregG8+ebQgjx2+4=
-github.com/urfave/cli/v3 v3.3.3 h1:byCBaVdIXuLPIDm5CYZRVG6NvT7tv1ECqdU4YzlEa3I=
-github.com/urfave/cli/v3 v3.3.3/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
+github.com/urfave/cli/v3 v3.3.8 h1:BzolUExliMdet9NlJ/u4m5vHSotJ3PzEqSAZ1oPMa/E=
+github.com/urfave/cli/v3 v3.3.8/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=

internal/data/cert.go

@@ -326,7 +326,7 @@ func (r *certRepo) ManualDNS(id uint) ([]acme.DNSRecord, error) {
 		return nil, err
 	}
 
-	client.UseManualDns(len(cert.Domains))
+	client.UseManualDns()
 	records, err := client.GetDNSRecords(context.Background(), cert.Domains, acme.KeyType(cert.Type))
 	if err != nil {
 		return nil, err

pkg/acme/client.go

@@ -35,14 +35,16 @@ func (c *Client) UseDns(dnsType DnsType, param DNSParam) {
 }
 
 // UseManualDns 使用手动 DNS 验证
-func (c *Client) UseManualDns(total int, check ...bool) {
+func (c *Client) UseManualDns(check ...bool) {
 	c.controlChan = make(chan struct{})
-	c.dataChan = make(chan any)
+	c.dnsChan = make(chan any)
+	c.certChan = make(chan any)
 	c.zClient.ChallengeSolvers = map[string]acmez.Solver{
 		acme.ChallengeTypeDNS01: &manualDNSSolver{
 			check:       len(check) > 0 && check[0],
 			controlChan: c.controlChan,
-			dataChan:    c.dataChan,
+			dnsChan:     c.dnsChan,
+			certChan:    c.certChan,
 			records:     []DNSRecord{},
 		},
 	}
@@ -84,13 +86,13 @@ func (c *Client) ObtainCertificateManual() (Certificate, error) {
 	// 发送信号，开始验证
 	c.controlChan <- struct{}{}
 	// 等待验证完成
-	data := <-c.dataChan
+	certs := <-c.certChan
 
-	if err, ok := data.(error); ok {
+	if err, ok := certs.(error); ok {
 		return Certificate{}, err
 	}
 
-	return data.(Certificate), nil
+	return certs.(Certificate), nil
 }
 
 // RenewCertificate 续签 SSL 证书
@@ -107,22 +109,22 @@ func (c *Client) RenewCertificate(ctx context.Context, certUrl string, domains [
 func (c *Client) GetDNSRecords(ctx context.Context, domains []string, keyType KeyType) ([]DNSRecord, error) {
 	go func(ctx context.Context, domains []string, keyType KeyType) {
 		certs, err := c.ObtainCertificate(ctx, domains, keyType)
-		// 将证书和错误信息发送到 dataChan
+		// 将证书和错误信息发送到 certChan
 		if err != nil {
-			c.dataChan <- err
+			c.certChan <- err
 			return
 		}
-		c.dataChan <- certs
+		c.certChan <- certs
 	}(ctx, domains, keyType)
 
-	// 这里要少一次循环，因为需要卡住最后一次的 dataChan，等待手动 DNS 验证完成
+	// 这里要少一次循环，因为需要卡住最后一次的 dnsChan，等待手动 DNS 验证完成
 	for i := 1; i < len(domains); i++ {
-		<-c.dataChan
+		<-c.dnsChan
 		c.controlChan <- struct{}{}
 	}
 
 	// 因为上面少了一次循环，所以这里接收到的即为完整的 DNS 记录切片
-	data := <-c.dataChan
+	data := <-c.dnsChan
 	if err, ok := data.(error); ok {
 		return nil, err
 	}

pkg/acme/solvers.go

@@ -267,9 +267,10 @@ type DNSProvider interface {
 }
 
 type manualDNSSolver struct {
-	check       bool
+	check       bool // 是否检查 DNS 解析，目前没写
 	controlChan chan struct{}
-	dataChan    chan any
+	dnsChan     chan any
+	certChan    chan any
 	records     []DNSRecord
 }
 
@@ -286,7 +287,7 @@ func (s *manualDNSSolver) Present(ctx context.Context, challenge acme.Challenge)
 		Domain: domain,
 		Value:  keyAuth,
 	})
-	s.dataChan <- s.records
+	s.dnsChan <- s.records
 
 	select {
 	case <-s.controlChan:
@@ -301,7 +302,8 @@ func (s *manualDNSSolver) CleanUp(_ context.Context, _ acme.Challenge) error {
 		_ = recover()
 	}()
 	close(s.controlChan)
-	close(s.dataChan)
+	close(s.dnsChan)
+	close(s.certChan)
 	return nil
 }