diff --git a/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go b/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go index 15a6e84e6..2f46a0b79 100644 --- a/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go +++ b/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go @@ -89,8 +89,8 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo // 对比证书有效期 newCertNotBefore := certX509.NotBefore newCertNotAfter := certX509.NotAfter - oldCertNotBefore, _ := time.Parse("2006-01-02T15:04:05Z", certItem.CertStartTime) - oldCertNotAfter, _ := time.Parse("2006-01-02T15:04:05Z", certItem.CertStopTime) + oldCertNotBefore, _ := time.Parse(time.RFC3339, certItem.CertStartTime) + oldCertNotAfter, _ := time.Parse(time.RFC3339, certItem.CertStopTime) if !newCertNotBefore.Equal(oldCertNotBefore) || !newCertNotAfter.Equal(oldCertNotAfter) { continue } diff --git a/pkg/core/certmgr/providers/cmcccloud-vlb/cmcccloud_vlb.go b/pkg/core/certmgr/providers/cmcccloud-vlb/cmcccloud_vlb.go index c074244dd..899272bd8 100644 --- a/pkg/core/certmgr/providers/cmcccloud-vlb/cmcccloud_vlb.go +++ b/pkg/core/certmgr/providers/cmcccloud-vlb/cmcccloud_vlb.go @@ -88,7 +88,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo for _, certItem := range *listLoadbalanceCertificationResp.Body.Content { // 对比证书有效期 newCertNotAfter := certX509.NotAfter - oldCertNotAfter, _ := time.Parse(time.DateTime, lo.FromPtr(certItem.ExpirationTime)) + oldCertNotAfter, _ := time.ParseInLocation(time.DateTime, lo.FromPtr(certItem.ExpirationTime), time.FixedZone("CST", 8*60*60)) if !newCertNotAfter.Equal(oldCertNotAfter) { continue } diff --git a/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go b/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go index 8549c08bd..bb64df909 100644 --- a/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go +++ b/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go @@ -165,8 +165,8 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) // 对比证书有效期 newCertNotBefore := certX509.NotBefore newCertNotAfter := certX509.NotAfter - oldCertNotBefore, _ := time.Parse("2006-01-02T15:04:05Z", certItem.IssueTime) - oldCertNotAfter, _ := time.Parse("2006-01-02T15:04:05Z", certItem.ExpireTime) + oldCertNotBefore, _ := time.Parse(time.RFC3339, certItem.IssueTime) + oldCertNotAfter, _ := time.Parse(time.RFC3339, certItem.ExpireTime) if !newCertNotBefore.Equal(oldCertNotBefore) || !newCertNotAfter.Equal(oldCertNotAfter) { continue } diff --git a/pkg/core/certmgr/providers/digitalocean-certificate/digitalocean_certificate.go b/pkg/core/certmgr/providers/digitalocean-certificate/digitalocean_certificate.go index 35fbf5da8..59d57b57e 100644 --- a/pkg/core/certmgr/providers/digitalocean-certificate/digitalocean_certificate.go +++ b/pkg/core/certmgr/providers/digitalocean-certificate/digitalocean_certificate.go @@ -105,7 +105,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo // 对比证书有效期 newCertNotAfter := certX509.NotAfter - oldCertNotAfter, _ := time.Parse("2006-01-02T15:04:05Z", certItem.NotAfter) + oldCertNotAfter, _ := time.Parse(time.RFC3339, certItem.NotAfter) if !newCertNotAfter.Equal(oldCertNotAfter) { continue } diff --git a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go index 6a08929a6..1041bc290 100644 --- a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go +++ b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go @@ -113,8 +113,8 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo // 对比证书有效期 newCertNotBefore := certX509.NotBefore newCertNotAfter := certX509.NotAfter - oldCertNotBefore, _ := time.Parse("2006-01-02T15:04:05Z", certItem.StartTime) - oldCertNotAfter, _ := time.Parse("2006-01-02T15:04:05Z", certItem.EndTime) + oldCertNotBefore, _ := time.Parse(time.RFC3339, certItem.StartTime) + oldCertNotAfter, _ := time.Parse(time.RFC3339, certItem.EndTime) if !newCertNotBefore.Equal(oldCertNotBefore) || !newCertNotAfter.Equal(oldCertNotAfter) { continue } diff --git a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go index dcece9cdb..d37aca17a 100644 --- a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go +++ b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go @@ -113,8 +113,8 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo // 对比证书有效期 newCertNotBefore := certX509.NotBefore newCertNotAfter := certX509.NotAfter - oldCertNotBefore, _ := time.Parse("2006-01-02T15:04:05Z", certItem.StartTime) - oldCertNotAfter, _ := time.Parse("2006-01-02T15:04:05Z", certItem.EndTime) + oldCertNotBefore, _ := time.Parse(time.RFC3339, certItem.StartTime) + oldCertNotAfter, _ := time.Parse(time.RFC3339, certItem.EndTime) if !newCertNotBefore.Equal(oldCertNotBefore) || !newCertNotAfter.Equal(oldCertNotAfter) { continue } diff --git a/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go b/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go index a36b199c1..d28f48d24 100644 --- a/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go +++ b/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go @@ -235,7 +235,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep continue } - certExpireTime, _ := time.Parse("2006-01-02T15:04:05Z", lo.FromPtr(certInfo.ExpireTime)) + certExpireTime, _ := time.Parse(time.RFC3339, lo.FromPtr(certInfo.ExpireTime)) if certExpireTime.Before(time.Now()) { continue } diff --git a/pkg/core/deployer/providers/tencentcloud-eomakers/tencentcloud_eomakers.go b/pkg/core/deployer/providers/tencentcloud-eomakers/tencentcloud_eomakers.go index 31ea364d9..18ae98849 100644 --- a/pkg/core/deployer/providers/tencentcloud-eomakers/tencentcloud_eomakers.go +++ b/pkg/core/deployer/providers/tencentcloud-eomakers/tencentcloud_eomakers.go @@ -268,7 +268,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep continue } - certExpireTime, _ := time.Parse("2006-01-02T15:04:05Z", lo.FromPtr(certInfo.ExpireTime)) + certExpireTime, _ := time.Parse(time.RFC3339, lo.FromPtr(certInfo.ExpireTime)) if certExpireTime.Before(time.Now()) { continue }