Merge branch 'main' into feat/notifier

internal/deployer/dogecloud_cdn.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strconv"
 
 	xerrors "github.com/pkg/errors"
 
@@ -70,7 +71,8 @@ func (d *DogeCloudCDNDeployer) Deploy(ctx context.Context) error {
 
 	// 绑定证书
 	// REF: https://docs.dogecloud.com/cdn/api-cert-bind
-	bindCdnCertResp, err := d.sdkClient.BindCdnCertWithDomain(upres.CertId, d.option.DeployConfig.GetConfigAsString("domain"))
+	bindCdnCertId, _ := strconv.ParseInt(upres.CertId, 10, 64)
+	bindCdnCertResp, err := d.sdkClient.BindCdnCertWithDomain(bindCdnCertId, d.option.DeployConfig.GetConfigAsString("domain"))
 	if err != nil {
 		return xerrors.Wrap(err, "failed to execute sdk request 'cdn.BindCdnCert'")
 	}

internal/pkg/core/uploader/providers/dogecloud/dogecloud.go

@@ -50,7 +50,7 @@ func (u *DogeCloudUploader) Upload(ctx context.Context, certPem string, privkeyP
 		return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.UploadCdnCert'")
 	}
 
-	certId = uploadSslCertResp.Data.Id
+	certId = fmt.Sprintf("%d", uploadSslCertResp.Data.Id)
 	return &uploader.UploadResult{
 		CertId:   certId,
 		CertName: certName,

internal/pkg/vendors/dogecloud-sdk/client.go

@@ -58,7 +58,7 @@ func (c *Client) UploadCdnCert(note, cert, private string) (*UploadCdnCertRespon
 	return resp, nil
 }
 
-func (c *Client) BindCdnCertWithDomain(certId string, domain string) (*BindCdnCertResponse, error) {
+func (c *Client) BindCdnCertWithDomain(certId int64, domain string) (*BindCdnCertResponse, error) {
 	req := &BindCdnCertRequest{
 		CertId: certId,
 		Domain: &domain,
@@ -92,7 +92,7 @@ func (c *Client) BindCdnCertWithDomain(certId string, domain string) (*BindCdnCe
 	return resp, nil
 }
 
-func (c *Client) BindCdnCertWithDomainId(certId string, domainId int32) (*BindCdnCertResponse, error) {
+func (c *Client) BindCdnCertWithDomainId(certId int64, domainId int64) (*BindCdnCertResponse, error) {
 	req := &BindCdnCertRequest{
 		CertId:   certId,
 		DomainId: &domainId,

internal/pkg/vendors/dogecloud-sdk/models.go

@@ -12,20 +12,20 @@ type UploadCdnCertRequest struct {
 }
 
 type UploadCdnCertResponseData struct {
-	Id string `json:"id"`
+	Id int64 `json:"id"`
 }
 
 type UploadCdnCertResponse struct {
-	*BaseResponse
+	BaseResponse
 	Data *UploadCdnCertResponseData `json:"data,omitempty"`
 }
 
 type BindCdnCertRequest struct {
-	CertId   string  `json:"id"`
-	DomainId *int32  `json:"did,omitempty"`
+	CertId   int64   `json:"id"`
+	DomainId *int64  `json:"did,omitempty"`
 	Domain   *string `json:"domain,omitempty"`
 }
 
 type BindCdnCertResponse struct {
-	*BaseResponse
+	BaseResponse
 }

internal/pkg/vendors/qiniu-sdk/models.go

@@ -24,7 +24,7 @@ type DomainInfoHttpsData struct {
 }
 
 type GetDomainInfoResponse struct {
-	*BaseResponse
+	BaseResponse
 	Name               string               `json:"name"`
 	Type               string               `json:"type"`
 	CName              string               `json:"cname"`
@@ -42,7 +42,7 @@ type ModifyDomainHttpsConfRequest struct {
 }
 
 type ModifyDomainHttpsConfResponse struct {
-	*BaseResponse
+	BaseResponse
 }
 
 type EnableDomainHttpsRequest struct {
@@ -50,5 +50,5 @@ type EnableDomainHttpsRequest struct {
 }
 
 type EnableDomainHttpsResponse struct {
-	*BaseResponse
+	BaseResponse
 }