refactor: rename utils

internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go

@@ -12,8 +12,8 @@ import (
 	"github.com/alibabacloud-go/tea/tea"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -63,7 +63,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -81,7 +81,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 		}
 
 		listUserCertificateOrderReq := &alicas.ListUserCertificateOrderRequest{
-			ResourceGroupId: typeutil.ToPtrOrZeroNil(u.config.ResourceGroupId),
+			ResourceGroupId: xtypes.ToPtrOrZeroNil(u.config.ResourceGroupId),
 			CurrentPage:     tea.Int64(listUserCertificateOrderPage),
 			ShowSize:        tea.Int64(listUserCertificateOrderLimit),
 			OrderType:       tea.String("CERT"),
@@ -111,12 +111,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 				if *getUserCertificateDetailResp.Body.Cert == certPEM {
 					isSameCert = true
 				} else {
-					oldCertX509, err := certutil.ParseCertificateFromPEM(*getUserCertificateDetailResp.Body.Cert)
+					oldCertX509, err := xcert.ParseCertificateFromPEM(*getUserCertificateDetailResp.Body.Cert)
 					if err != nil {
 						continue
 					}
 
-					isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+					isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 				}
 
 				// 如果已存在相同证书，直接返回
@@ -147,7 +147,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 上传新证书
 	// REF: https://help.aliyun.com/zh/ssl-certificate/developer-reference/api-cas-2020-04-07-uploadusercertificate
 	uploadUserCertificateReq := &alicas.UploadUserCertificateRequest{
-		ResourceGroupId: typeutil.ToPtrOrZeroNil(u.config.ResourceGroupId),
+		ResourceGroupId: xtypes.ToPtrOrZeroNil(u.config.ResourceGroupId),
 		Name:            tea.String(certName),
 		Cert:            tea.String(certPEM),
 		Key:             tea.String(privkeyPEM),

internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go

@@ -15,8 +15,8 @@ import (
 	"github.com/alibabacloud-go/tea/tea"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -66,7 +66,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -74,7 +74,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 查询证书列表，避免重复上传
 	// REF: https://help.aliyun.com/zh/slb/classic-load-balancer/developer-reference/api-slb-2014-05-15-describeservercertificates
 	describeServerCertificatesReq := &alislb.DescribeServerCertificatesRequest{
-		ResourceGroupId: typeutil.ToPtrOrZeroNil(u.config.ResourceGroupId),
+		ResourceGroupId: xtypes.ToPtrOrZeroNil(u.config.ResourceGroupId),
 		RegionId:        tea.String(u.config.Region),
 	}
 	describeServerCertificatesResp, err := u.sdkClient.DescribeServerCertificates(describeServerCertificatesReq)
@@ -114,7 +114,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 上传新证书
 	// REF: https://help.aliyun.com/zh/slb/classic-load-balancer/developer-reference/api-slb-2014-05-15-uploadservercertificate
 	uploadServerCertificateReq := &alislb.UploadServerCertificateRequest{
-		ResourceGroupId:       typeutil.ToPtrOrZeroNil(u.config.ResourceGroupId),
+		ResourceGroupId:       xtypes.ToPtrOrZeroNil(u.config.ResourceGroupId),
 		RegionId:              tea.String(u.config.Region),
 		ServerCertificateName: tea.String(certName),
 		ServerCertificate:     tea.String(certPEM),

internal/pkg/core/uploader/providers/aws-acm/aws_acm.go

@@ -12,7 +12,7 @@ import (
 	"golang.org/x/exp/slices"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -60,13 +60,13 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
 
 	// 提取服务器证书
-	serverCertPEM, intermediaCertPEM, err := certutil.ExtractCertificatesFromPEM(certPEM)
+	serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM)
 	if err != nil {
 		return nil, fmt.Errorf("failed to extract certs: %w", err)
 	}
@@ -116,12 +116,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 				return nil, fmt.Errorf("failed to execute sdk request 'acm.GetCertificate': %w", err)
 			} else {
 				oldCertPEM := aws.ToString(getCertificateResp.Certificate)
-				oldCertX509, err := certutil.ParseCertificateFromPEM(oldCertPEM)
+				oldCertX509, err := xcert.ParseCertificateFromPEM(oldCertPEM)
 				if err != nil {
 					continue
 				}
 
-				if !certutil.EqualCertificate(certX509, oldCertX509) {
+				if !xcert.EqualCertificate(certX509, oldCertX509) {
 					continue
 				}
 			}

internal/pkg/core/uploader/providers/aws-iam/aws_iam.go

@@ -12,7 +12,7 @@ import (
 	awsiam "github.com/aws/aws-sdk-go-v2/service/iam"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -63,13 +63,13 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
 
 	// 提取服务器证书
-	serverCertPEM, intermediaCertPEM, err := certutil.ExtractCertificatesFromPEM(certPEM)
+	serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM)
 	if err != nil {
 		return nil, fmt.Errorf("failed to extract certs: %w", err)
 	}
@@ -119,12 +119,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 				return nil, fmt.Errorf("failed to execute sdk request 'iam.GetServerCertificate': %w", err)
 			} else {
 				oldCertPEM := aws.ToString(getServerCertificateResp.ServerCertificate.CertificateBody)
-				oldCertX509, err := certutil.ParseCertificateFromPEM(oldCertPEM)
+				oldCertX509, err := xcert.ParseCertificateFromPEM(oldCertPEM)
 				if err != nil {
 					continue
 				}
 
-				if !certutil.EqualCertificate(certX509, oldCertX509) {
+				if !xcert.EqualCertificate(certX509, oldCertX509) {
 					continue
 				}
 			}

internal/pkg/core/uploader/providers/azure-keyvault/azure_keyvault.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	azcommon "github.com/usual2970/certimate/internal/pkg/sdk3rd/azure/common"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -67,7 +67,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -124,7 +124,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 					continue
 				}
 
-				if !certutil.EqualCertificate(certX509, oldCertX509) {
+				if !xcert.EqualCertificate(certX509, oldCertX509) {
 					continue
 				}
 			}
@@ -144,7 +144,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// Azure Key Vault 不支持导入带有 Certificiate Chain 的 PEM 证书。
 	// Issue Link: https://github.com/Azure/azure-cli/issues/19017
 	// 暂时的解决方法是，将 PEM 证书转换成 PFX 格式，然后再导入。
-	certPFX, err := certutil.TransformCertificateFromPEMToPFX(certPEM, privkeyPEM, "")
+	certPFX, err := xcert.TransformCertificateFromPEMToPFX(certPEM, privkeyPEM, "")
 	if err != nil {
 		return nil, fmt.Errorf("failed to transform certificate from PEM to PFX: %w", err)
 	}

internal/pkg/core/uploader/providers/baiducloud-cert/baiducloud_cert.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	bdsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/baiducloud/cert"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -55,7 +55,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -91,11 +91,11 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 			if err != nil {
 				return nil, fmt.Errorf("failed to execute sdk request 'cert.GetCertRawData': %w", err)
 			} else {
-				oldCertX509, err := certutil.ParseCertificateFromPEM(getCertDetailResp.CertServerData)
+				oldCertX509, err := xcert.ParseCertificateFromPEM(getCertDetailResp.CertServerData)
 				if err != nil {
 					continue
 				}
-				if !certutil.EqualCertificate(certX509, oldCertX509) {
+				if !xcert.EqualCertificate(certX509, oldCertX509) {
 					continue
 				}
 			}

internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go

@@ -13,7 +13,7 @@ import (
 	bytepluscdn "github.com/byteplus-sdk/byteplus-sdk-golang/service/cdn"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -58,7 +58,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}

internal/pkg/core/uploader/providers/ctcccloud-ao/ctcccloud_ao.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	ctyunao "github.com/usual2970/certimate/internal/pkg/sdk3rd/ctyun/ao"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -57,7 +57,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -74,9 +74,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 		}
 
 		listCertsReq := &ctyunao.ListCertsRequest{
-			Page:      typeutil.ToPtr(listCertPage),
-			PerPage:   typeutil.ToPtr(listCertPerPage),
-			UsageMode: typeutil.ToPtr(int32(0)),
+			Page:      xtypes.ToPtr(listCertPage),
+			PerPage:   xtypes.ToPtr(listCertPerPage),
+			UsageMode: xtypes.ToPtr(int32(0)),
 		}
 		listCertsResp, err := u.sdkClient.ListCerts(listCertsReq)
 		u.logger.Debug("sdk request 'ao.ListCerts'", slog.Any("request", listCertsReq), slog.Any("response", listCertsResp))
@@ -106,7 +106,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 				// 查询证书详情
 				// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=113&api=13015&data=174&isNormal=1&vid=167
 				queryCertReq := &ctyunao.QueryCertRequest{
-					Id: typeutil.ToPtr(certRecord.Id),
+					Id: xtypes.ToPtr(certRecord.Id),
 				}
 				queryCertResp, err := u.sdkClient.QueryCert(queryCertReq)
 				u.logger.Debug("sdk request 'ao.QueryCert'", slog.Any("request", queryCertReq), slog.Any("response", queryCertResp))
@@ -117,12 +117,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 					if queryCertResp.ReturnObj.Result.Certs == certPEM {
 						isSameCert = true
 					} else {
-						oldCertX509, err := certutil.ParseCertificateFromPEM(queryCertResp.ReturnObj.Result.Certs)
+						oldCertX509, err := xcert.ParseCertificateFromPEM(queryCertResp.ReturnObj.Result.Certs)
 						if err != nil {
 							continue
 						}
 
-						isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+						isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 					}
 
 					// 如果已存在相同证书，直接返回
@@ -150,9 +150,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 创建证书
 	// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=113&api=13014&data=174&isNormal=1&vid=167
 	createCertReq := &ctyunao.CreateCertRequest{
-		Name:  typeutil.ToPtr(certName),
-		Certs: typeutil.ToPtr(certPEM),
-		Key:   typeutil.ToPtr(privkeyPEM),
+		Name:  xtypes.ToPtr(certName),
+		Certs: xtypes.ToPtr(certPEM),
+		Key:   xtypes.ToPtr(privkeyPEM),
 	}
 	createCertResp, err := u.sdkClient.CreateCert(createCertReq)
 	u.logger.Debug("sdk request 'ao.CreateCert'", slog.Any("request", createCertReq), slog.Any("response", createCertResp))

internal/pkg/core/uploader/providers/ctcccloud-cdn/ctcccloud_cdn.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	ctyuncdn "github.com/usual2970/certimate/internal/pkg/sdk3rd/ctyun/cdn"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -57,7 +57,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -74,9 +74,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 		}
 
 		queryCertListReq := &ctyuncdn.QueryCertListRequest{
-			Page:      typeutil.ToPtr(queryCertListPage),
-			PerPage:   typeutil.ToPtr(queryCertListPerPage),
-			UsageMode: typeutil.ToPtr(int32(0)),
+			Page:      xtypes.ToPtr(queryCertListPage),
+			PerPage:   xtypes.ToPtr(queryCertListPerPage),
+			UsageMode: xtypes.ToPtr(int32(0)),
 		}
 		queryCertListResp, err := u.sdkClient.QueryCertList(queryCertListReq)
 		u.logger.Debug("sdk request 'cdn.QueryCertList'", slog.Any("request", queryCertListReq), slog.Any("response", queryCertListResp))
@@ -106,7 +106,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 				// 查询证书详情
 				// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=108&api=10899&data=161&isNormal=1&vid=154
 				queryCertDetailReq := &ctyuncdn.QueryCertDetailRequest{
-					Id: typeutil.ToPtr(certRecord.Id),
+					Id: xtypes.ToPtr(certRecord.Id),
 				}
 				queryCertDetailResp, err := u.sdkClient.QueryCertDetail(queryCertDetailReq)
 				u.logger.Debug("sdk request 'cdn.QueryCertDetail'", slog.Any("request", queryCertDetailReq), slog.Any("response", queryCertDetailResp))
@@ -117,12 +117,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 					if queryCertDetailResp.ReturnObj.Result.Certs == certPEM {
 						isSameCert = true
 					} else {
-						oldCertX509, err := certutil.ParseCertificateFromPEM(queryCertDetailResp.ReturnObj.Result.Certs)
+						oldCertX509, err := xcert.ParseCertificateFromPEM(queryCertDetailResp.ReturnObj.Result.Certs)
 						if err != nil {
 							continue
 						}
 
-						isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+						isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 					}
 
 					// 如果已存在相同证书，直接返回
@@ -150,9 +150,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 创建证书
 	// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=108&api=10893&data=161&isNormal=1&vid=154
 	createCertReq := &ctyuncdn.CreateCertRequest{
-		Name:  typeutil.ToPtr(certName),
-		Certs: typeutil.ToPtr(certPEM),
-		Key:   typeutil.ToPtr(privkeyPEM),
+		Name:  xtypes.ToPtr(certName),
+		Certs: xtypes.ToPtr(certPEM),
+		Key:   xtypes.ToPtr(privkeyPEM),
 	}
 	createCertResp, err := u.sdkClient.CreateCert(createCertReq)
 	u.logger.Debug("sdk request 'cdn.CreateCert'", slog.Any("request", createCertReq), slog.Any("response", createCertResp))

internal/pkg/core/uploader/providers/ctcccloud-cms/ctcccloud_cms.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	ctyuncms "github.com/usual2970/certimate/internal/pkg/sdk3rd/ctyun/cms"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -64,7 +64,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	}
 
 	// 提取服务器证书
