refactor: clean code

internal/deployer/huaweicloud_cdn.go

@@ -12,7 +12,7 @@ import (
 	cdnRegion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/region"
 
 	"github.com/usual2970/certimate/internal/domain"
-	uploaderImpl "github.com/usual2970/certimate/internal/pkg/core/uploader/impl"
+	uploader "github.com/usual2970/certimate/internal/pkg/core/uploader"
 	"github.com/usual2970/certimate/internal/pkg/utils/cast"
 )
 
@@ -70,7 +70,7 @@ func (d *HuaweiCloudCDNDeployer) Deploy(ctx context.Context) error {
 	updateDomainMultiCertificatesReqBodyContent.HttpsSwitch = 1
 	var updateDomainMultiCertificatesResp *cdnModel.UpdateDomainMultiCertificatesResponse
 	if d.option.DeployConfig.GetConfigAsBool("useSCM") {
-		uploader, err := uploaderImpl.NewHuaweiCloudSCMUploader(&uploaderImpl.HuaweiCloudSCMUploaderConfig{
+		uploader, err := uploader.NewHuaweiCloudSCMUploader(&uploader.HuaweiCloudSCMUploaderConfig{
 			Region:          "", // TODO: SCM 服务与 DNS 服务所支持的区域可能不一致，这里暂时不传而是使用默认值，仅支持华为云国内版
 			AccessKeyId:     access.AccessKeyId,
 			SecretAccessKey: access.SecretAccessKey,

internal/pkg/core/uploader/uploader.go

@@ -21,7 +21,7 @@ type Uploader interface {
 
 // 表示证书上传结果的数据结构，包含上传后的证书 ID、名称和其他数据。
 type UploadResult struct {
-	CertId   string                 `json:"certId"`
+	CertId   string         `json:"certId"`
-	CertName string                 `json:"certName"`
+	CertName string         `json:"certName"`
-	CertData map[string]interface{} `json:"certData,omitempty"`
+	CertData map[string]any `json:"certData,omitempty"`
 }

internal/pkg/core/uploader/uploader_aliyun_cas.go

@@ -1,4 +1,4 @@
-package impl
+package uploader
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 	util "github.com/alibabacloud-go/tea-utils/v2/service"
 	"github.com/alibabacloud-go/tea/tea"
 
-	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	"github.com/usual2970/certimate/internal/pkg/utils/x509"
 )
 
@@ -40,7 +39,7 @@ func NewAliyunCASUploader(config *AliyunCASUploaderConfig) (*AliyunCASUploader,
 	}, nil
 }
 
-func (u *AliyunCASUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
+func (u *AliyunCASUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *UploadResult, err error) {
 	// 解析证书内容
 	certX509, err := x509.ParseCertificateFromPEM(certPem)
 	if err != nil {
@@ -88,7 +87,7 @@ func (u *AliyunCASUploader) Upload(ctx context.Context, certPem string, privkeyP
 
 					// 如果已存在相同证书，直接返回已有的证书信息
 					if isSameCert {
-						return &uploader.UploadResult{
+						return &UploadResult{
 							CertId:   fmt.Sprintf("%d", tea.Int64Value(certDetail.CertificateId)),
 							CertName: *certDetail.Name,
 						}, nil
@@ -124,7 +123,7 @@ func (u *AliyunCASUploader) Upload(ctx context.Context, certPem string, privkeyP
 	}
 
 	certId = fmt.Sprintf("%d", tea.Int64Value(uploadUserCertificateResp.Body.CertId))
-	return &uploader.UploadResult{
+	return &UploadResult{
 		CertId:   certId,
 		CertName: certName,
 	}, nil

internal/pkg/core/uploader/uploader_huaweicloud_elb.go

@@ -1,4 +1,4 @@
-package impl
+package uploader
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 	hcElbModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/model"
 	hcElbRegion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/region"
 
-	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	"github.com/usual2970/certimate/internal/pkg/utils/cast"
 	"github.com/usual2970/certimate/internal/pkg/utils/x509"
 )
@@ -39,7 +38,7 @@ func NewHuaweiCloudELBUploader(config *HuaweiCloudELBUploaderConfig) (*HuaweiClo
 	}, nil
 }
 
-func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
+func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *UploadResult, err error) {
 	// 解析证书内容
 	newCert, err := x509.ParseCertificateFromPEM(certPem)
 	if err != nil {
@@ -78,7 +77,7 @@ func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, pri
 
 				// 如果已存在相同证书，直接返回已有的证书信息
 				if isSameCert {
-					return &uploader.UploadResult{
+					return &UploadResult{
 						CertId:   certDetail.Id,
 						CertName: certDetail.Name,
 					}, nil
@@ -120,7 +119,7 @@ func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, pri
 
 	certId = createCertificateResp.Certificate.Id
 	certName = createCertificateResp.Certificate.Name
-	return &uploader.UploadResult{
+	return &UploadResult{
 		CertId:   certId,
 		CertName: certName,
 	}, nil

internal/pkg/core/uploader/uploader_huaweicloud_scm.go

@@ -1,4 +1,4 @@
-package impl
+package uploader
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 	hcScmModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/model"
 	hcScmRegion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/region"
 
-	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	"github.com/usual2970/certimate/internal/pkg/utils/cast"
 	"github.com/usual2970/certimate/internal/pkg/utils/x509"
 )
@@ -38,7 +37,7 @@ func NewHuaweiCloudSCMUploader(config *HuaweiCloudSCMUploaderConfig) (*HuaweiClo
 	}, nil
 }
 
-func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
+func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *UploadResult, err error) {
 	// 解析证书内容
 	certX509, err := x509.ParseCertificateFromPEM(certPem)
 	if err != nil {
@@ -90,7 +89,7 @@ func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, pri
 
 				// 如果已存在相同证书，直接返回已有的证书信息
 				if isSameCert {
-					return &uploader.UploadResult{
+					return &UploadResult{
 						CertId:   certDetail.Id,
 						CertName: certDetail.Name,
 					}, nil
@@ -128,7 +127,7 @@ func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, pri
 	}
 
 	certId = *importCertificateResp.CertificateId
-	return &uploader.UploadResult{
+	return &UploadResult{
 		CertId:   certId,
 		CertName: certName,
 	}, nil

internal/pkg/core/uploader/uploader_tencentcloud_ssl.go

@@ -1,4 +1,4 @@
-package impl
+package uploader
 
 import (
 	"context"
@@ -9,7 +9,6 @@ import (
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
 	tcSsl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205"
 
-	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	"github.com/usual2970/certimate/internal/pkg/utils/cast"
 )
 
@@ -36,7 +35,7 @@ func NewTencentCloudSSLUploader(config *TencentCloudSSLUploaderConfig) (*Tencent
 	}, nil
 }
 
-func (u *TencentCloudSSLUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
+func (u *TencentCloudSSLUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *UploadResult, err error) {
 	// 生成新证书名（需符合腾讯云命名规则）
 	var certId, certName string
 	certName = fmt.Sprintf("certimate-%d", time.Now().UnixMilli())
@@ -63,7 +62,7 @@ func (u *TencentCloudSSLUploader) Upload(ctx context.Context, certPem string, pr
 
 		certId = *uploadCertificateResp.Response.RepeatCertId
 		certName = *describeCertificateDetailResp.Response.Alias
-		return &uploader.UploadResult{
+		return &UploadResult{
 			CertId:   certId,
 			CertName: certName,
 		}, nil
@@ -73,7 +72,7 @@ func (u *TencentCloudSSLUploader) Upload(ctx context.Context, certPem string, pr
 	}
 
 	certId = *uploadCertificateResp.Response.CertificateId
-	return &uploader.UploadResult{
+	return &UploadResult{
 		CertId:   certId,
 		CertName: certName,
 	}, nil

ui/public/imgs/providers/pdns.svg

@@ -1 +1 @@
-<svg class="icon" xmlns="http://www.w3.org/2000/svg" width="200" height="200" fill-rule="evenodd"><path d="M18.97 21.14c0 5.293-4.248 9.585-9.487 9.585S0 26.432 0 21.14s4.245-9.585 9.485-9.585 9.485 4.293 9.485 9.585z" fill="#e38000"/><path d="M18.97 42.865c0 5.29-4.248 9.58-9.487 9.58S0 48.156 0 42.86s4.245-9.585 9.485-9.585 9.485 4.293 9.485 9.585zM41.488 21.14c0 5.293-4.25 9.585-9.49 9.585s-9.485-4.29-9.485-9.585 4.248-9.585 9.485-9.585 9.487 4.293 9.487 9.585zm0 21.726c0 5.29-4.25 9.58-9.49 9.58s-9.485-4.29-9.485-9.585 4.248-9.585 9.485-9.585 9.487 4.293 9.487 9.585zM64 21.14c0 5.293-4.245 9.585-9.485 9.585s-9.485-4.29-9.485-9.585 4.245-9.585 9.485-9.585S64 15.848 64 21.14z" fill="#e17f03"/><path d="M64 42.865c0 5.29-4.245 9.58-9.485 9.58s-9.485-4.29-9.485-9.585 4.245-9.585 9.485-9.585S64 37.57 64 42.86z" fill="#e38000"/></svg>
+<svg class="icon" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200"><path d="M18.97 21.14c0 5.293-4.248 9.585-9.487 9.585S0 26.432 0 21.14s4.245-9.585 9.485-9.585 9.485 4.293 9.485 9.585z" fill="#e38000"/><path d="M18.97 42.865c0 5.29-4.248 9.58-9.487 9.58S0 48.156 0 42.86s4.245-9.585 9.485-9.585 9.485 4.293 9.485 9.585zM41.488 21.14c0 5.293-4.25 9.585-9.49 9.585s-9.485-4.29-9.485-9.585 4.248-9.585 9.485-9.585 9.487 4.293 9.487 9.585zm0 21.726c0 5.29-4.25 9.58-9.49 9.58s-9.485-4.29-9.485-9.585 4.248-9.585 9.485-9.585 9.487 4.293 9.487 9.585zM64 21.14c0 5.293-4.245 9.585-9.485 9.585s-9.485-4.29-9.485-9.585 4.245-9.585 9.485-9.585S64 15.848 64 21.14z" fill="#e17f03"/><path d="M64 42.865c0 5.29-4.245 9.58-9.485 9.58s-9.485-4.29-9.485-9.585 4.245-9.585 9.485-9.585S64 37.57 64 42.86z" fill="#e38000"/></svg>