相关区域名称可以显示别名

internal/web/actions/default/servers/components/waf/ipadmin/index.go

@@ -36,7 +36,7 @@ func (this *IndexAction) RunGet(params struct {
 		this.NotFound("firewallPolicy", params.FirewallPolicyId)
 		return
 	}
-	selectedCountryIds := []int64{}
+	var selectedCountryIds = []int64{}
 	if policyConfig.Inbound != nil && policyConfig.Inbound.Region != nil {
 		selectedCountryIds = policyConfig.Inbound.Region.DenyCountryIds
 	}
@@ -46,11 +46,11 @@ func (this *IndexAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	countryMaps := []maps.Map{}
+	var countryMaps = []maps.Map{}
 	for _, country := range countriesResp.RegionCountries {
 		countryMaps = append(countryMaps, maps.Map{
 			"id":        country.Id,
-			"name":      country.Name,
+			"name":      country.DisplayName,
 			"letter":    strings.ToUpper(string(country.Pinyin[0][0])),
 			"isChecked": lists.ContainsInt64(selectedCountryIds, country.Id),
 		})

internal/web/actions/default/servers/components/waf/ipadmin/provinces.go

@@ -37,7 +37,7 @@ func (this *ProvincesAction) RunGet(params struct {
 		this.NotFound("firewallPolicy", params.FirewallPolicyId)
 		return
 	}
-	selectedProvinceIds := []int64{}
+	var selectedProvinceIds = []int64{}
 	if policyConfig.Inbound != nil && policyConfig.Inbound.Region != nil {
 		selectedProvinceIds = policyConfig.Inbound.Region.DenyProvinceIds
 	}
@@ -49,11 +49,11 @@ func (this *ProvincesAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	provinceMaps := []maps.Map{}
+	var provinceMaps = []maps.Map{}
 	for _, province := range provincesResp.RegionProvinces {
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":        province.Id,
-			"name":      province.Name,
+			"name":      province.DisplayName,
 			"isChecked": lists.ContainsInt64(selectedProvinceIds, province.Id),
 		})
 	}

internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/countries.go

@@ -55,7 +55,7 @@ func (this *CountriesAction) RunGet(params struct {
 	for _, country := range countriesResp.RegionCountries {
 		countryMaps = append(countryMaps, maps.Map{
 			"id":        country.Id,
-			"name":      country.Name,
+			"name":      country.DisplayName,
 			"letter":    strings.ToUpper(string(country.Pinyin[0][0])),
 			"isChecked": lists.ContainsInt64(selectedCountryIds, country.Id),
 		})

internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/provinces.go

@@ -46,7 +46,7 @@ func (this *ProvincesAction) RunGet(params struct {
 		selectedProvinceIds = policyConfig.Inbound.Region.DenyProvinceIds
 	}
 
-	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithCountryIdRequest{
+	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{
 		RegionCountryId: int64(ChinaCountryId),
 	})
 	if err != nil {
@@ -57,7 +57,7 @@ func (this *ProvincesAction) RunGet(params struct {
 	for _, province := range provincesResp.RegionProvinces {
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":        province.Id,
-			"name":      province.Name,
+			"name":      province.DisplayName,
 			"isChecked": lists.ContainsInt64(selectedProvinceIds, province.Id),
 		})
 	}

internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go

@@ -55,7 +55,7 @@ func (this *CountriesAction) RunGet(params struct {
 	for _, country := range countriesResp.RegionCountries {
 		countryMaps = append(countryMaps, maps.Map{
 			"id":        country.Id,
-			"name":      country.Name,
+			"name":      country.DisplayName,
 			"letter":    strings.ToUpper(string(country.Pinyin[0][0])),
 			"isChecked": lists.ContainsInt64(selectedCountryIds, country.Id),
 		})

internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go

@@ -57,7 +57,7 @@ func (this *ProvincesAction) RunGet(params struct {
 	for _, province := range provincesResp.RegionProvinces {
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":        province.Id,
-			"name":      province.Name,
+			"name":      province.DisplayName,
 			"isChecked": lists.ContainsInt64(selectedProvinceIds, province.Id),
 		})
 	}

internal/web/actions/default/settings/security/index.go

@@ -40,7 +40,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 		if country != nil {
 			countryMaps = append(countryMaps, maps.Map{
 				"id":   country.Id,
-				"name": country.Name,
+				"name": country.DisplayName,
 			})
 		}
 	}
@@ -58,7 +58,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 		if province != nil {
 			provinceMaps = append(provinceMaps, maps.Map{
 				"id":   province.Id,
-				"name": province.Name,
+				"name": province.DisplayName,
 			})
 		}
 	}

internal/web/actions/default/ui/provinceOptions.go

@@ -25,7 +25,7 @@ func (this *ProvinceOptionsAction) RunPost(params struct{}) {
 		}
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":    province.Id,
-			"name":  province.Name,
+			"name":  province.DisplayName,
 			"codes": province.Codes,
 		})
 	}

internal/web/actions/default/ui/selectCountriesPopup.go

@@ -32,7 +32,7 @@ func (this *SelectCountriesPopupAction) RunGet(params struct {
 	for _, country := range countriesResp.RegionCountries {
 		countryMaps = append(countryMaps, maps.Map{
 			"id":        country.Id,
-			"name":      country.Name,
+			"name":      country.DisplayName,
 			"letter":    strings.ToUpper(string(country.Pinyin[0][0])),
 			"isChecked": lists.ContainsInt64(selectedCountryIds, country.Id),
 		})
@@ -61,7 +61,7 @@ func (this *SelectCountriesPopupAction) RunPost(params struct {
 		}
 		countryMaps = append(countryMaps, maps.Map{
 			"id":   country.Id,
-			"name": country.Name,
+			"name": country.DisplayName,
 		})
 	}
 	this.Data["countries"] = countryMaps

internal/web/actions/default/ui/selectProvincesPopup.go

@@ -33,7 +33,7 @@ func (this *SelectProvincesPopupAction) RunGet(params struct {
 	for _, province := range provincesResp.RegionProvinces {
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":        province.Id,
-			"name":      province.Name,
+			"name":      province.DisplayName,
 			"isChecked": lists.ContainsInt64(selectedProvinceIds, province.Id),
 		})
 	}
@@ -61,7 +61,7 @@ func (this *SelectProvincesPopupAction) RunPost(params struct {
 		}
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":   province.Id,
-			"name": province.Name,
+			"name": province.DisplayName,
 		})
 	}
 	this.Data["provinces"] = provinceMaps

web/views/@default/@layout.css

@@ -164,7 +164,7 @@ span.disabled {
 a.enabled,
 span.enabled,
 span.green {
-  color: #21ba45;
+  color: #2c662d;
 }
 span.grey,
 label.grey,

web/views/@default/@layout.less

@@ -19,7 +19,7 @@ a.disabled, a.disabled:hover, a.disabled:active, span.disabled {
 }
 
 a.enabled, span.enabled, span.green {
-	color: #21ba45;
+	color: #2c662d;
 }
 
 span.grey, label.grey, p.grey {