-	serverCertPEM, intermediaCertPEM, err := certutil.ExtractCertificatesFromPEM(certPEM)
+	serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM)
 	if err != nil {
 		return nil, fmt.Errorf("failed to extract certs: %w", err)
 	}
@@ -75,11 +75,11 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 上传证书
 	// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=152&api=17243&data=204&isNormal=1&vid=283
 	uploadCertificateReq := &ctyuncms.UploadCertificateRequest{
-		Name:               typeutil.ToPtr(certName),
-		Certificate:        typeutil.ToPtr(serverCertPEM),
-		CertificateChain:   typeutil.ToPtr(intermediaCertPEM),
-		PrivateKey:         typeutil.ToPtr(privkeyPEM),
-		EncryptionStandard: typeutil.ToPtr("INTERNATIONAL"),
+		Name:               xtypes.ToPtr(certName),
+		Certificate:        xtypes.ToPtr(serverCertPEM),
+		CertificateChain:   xtypes.ToPtr(intermediaCertPEM),
+		PrivateKey:         xtypes.ToPtr(privkeyPEM),
+		EncryptionStandard: xtypes.ToPtr("INTERNATIONAL"),
 	}
 	uploadCertificateResp, err := u.sdkClient.UploadCertificate(uploadCertificateReq)
 	u.logger.Debug("sdk request 'cms.UploadCertificate'", slog.Any("request", uploadCertificateReq), slog.Any("response", uploadCertificateResp))
