gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 22:18:07 +08:00
Code

fix: 解决自签证书开启自动续签报错的问题 (#5335)

Browse Source
This commit is contained in:
zhengkunwang 2024-06-07 11:02:03 +08:00 committed by GitHub
parent c394efa2ec
commit 63305e7316
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/dto/request/website_ssl.go
View File

@ -77,7 +77,7 @@ type WebsiteSSLUpdate struct {
PrimaryDomain string `json:"primaryDomain" validate:"required"` PrimaryDomain string `json:"primaryDomain" validate:"required"`
OtherDomains string `json:"otherDomains"` OtherDomains string `json:"otherDomains"`
Provider string `json:"provider" validate:"required"` Provider string `json:"provider" validate:"required"`
AcmeAccountID uint `json:"acmeAccountId" validate:"required"` AcmeAccountID uint `json:"acmeAccountId"`
DnsAccountID uint `json:"dnsAccountId"` DnsAccountID uint `json:"dnsAccountId"`
KeyType string `json:"keyType"` KeyType string `json:"keyType"`
Apply bool `json:"apply"` Apply bool `json:"apply"`

4
backend/app/service/website_ssl.go
View File

@ -389,11 +389,13 @@ func (w WebsiteSSLService) Update(update request.WebsiteSSLUpdate) error {
updateParams["nameserver1"] = update.Nameserver1 updateParams["nameserver1"] = update.Nameserver1
updateParams["nameserver2"] = update.Nameserver2 updateParams["nameserver2"] = update.Nameserver2
if websiteSSL.Provider != constant.SelfSigned {
acmeAccount, err := websiteAcmeRepo.GetFirst(commonRepo.WithByID(update.AcmeAccountID)) acmeAccount, err := websiteAcmeRepo.GetFirst(commonRepo.WithByID(update.AcmeAccountID))
if err != nil { if err != nil {
return err return err
} }
updateParams["acme_account_id"] = acmeAccount.ID updateParams["acme_account_id"] = acmeAccount.ID
}
if update.PushDir { if update.PushDir {
if !files.NewFileOp().Stat(update.Dir) { if !files.NewFileOp().Stat(update.Dir) {
@ -412,7 +414,7 @@ func (w WebsiteSSLService) Update(update request.WebsiteSSLUpdate) error {
} }
} }
updateParams["domains"] = strings.Join(domains, ",") updateParams["domains"] = strings.Join(domains, ",")
if update.Provider == constant.DNSAccount || update.Provider == constant.Http { if update.Provider == constant.DNSAccount || update.Provider == constant.Http || update.Provider == constant.SelfSigned {
updateParams["auto_renew"] = update.AutoRenew updateParams["auto_renew"] = update.AutoRenew
} else { } else {
updateParams["auto_renew"] = false updateParams["auto_renew"] = false