Merge pull request #74 from usual2970/hotfix/bug_0922

fix some bugs
usual2970 · Sep 22, 2024 · 5eec1cf · 5eec1cf
2 parents 2cca82e + a259ccd
commit 5eec1cf
Show file tree

Hide file tree

Showing 10 changed files with 756 additions and 30 deletions.
diff --git a/internal/deployer/tencent_cdn.go b/internal/deployer/tencent_cdn.go
@@ -2,6 +2,7 @@ package deployer
 
 import (
 	"certimate/internal/domain"
+	"certimate/internal/utils/rand"
 	"context"
 	"encoding/json"
 	"errors"
@@ -82,7 +83,7 @@ func (t *tencentCdn) uploadCert() (string, error) {
 
 	request.CertificatePublicKey = common.StringPtr(t.option.Certificate.Certificate)
 	request.CertificatePrivateKey = common.StringPtr(t.option.Certificate.PrivateKey)
-	request.Alias = common.StringPtr(t.option.Domain)
+	request.Alias = common.StringPtr(t.option.Domain + "_" + rand.RandStr(6))
 	request.Repeatable = common.BoolPtr(true)
 
 	response, err := client.UploadCertificate(request)

diff --git a/internal/domains/deploy.go b/internal/domains/deploy.go
@@ -62,7 +62,10 @@ func deploy(ctx context.Context, record *models.Record) error {
 		history.record(checkPhase, "证书在有效期内且已部署，跳过", &RecordInfo{
 			Info: []string{fmt.Sprintf("证书有效期至 %s", expiredAt.Format("2006-01-02"))},
 		}, true)
-		return err
+
+		// 跳过的情况也算成功
+		history.setWholeSuccess(true)
+		return nil
 	}
 	history.record(checkPhase, "检查通过", nil, true)
 
@@ -119,5 +122,7 @@ func deploy(ctx context.Context, record *models.Record) error {
 	app.GetApp().Logger().Info("部署成功")
 	history.record(deployPhase, "部署成功", nil, true)
 
+	history.setWholeSuccess(true)
+
 	return nil
 }
diff --git a/internal/domains/history.go b/internal/domains/history.go
@@ -28,6 +28,7 @@ type history struct {
 	PhaseSuccess bool                    `json:"phaseSuccess"`
 	DeployedAt   string                  `json:"deployedAt"`
 	Cert         *applicant.Certificate  `json:"cert"`
+	WholeSuccess bool                    `json:"wholeSuccess"`
 }
 
 func NewHistory(record *models.Record) *history {
@@ -68,6 +69,10 @@ func (a *history) setCert(cert *applicant.Certificate) {
 	a.Cert = cert
 }
 
+func (a *history) setWholeSuccess(success bool) {
+	a.WholeSuccess = success
+}
+
 func (a *history) commit() error {
 	collection, err := app.GetApp().Dao().FindCollectionByNameOrId("deployments")
 	if err != nil {
@@ -81,6 +86,7 @@ func (a *history) commit() error {
 	record.Set("log", a.Log)
 	record.Set("phase", string(a.Phase))
 	record.Set("phaseSuccess", a.PhaseSuccess)
+	record.Set("wholeSuccess", a.WholeSuccess)
 
 	if err := app.GetApp().Dao().SaveRecord(record); err != nil {
 		return err