github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: Fix Issue with DNS Account Deletion After Certificate Update Ap… (#7303) 

Refs https://github.com/1Panel-dev/1Panel/issues/7300
pull/7306/head
zhengkunwang 2024-12-10 11:15:38 +08:00 committed by GitHub
parent 2bc07c91df
commit 162a0c543c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -512,6 +512,8 @@ func (w WebsiteSSLService) Update(update request.WebsiteSSLUpdate) error {
return err return err
} }
updateParams["dns_account_id"] = dnsAccount.ID updateParams["dns_account_id"] = dnsAccount.ID
} else {
updateParams["dns_account_id"] = 0
} }
return websiteSSLRepo.SaveByMap(websiteSSL, updateParams) return websiteSSLRepo.SaveByMap(websiteSSL, updateParams)
} }

4
backend/utils/geo/geo.go
View File

@ -33,7 +33,7 @@ func GetIPLocation(ip, lang string) (string, error) {
return "", err return "", err
} }
if lang == "en" { if lang == "en" {
return geoLocation.Country.En + geoLocation.Province.En, nil return geoLocation.Country.En + " " + geoLocation.Province.En, nil
} }
return geoLocation.Country.Zh + geoLocation.Province.Zh, nil return geoLocation.Country.Zh + " " + geoLocation.Province.Zh, nil
} }