diff --git a/agent/app/service/website_ssl.go b/agent/app/service/website_ssl.go index bcc3c760d4c4..8d95c6d18bd5 100644 --- a/agent/app/service/website_ssl.go +++ b/agent/app/service/website_ssl.go @@ -448,15 +448,19 @@ func (w WebsiteSSLService) Delete(ids []uint) error { if err != nil { return err } - acmeAccount, err := websiteAcmeRepo.GetFirst(repo.WithByID(websiteSSL.AcmeAccountID)) - if err != nil { - return err - } - client, err := ssl.NewAcmeClient(acmeAccount) - if err != nil { - return err + if websiteSSL.Type != constant.Manual && websiteSSL.Type != constant.SelfSigned { + acmeAccount, err := websiteAcmeRepo.GetFirst(repo.WithByID(websiteSSL.AcmeAccountID)) + if err != nil { + return err + } + client, err := ssl.NewAcmeClient(acmeAccount) + if err != nil { + return err + } + go func() { + _ = client.RevokeSSL([]byte(websiteSSL.Pem)) + }() } - _ = client.RevokeSSL([]byte(websiteSSL.Pem)) _ = websiteSSLRepo.DeleteBy(repo.WithByID(id)) } if len(names) > 0 { diff --git a/frontend/src/components/backup/index.vue b/frontend/src/components/backup/index.vue index c8fcb3ef1a0f..8f858825d788 100644 --- a/frontend/src/components/backup/index.vue +++ b/frontend/src/components/backup/index.vue @@ -3,7 +3,7 @@ v-model="backupVisible" :header="$t('commons.button.backup')" :resource="detailName ? name + ' [' + detailName + ']' : name" - :back="handleClose" + @close="handleClose" size="large" >