@@ -110,7 +110,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 
 func (u *UploaderProvider) findCertIfExists(ctx context.Context, certPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -127,10 +127,10 @@ func (u *UploaderProvider) findCertIfExists(ctx context.Context, certPEM string)
 		}
 
 		getCertificateListReq := &ctyuncms.GetCertificateListRequest{
-			PageNum:  typeutil.ToPtr(getCertificateListPageNum),
-			PageSize: typeutil.ToPtr(getCertificateListPageSize),
-			Keyword:  typeutil.ToPtr(certX509.Subject.CommonName),
-			Origin:   typeutil.ToPtr("UPLOAD"),
+			PageNum:  xtypes.ToPtr(getCertificateListPageNum),
+			PageSize: xtypes.ToPtr(getCertificateListPageSize),
+			Keyword:  xtypes.ToPtr(certX509.Subject.CommonName),
+			Origin:   xtypes.ToPtr("UPLOAD"),
 		}
 		getCertificateListResp, err := u.sdkClient.GetCertificateList(getCertificateListReq)
 		u.logger.Debug("sdk request 'cms.GetCertificateList'", slog.Any("request", getCertificateListReq), slog.Any("response", getCertificateListResp))

internal/pkg/core/uploader/providers/ctcccloud-elb/ctcccloud_elb.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	ctyunelb "github.com/usual2970/certimate/internal/pkg/sdk3rd/ctyun/elb"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -59,7 +59,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -67,7 +67,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 查询证书列表，避免重复上传
 	// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=24&api=5692&data=88&isNormal=1&vid=82
 	listCertificatesReq := &ctyunelb.ListCertificatesRequest{
-		RegionID: typeutil.ToPtr(u.config.RegionId),
+		RegionID: xtypes.ToPtr(u.config.RegionId),
 	}
 	listCertificatesResp, err := u.sdkClient.ListCertificates(listCertificatesReq)
 	u.logger.Debug("sdk request 'elb.ListCertificates'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp))
@@ -79,12 +79,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 			if certRecord.Certificate == certPEM {
 				isSameCert = true
 			} else {
-				oldCertX509, err := certutil.ParseCertificateFromPEM(certRecord.Certificate)
+				oldCertX509, err := xcert.ParseCertificateFromPEM(certRecord.Certificate)
 				if err != nil {
 					continue
 				}
 
-				isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+				isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 			}
 
 			// 如果已存在相同证书，直接返回
@@ -104,13 +104,13 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 创建证书
 	// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=24&api=5685&data=88&isNormal=1&vid=82
 	createCertificateReq := &ctyunelb.CreateCertificateRequest{
-		ClientToken: typeutil.ToPtr(generateClientToken()),
-		RegionID:    typeutil.ToPtr(u.config.RegionId),
-		Name:        typeutil.ToPtr(certName),
-		Description: typeutil.ToPtr("upload from certimate"),
-		Type:        typeutil.ToPtr("Server"),
-		Certificate: typeutil.ToPtr(certPEM),
-		PrivateKey:  typeutil.ToPtr(privkeyPEM),
+		ClientToken: xtypes.ToPtr(generateClientToken()),
+		RegionID:    xtypes.ToPtr(u.config.RegionId),
+		Name:        xtypes.ToPtr(certName),
+		Description: xtypes.ToPtr("upload from certimate"),
+		Type:        xtypes.ToPtr("Server"),
+		Certificate: xtypes.ToPtr(certPEM),
+		PrivateKey:  xtypes.ToPtr(privkeyPEM),
 	}
 	createCertificateResp, err := u.sdkClient.CreateCertificate(createCertificateReq)
 	u.logger.Debug("sdk request 'elb.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp))

internal/pkg/core/uploader/providers/ctcccloud-icdn/ctcccloud_icdn.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	ctyunicdn "github.com/usual2970/certimate/internal/pkg/sdk3rd/ctyun/icdn"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -57,7 +57,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -74,9 +74,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 		}
 
 		queryCertListReq := &ctyunicdn.QueryCertListRequest{
-			Page:      typeutil.ToPtr(queryCertListPage),
-			PerPage:   typeutil.ToPtr(queryCertListPerPage),
-			UsageMode: typeutil.ToPtr(int32(0)),
+			Page:      xtypes.ToPtr(queryCertListPage),
+			PerPage:   xtypes.ToPtr(queryCertListPerPage),
+			UsageMode: xtypes.ToPtr(int32(0)),
 		}
 		queryCertListResp, err := u.sdkClient.QueryCertList(queryCertListReq)
 		u.logger.Debug("sdk request 'icdn.QueryCertList'", slog.Any("request", queryCertListReq), slog.Any("response", queryCertListResp))
@@ -106,7 +106,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 				// 查询证书详情
 				// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=112&api=10837&data=173&isNormal=1&vid=166
 				queryCertDetailReq := &ctyunicdn.QueryCertDetailRequest{
-					Id: typeutil.ToPtr(certRecord.Id),
+					Id: xtypes.ToPtr(certRecord.Id),
 				}
 				queryCertDetailResp, err := u.sdkClient.QueryCertDetail(queryCertDetailReq)
 				u.logger.Debug("sdk request 'icdn.QueryCertDetail'", slog.Any("request", queryCertDetailReq), slog.Any("response", queryCertDetailResp))
@@ -117,12 +117,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 					if queryCertDetailResp.ReturnObj.Result.Certs == certPEM {
 						isSameCert = true
 					} else {
-						oldCertX509, err := certutil.ParseCertificateFromPEM(queryCertDetailResp.ReturnObj.Result.Certs)
+						oldCertX509, err := xcert.ParseCertificateFromPEM(queryCertDetailResp.ReturnObj.Result.Certs)
 						if err != nil {
 							continue
 						}
 
-						isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+						isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 					}
 
 					// 如果已存在相同证书，直接返回
@@ -150,9 +150,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 创建证书
 	// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=112&api=10835&data=173&isNormal=1&vid=166
 	createCertReq := &ctyunicdn.CreateCertRequest{
-		Name:  typeutil.ToPtr(certName),
-		Certs: typeutil.ToPtr(certPEM),
-		Key:   typeutil.ToPtr(privkeyPEM),
+		Name:  xtypes.ToPtr(certName),
+		Certs: xtypes.ToPtr(certPEM),
+		Key:   xtypes.ToPtr(privkeyPEM),
 	}
 	createCertResp, err := u.sdkClient.CreateCert(createCertReq)
 	u.logger.Debug("sdk request 'icdn.CreateCert'", slog.Any("request", createCertReq), slog.Any("response", createCertResp))

internal/pkg/core/uploader/providers/ctcccloud-lvdn/ctcccloud_lvdn.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	ctyunlvdn "github.com/usual2970/certimate/internal/pkg/sdk3rd/ctyun/lvdn"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -57,7 +57,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -74,9 +74,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 		}
 
 		queryCertListReq := &ctyunlvdn.QueryCertListRequest{
-			Page:      typeutil.ToPtr(queryCertListPage),
-			PerPage:   typeutil.ToPtr(queryCertListPerPage),
-			UsageMode: typeutil.ToPtr(int32(0)),
+			Page:      xtypes.ToPtr(queryCertListPage),
+			PerPage:   xtypes.ToPtr(queryCertListPerPage),
+			UsageMode: xtypes.ToPtr(int32(0)),
 		}
 		queryCertListResp, err := u.sdkClient.QueryCertList(queryCertListReq)
 		u.logger.Debug("sdk request 'lvdn.QueryCertList'", slog.Any("request", queryCertListReq), slog.Any("response", queryCertListResp))
