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

zhengkunwang223 · web-flow · commit 162a0c543c8a · 2024-12-10T03:15:38.000Z
Refs #7300
diff --git a/backend/app/service/website_ssl.go b/backend/app/service/website_ssl.go
@@ -512,6 +512,8 @@ func (w WebsiteSSLService) Update(update request.WebsiteSSLUpdate) error {
 			return err
 		}
 		updateParams["dns_account_id"] = dnsAccount.ID
+	} else {
+		updateParams["dns_account_id"] = 0
 	}
 	return websiteSSLRepo.SaveByMap(websiteSSL, updateParams)
 }
diff --git a/backend/utils/geo/geo.go b/backend/utils/geo/geo.go
@@ -33,7 +33,7 @@ func GetIPLocation(ip, lang string) (string, error) {
 		return "", err
 	}
 	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
 }

Original file line number	Diff line number	Diff line change
`@@ -512,6 +512,8 @@ func (w WebsiteSSLService) Update(update request.WebsiteSSLUpdate) error {`
`512`	`512`	`return err`
`513`	`513`	`}`
`514`	`514`	`updateParams["dns_account_id"] = dnsAccount.ID`
	`515`	`+ } else {`
	`516`	`+ updateParams["dns_account_id"] = 0`
`515`	`517`	`}`
`516`	`518`	`return websiteSSLRepo.SaveByMap(websiteSSL, updateParams)`
`517`	`519`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func GetIPLocation(ip, lang string) (string, error) {`
`33`	`33`	`return "", err`
`34`	`34`	`}`
`35`	`35`	`if lang == "en" {`
`36`		`- return geoLocation.Country.En + geoLocation.Province.En, nil`
	`36`	`+ return geoLocation.Country.En + " " + geoLocation.Province.En, nil`
`37`	`37`	`}`
`38`		`- return geoLocation.Country.Zh + geoLocation.Province.Zh, nil`
	`38`	`+ return geoLocation.Country.Zh + " " + geoLocation.Province.Zh, nil`
`39`	`39`	`}`