From 39f8484b2a984696621c7206be2e51bc2bf9386f Mon Sep 17 00:00:00 2001
From: Fu Diwei <fudiwei@sina.com>
Date: Mon, 24 Mar 2025 12:35:30 +0800
Subject: [PATCH] fix: #544

---
 .../providers/baishan-cdn/baishan_cdn.go      | 20 +++++++++++++++++--
 internal/pkg/vendors/baishan-sdk/client.go    |  3 +++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go b/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go
index 3435b26e..e6aec2ab 100644
--- a/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go
+++ b/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go
@@ -2,9 +2,12 @@
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"log/slog"
+	"regexp"
+	"strings"
 	"time"
 
 	xerrors "github.com/pkg/errors"
@@ -75,6 +78,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe
 
 	// 新增证书
 	// REF: https://portal.baishancloud.com/track/document/downloadPdf/1441
+	certificateId := ""
 	createCertificateReq := &bssdk.CreateCertificateRequest{
 		Certificate: certPem,
 		Key:         privkeyPem,
@@ -83,7 +87,19 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe
 	createCertificateResp, err := d.sdkClient.CreateCertificate(createCertificateReq)
 	d.logger.Debug("sdk request 'baishan.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp))
 	if err != nil {
-		return nil, xerrors.Wrap(err, "failed to execute sdk request 'baishan.CreateCertificate'")
+		if createCertificateResp != nil {
+			if createCertificateResp.GetCode() == 400699 && strings.Contains(createCertificateResp.GetMessage(), "this certificate is exists") {
+				// 证书已存在，忽略新增证书接口错误
+				re := regexp.MustCompile(`\d+`)
+				certificateId = re.FindString(createCertificateResp.GetMessage())
+			}
+		}
+
+		if certificateId == "" {
+			return nil, xerrors.Wrap(err, "failed to execute sdk request 'baishan.CreateCertificate'")
+		}
+	} else {
+		certificateId = createCertificateResp.Data.CertId.String()
 	}
 
 	// 设置域名配置
@@ -92,7 +108,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe
 		Domains: d.config.Domain,
 		Config: &bssdk.DomainConfig{
 			Https: &bssdk.DomainConfigHttps{
-				CertId:      createCertificateResp.Data.CertId,
+				CertId:      json.Number(certificateId),
 				ForceHttps:  getDomainConfigResp.Data[0].Config.Https.ForceHttps,
 				EnableHttp2: getDomainConfigResp.Data[0].Config.Https.EnableHttp2,
 				EnableOcsp:  getDomainConfigResp.Data[0].Config.Https.EnableOcsp,
diff --git a/internal/pkg/vendors/baishan-sdk/client.go b/internal/pkg/vendors/baishan-sdk/client.go
index 22f696e3..400e1ae1 100644
--- a/internal/pkg/vendors/baishan-sdk/client.go
+++ b/internal/pkg/vendors/baishan-sdk/client.go
@@ -84,6 +84,9 @@ func (c *Client) sendRequest(method string, path string, params interface{}) (*r
 func (c *Client) sendRequestWithResult(method string, path string, params interface{}, result BaseResponse) error {
 	resp, err := c.sendRequest(method, path, params)
 	if err != nil {
+		if resp != nil {
+			json.Unmarshal(resp.Body(), &result)
+		}
 		return err
 	}