Merge pull request #314 from fudiwei/bugfix/dogecloud-api-error

bugfix #313

README.md

@@ -75,8 +75,10 @@ make local.run
 | :--------: | :----------: | :----------: | ----------------------------------------------------------------- |
 |   阿里云   |      √       |      √       | 可签发在阿里云注册的域名；可部署到阿里云 OSS、CDN、SLB            |
 |   腾讯云   |      √       |      √       | 可签发在腾讯云注册的域名；可部署到腾讯云 COS、CDN、ECDN、CLB、TEO |
+| 百度智能云 |              |      √       | 可部署到百度智能云 CDN                                            |
 |   华为云   |      √       |      √       | 可签发在华为云注册的域名；可部署到华为云 CDN、ELB                 |
 |   七牛云   |              |      √       | 可部署到七牛云 CDN                                                |
+|   多吉云   |              |      √       | 可部署到多吉云 CDN                                                |
 |    AWS     |      √       |              | 可签发在 AWS Route53 托管的域名                                   |
 | CloudFlare |      √       |              | 可签发在 CloudFlare 注册的域名；CloudFlare 服务自带 SSL 证书      |
 |  GoDaddy   |      √       |              | 可签发在 GoDaddy 注册的域名                                       |

README_EN.md

@@ -71,11 +71,13 @@ password：1234567890
 ## List of Supported Providers
 
 |   Provider    | Registration | Deployment | Remarks                                                                                                     |
-| :-----------: | :----------: | :--------: | --------------------------------------------------------------------------------------------------------------------- |
+| :-----------: | :----------: | :--------: | ----------------------------------------------------------------------------------------------------------- |
 | Alibaba Cloud |      √       |     √      | Supports domains registered on Alibaba Cloud; supports deployment to Alibaba Cloud OSS, CDN,SLB             |
 | Tencent Cloud |      √       |     √      | Supports domains registered on Tencent Cloud; supports deployment to Tencent Cloud COS, CDN, ECDN, CLB, TEO |
+|  Baidu Cloud  |              |     √      | Supports deployment to Baidu Cloud CDN                                                                      |
 | Huawei Cloud  |      √       |     √      | Supports domains registered on Huawei Cloud; supports deployment to Huawei Cloud CDN, ELB                   |
 |  Qiniu Cloud  |              |     √      | Supports deployment to Qiniu Cloud CDN                                                                      |
+|  Doge Cloud   |              |     √      | Supports deployment to Doge Cloud CDN                                                                       |
 |      AWS      |      √       |            | Supports domains managed on AWS Route53                                                                     |
 |  CloudFlare   |      √       |            | Supports domains registered on CloudFlare; CloudFlare services come with SSL certificates                   |
 |    GoDaddy    |      √       |            | Supports domains registered on GoDaddy                                                                      |

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

@@ -48,7 +48,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"`
+	CertId   int64   `json:"id"`
-	DomainId *int32  `json:"did,omitempty"`
+	DomainId *int64  `json:"did,omitempty"`
 	Domain   *string `json:"domain,omitempty"`
 }
 
 type BindCdnCertResponse struct {
-	*BaseResponse
+	BaseResponse
 }