@@ -106,7 +106,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 				// 查询证书详情
 				// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=125&api=11449&data=183&isNormal=1&vid=261
 				queryCertDetailReq := &ctyunlvdn.QueryCertDetailRequest{
-					Id: typeutil.ToPtr(certRecord.Id),
+					Id: xtypes.ToPtr(certRecord.Id),
 				}
 				queryCertDetailResp, err := u.sdkClient.QueryCertDetail(queryCertDetailReq)
 				u.logger.Debug("sdk request 'lvdn.QueryCertDetail'", slog.Any("request", queryCertDetailReq), slog.Any("response", queryCertDetailResp))
@@ -117,12 +117,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 					if queryCertDetailResp.ReturnObj.Result.Certs == certPEM {
 						isSameCert = true
 					} else {
-						oldCertX509, err := certutil.ParseCertificateFromPEM(queryCertDetailResp.ReturnObj.Result.Certs)
+						oldCertX509, err := xcert.ParseCertificateFromPEM(queryCertDetailResp.ReturnObj.Result.Certs)
 						if err != nil {
 							continue
 						}
 
-						isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+						isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 					}
 
 					// 如果已存在相同证书，直接返回
@@ -150,9 +150,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 创建证书
 	// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=125&api=11436&data=183&isNormal=1&vid=261
 	createCertReq := &ctyunlvdn.CreateCertRequest{
-		Name:  typeutil.ToPtr(certName),
-		Certs: typeutil.ToPtr(certPEM),
-		Key:   typeutil.ToPtr(privkeyPEM),
+		Name:  xtypes.ToPtr(certName),
+		Certs: xtypes.ToPtr(certPEM),
+		Key:   xtypes.ToPtr(privkeyPEM),
 	}
 	createCertResp, err := u.sdkClient.CreateCert(createCertReq)
 	u.logger.Debug("sdk request 'lvdn.CreateCert'", slog.Any("request", createCertReq), slog.Any("response", createCertResp))

internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go

@@ -17,8 +17,8 @@ import (
 	hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -68,7 +68,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -85,7 +85,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 		}
 
 		listCertificatesReq := &hcelbmodel.ListCertificatesRequest{
-			Limit:  typeutil.ToPtr(listCertificatesLimit),
+			Limit:  xtypes.ToPtr(listCertificatesLimit),
 			Marker: listCertificatesMarker,
 			Type:   &[]string{"server"},
 		}
@@ -101,12 +101,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 				if certDetail.Certificate == certPEM {
 					isSameCert = true
 				} else {
-					oldCertX509, err := certutil.ParseCertificateFromPEM(certDetail.Certificate)
+					oldCertX509, err := xcert.ParseCertificateFromPEM(certDetail.Certificate)
 					if err != nil {
 						continue
 					}
 
-					isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+					isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 				}
 
 				// 如果已存在相同证书，直接返回
@@ -143,11 +143,11 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	createCertificateReq := &hcelbmodel.CreateCertificateRequest{
 		Body: &hcelbmodel.CreateCertificateRequestBody{
 			Certificate: &hcelbmodel.CreateCertificateOption{
-				EnterpriseProjectId: typeutil.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
-				ProjectId:           typeutil.ToPtr(projectId),
-				Name:                typeutil.ToPtr(certName),
-				Certificate:         typeutil.ToPtr(certPEM),
-				PrivateKey:          typeutil.ToPtr(privkeyPEM),
+				EnterpriseProjectId: xtypes.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
+				ProjectId:           xtypes.ToPtr(projectId),
+				Name:                xtypes.ToPtr(certName),
+				Certificate:         xtypes.ToPtr(certPEM),
+				PrivateKey:          xtypes.ToPtr(privkeyPEM),
 			},
 		},
 	}

internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go

@@ -12,8 +12,8 @@ import (
 	hcscmregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/region"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -63,7 +63,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -81,11 +81,11 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 		}
 
 		listCertificatesReq := &hcscmmodel.ListCertificatesRequest{
-			EnterpriseProjectId: typeutil.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
-			Limit:               typeutil.ToPtr(listCertificatesLimit),
-			Offset:              typeutil.ToPtr(listCertificatesOffset),
-			SortDir:             typeutil.ToPtr("DESC"),
-			SortKey:             typeutil.ToPtr("certExpiredTime"),
+			EnterpriseProjectId: xtypes.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
+			Limit:               xtypes.ToPtr(listCertificatesLimit),
+			Offset:              xtypes.ToPtr(listCertificatesOffset),
+			SortDir:             xtypes.ToPtr("DESC"),
+			SortKey:             xtypes.ToPtr("certExpiredTime"),
 		}
 		listCertificatesResp, err := u.sdkClient.ListCertificates(listCertificatesReq)
 		u.logger.Debug("sdk request 'scm.ListCertificates'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp))
@@ -111,12 +111,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 				if *exportCertificateResp.Certificate == certPEM {
 					isSameCert = true
 				} else {
-					oldCertX509, err := certutil.ParseCertificateFromPEM(*exportCertificateResp.Certificate)
+					oldCertX509, err := xcert.ParseCertificateFromPEM(*exportCertificateResp.Certificate)
 					if err != nil {
 						continue
 					}
 
-					isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+					isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 				}
 
 				// 如果已存在相同证书，直接返回
@@ -145,7 +145,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// REF: https://support.huaweicloud.com/api-ccm/ImportCertificate.html
 	importCertificateReq := &hcscmmodel.ImportCertificateRequest{
 		Body: &hcscmmodel.ImportCertificateRequestBody{
-			EnterpriseProjectId: typeutil.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
+			EnterpriseProjectId: xtypes.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
 			Name:                certName,
 			Certificate:         certPEM,
 			PrivateKey:          privkeyPEM,

internal/pkg/core/uploader/providers/huaweicloud-waf/huaweicloud_waf.go

@@ -17,8 +17,8 @@ import (
 	hcwafregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -68,7 +68,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -86,9 +86,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 		}
 
 		listCertificatesReq := &hcwafmodel.ListCertificatesRequest{
-			EnterpriseProjectId: typeutil.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
-			Page:                typeutil.ToPtr(listCertificatesPage),
-			Pagesize:            typeutil.ToPtr(listCertificatesPageSize),
+			EnterpriseProjectId: xtypes.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
+			Page:                xtypes.ToPtr(listCertificatesPage),
+			Pagesize:            xtypes.ToPtr(listCertificatesPageSize),
 		}
 		listCertificatesResp, err := u.sdkClient.ListCertificates(listCertificatesReq)
 		u.logger.Debug("sdk request 'waf.ShowCertificate'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp))
@@ -99,7 +99,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 		if listCertificatesResp.Items != nil {
 			for _, certItem := range *listCertificatesResp.Items {
 				showCertificateReq := &hcwafmodel.ShowCertificateRequest{
-					EnterpriseProjectId: typeutil.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
+					EnterpriseProjectId: xtypes.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
 					CertificateId:       certItem.Id,
 				}
 				showCertificateResp, err := u.sdkClient.ShowCertificate(showCertificateReq)
@@ -112,12 +112,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 				if *showCertificateResp.Content == certPEM {
 					isSameCert = true
 				} else {
-					oldCertX509, err := certutil.ParseCertificateFromPEM(*showCertificateResp.Content)
+					oldCertX509, err := xcert.ParseCertificateFromPEM(*showCertificateResp.Content)
 					if err != nil {
 						continue
 					}
 
-					isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+					isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 				}
 
 				// 如果已存在相同证书，直接返回
@@ -145,7 +145,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 创建证书
 	// REF: https://support.huaweicloud.com/api-waf/CreateCertificate.html
 	createCertificateReq := &hcwafmodel.CreateCertificateRequest{
-		EnterpriseProjectId: typeutil.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
+		EnterpriseProjectId: xtypes.ToPtrOrZeroNil(u.config.EnterpriseProjectId),
 		Body: &hcwafmodel.CreateCertificateRequestBody{
 			Name:    certName,
 			Content: certPEM,

internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go

@@ -15,7 +15,7 @@ import (
 	"golang.org/x/exp/slices"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -61,7 +61,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}

internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	qiniusdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/qiniu"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -57,7 +57,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}

internal/pkg/core/uploader/providers/rainyun-sslcenter/rainyun_sslcenter.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	rainyunsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/rainyun"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -84,7 +84,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 
 func (u *UploaderProvider) findCertIfExists(ctx context.Context, certPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -137,12 +137,12 @@ func (u *UploaderProvider) findCertIfExists(ctx context.Context, certPEM string)
 					if sslCenterGetResp.Data.Cert == certPEM {
 						isSameCert = true
 					} else {
-						oldCertX509, err := certutil.ParseCertificateFromPEM(sslCenterGetResp.Data.Cert)
+						oldCertX509, err := xcert.ParseCertificateFromPEM(sslCenterGetResp.Data.Cert)
 						if err != nil {
 							continue
 						}
 
-						isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+						isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 					}
 				}
 

internal/pkg/core/uploader/providers/ucloud-ussl/ucloud_ussl.go

@@ -17,7 +17,7 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	usslsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/ucloud/ussl"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -113,7 +113,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 
 func (u *UploaderProvider) findCertIfExists(ctx context.Context, certPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}

internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go

@@ -14,7 +14,7 @@ import (
 	ve "github.com/volcengine/volcengine-go-sdk/volcengine"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -59,7 +59,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}

internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go

@@ -11,7 +11,7 @@ import (
 	ve "github.com/volcengine/volcengine-go-sdk/volcengine"
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
 )
 
 type UploaderConfig struct {
@@ -56,7 +56,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -87,12 +87,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 			if certificate == certPEM {
 				isSameCert = true
 			} else {
-				oldCertX509, err := certutil.ParseCertificateFromPEM(certificate)
+				oldCertX509, err := xcert.ParseCertificateFromPEM(certificate)
 				if err != nil {
 					continue
 				}
 
-				isSameCert = certutil.EqualCertificate(certX509, oldCertX509)
+				isSameCert = xcert.EqualCertificate(certX509, oldCertX509)
 			}
 
 			// 如果已存在相同证书，直接返回

internal/pkg/core/uploader/providers/wangsu-certificate/wangsu_certificate.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
 	wangsusdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/wangsu/certificate"
-	certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
-	typeutil "github.com/usual2970/certimate/internal/pkg/utils/type"
+	xcert "github.com/usual2970/certimate/internal/pkg/utils/cert"
+	xtypes "github.com/usual2970/certimate/internal/pkg/utils/types"
 )
 
 type UploaderConfig struct {
@@ -58,7 +58,7 @@ func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader {
 
 func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPEM string) (*uploader.UploadResult, error) {
 	// 解析证书内容
-	certX509, err := certutil.ParseCertificateFromPEM(certPEM)
+	certX509, err := xcert.ParseCertificateFromPEM(certPEM)
 	if err != nil {
 		return nil, err
 	}
@@ -102,10 +102,10 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
 	// 新增证书
 	// REF: https://www.wangsu.com/document/api-doc/25199?productCode=certificatemanagement
 	createCertificateReq := &wangsusdk.CreateCertificateRequest{
-		Name:        typeutil.ToPtr(certName),
-		Certificate: typeutil.ToPtr(certPEM),
-		PrivateKey:  typeutil.ToPtr(privkeyPEM),
-		Comment:     typeutil.ToPtr("upload from certimate"),
+		Name:        xtypes.ToPtr(certName),
+		Certificate: xtypes.ToPtr(certPEM),
+		PrivateKey:  xtypes.ToPtr(privkeyPEM),
+		Comment:     xtypes.ToPtr("upload from certimate"),
 	}
 	createCertificateResp, err := u.sdkClient.CreateCertificate(createCertificateReq)
 	u.logger.Debug("sdk request 'certificatemanagement.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp))