diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/index.go b/internal/web/actions/default/servers/components/waf/ipadmin/index.go
index 4535a802..191b6313 100644
--- a/internal/web/actions/default/servers/components/waf/ipadmin/index.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/index.go
@@ -47,7 +47,7 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 	countryMaps := []maps.Map{}
-	for _, country := range countriesResp.Countries {
+	for _, country := range countriesResp.RegionCountries {
 		countryMaps = append(countryMaps, maps.Map{
 			"id":        country.Id,
 			"name":      country.Name,
diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go b/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go
index b6592c5c..ebacbcd6 100644
--- a/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go
@@ -43,14 +43,14 @@ func (this *ProvincesAction) RunGet(params struct {
 	}
 
 	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllEnabledRegionProvincesWithCountryId(this.AdminContext(), &pb.FindAllEnabledRegionProvincesWithCountryIdRequest{
-		CountryId: int64(ChinaCountryId),
+		RegionCountryId: int64(ChinaCountryId),
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	provinceMaps := []maps.Map{}
-	for _, province := range provincesResp.Provinces {
+	for _, province := range provincesResp.RegionProvinces {
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":        province.Id,
 			"name":      province.Name,
diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go
index 4bc68e7b..910d4221 100644
--- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go
+++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go
@@ -52,7 +52,7 @@ func (this *CountriesAction) RunGet(params struct {
 		return
 	}
 	countryMaps := []maps.Map{}
-	for _, country := range countriesResp.Countries {
+	for _, country := range countriesResp.RegionCountries {
 		countryMaps = append(countryMaps, maps.Map{
 			"id":        country.Id,
 			"name":      country.Name,
diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go
index 3b92ffe4..ca879515 100644
--- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go
+++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go
@@ -47,14 +47,14 @@ func (this *ProvincesAction) RunGet(params struct {
 	}
 
 	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllEnabledRegionProvincesWithCountryId(this.AdminContext(), &pb.FindAllEnabledRegionProvincesWithCountryIdRequest{
-		CountryId: int64(ChinaCountryId),
+		RegionCountryId: int64(ChinaCountryId),
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	provinceMaps := []maps.Map{}
-	for _, province := range provincesResp.Provinces {
+	for _, province := range provincesResp.RegionProvinces {
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":        province.Id,
 			"name":      province.Name,
diff --git a/internal/web/actions/default/settings/security/index.go b/internal/web/actions/default/settings/security/index.go
index d972d7ac..f9071791 100644
--- a/internal/web/actions/default/settings/security/index.go
+++ b/internal/web/actions/default/settings/security/index.go
@@ -31,12 +31,12 @@ func (this *IndexAction) RunGet(params struct{}) {
 	// 国家和地区
 	countryMaps := []maps.Map{}
 	for _, countryId := range config.AllowCountryIds {
-		countryResp, err := this.RPC().RegionCountryRPC().FindEnabledRegionCountry(this.AdminContext(), &pb.FindEnabledRegionCountryRequest{CountryId: countryId})
+		countryResp, err := this.RPC().RegionCountryRPC().FindEnabledRegionCountry(this.AdminContext(), &pb.FindEnabledRegionCountryRequest{RegionCountryId: countryId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		country := countryResp.Country
+		country := countryResp.RegionCountry
 		if country != nil {
 			countryMaps = append(countryMaps, maps.Map{
 				"id":   country.Id,
@@ -49,12 +49,12 @@ func (this *IndexAction) RunGet(params struct{}) {
 	// 省份
 	provinceMaps := []maps.Map{}
 	for _, provinceId := range config.AllowProvinceIds {
-		provinceResp, err := this.RPC().RegionProvinceRPC().FindEnabledRegionProvince(this.AdminContext(), &pb.FindEnabledRegionProvinceRequest{ProvinceId: provinceId})
+		provinceResp, err := this.RPC().RegionProvinceRPC().FindEnabledRegionProvince(this.AdminContext(), &pb.FindEnabledRegionProvinceRequest{RegionProvinceId: provinceId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		province := provinceResp.Province
+		province := provinceResp.RegionProvince
 		if province != nil {
 			provinceMaps = append(provinceMaps, maps.Map{
 				"id":   province.Id,
diff --git a/internal/web/actions/default/ui/selectCountriesPopup.go b/internal/web/actions/default/ui/selectCountriesPopup.go
index 23a833fb..8e31b453 100644
--- a/internal/web/actions/default/ui/selectCountriesPopup.go
+++ b/internal/web/actions/default/ui/selectCountriesPopup.go
@@ -29,7 +29,7 @@ func (this *SelectCountriesPopupAction) RunGet(params struct {
 		return
 	}
 	countryMaps := []maps.Map{}
-	for _, country := range countriesResp.Countries {
+	for _, country := range countriesResp.RegionCountries {
 		countryMaps = append(countryMaps, maps.Map{
 			"id":        country.Id,
 			"name":      country.Name,
@@ -50,12 +50,12 @@ func (this *SelectCountriesPopupAction) RunPost(params struct {
 }) {
 	countryMaps := []maps.Map{}
 	for _, countryId := range params.CountryIds {
-		countryResp, err := this.RPC().RegionCountryRPC().FindEnabledRegionCountry(this.AdminContext(), &pb.FindEnabledRegionCountryRequest{CountryId: countryId})
+		countryResp, err := this.RPC().RegionCountryRPC().FindEnabledRegionCountry(this.AdminContext(), &pb.FindEnabledRegionCountryRequest{RegionCountryId: countryId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		country := countryResp.Country
+		country := countryResp.RegionCountry
 		if country == nil {
 			continue
 		}
diff --git a/internal/web/actions/default/ui/selectProvincesPopup.go b/internal/web/actions/default/ui/selectProvincesPopup.go
index e9448a90..548824a1 100644
--- a/internal/web/actions/default/ui/selectProvincesPopup.go
+++ b/internal/web/actions/default/ui/selectProvincesPopup.go
@@ -24,13 +24,13 @@ func (this *SelectProvincesPopupAction) RunGet(params struct {
 }) {
 	selectedProvinceIds := utils.SplitNumbers(params.ProvinceIds)
 
-	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllEnabledRegionProvincesWithCountryId(this.AdminContext(), &pb.FindAllEnabledRegionProvincesWithCountryIdRequest{CountryId: ChinaCountryId})
+	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllEnabledRegionProvincesWithCountryId(this.AdminContext(), &pb.FindAllEnabledRegionProvincesWithCountryIdRequest{RegionCountryId: ChinaCountryId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	provinceMaps := []maps.Map{}
-	for _, province := range provincesResp.Provinces {
+	for _, province := range provincesResp.RegionProvinces {
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":        province.Id,
 			"name":      province.Name,
@@ -50,12 +50,12 @@ func (this *SelectProvincesPopupAction) RunPost(params struct {
 }) {
 	provinceMaps := []maps.Map{}
 	for _, provinceId := range params.ProvinceIds {
-		provinceResp, err := this.RPC().RegionProvinceRPC().FindEnabledRegionProvince(this.AdminContext(), &pb.FindEnabledRegionProvinceRequest{ProvinceId: provinceId})
+		provinceResp, err := this.RPC().RegionProvinceRPC().FindEnabledRegionProvince(this.AdminContext(), &pb.FindEnabledRegionProvinceRequest{RegionProvinceId: provinceId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		province := provinceResp.Province
+		province := provinceResp.RegionProvince
 		if province == nil {
 			continue
 		}
diff --git a/web/views/@default/servers/index.css b/web/views/@default/servers/index.css
index 5251c0c0..17de8198 100644
--- a/web/views/@default/servers/index.css
+++ b/web/views/@default/servers/index.css
@@ -13,4 +13,17 @@
 .node-logs-box::-webkit-scrollbar {
   width: 4px;
 }
+.server-name-td {
+  position: relative;
+}
+.server-name-td .icon.setting {
+  display: none;
+  position: absolute;
+  right: 1em;
+  top: 50%;
+  margin-top: -1em;
+}
+.server-name-td:hover .icon.setting {
+  display: inline;
+}
 /*# sourceMappingURL=index.css.map */
\ No newline at end of file
diff --git a/web/views/@default/servers/index.css.map b/web/views/@default/servers/index.css.map
index 59be8e59..0f85d29a 100644
--- a/web/views/@default/servers/index.css.map
+++ b/web/views/@default/servers/index.css.map
@@ -1 +1 @@
-{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,GAAG,QACF,MAAK;EACJ,kBAAA;EACA,UAAA;EACA,UAAA;;AAJF,GAAG,QAOF;EACC,kBAAA;;AAIF;EACC,gBAAA;EACA,gBAAA;;AAGD,cAAc;EACb,UAAA","file":"index.css"}
\ No newline at end of file
+{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,GAAG,QACF,MAAK;EACJ,kBAAA;EACA,UAAA;EACA,UAAA;;AAJF,GAAG,QAOF;EACC,kBAAA;;AAIF;EACC,gBAAA;EACA,gBAAA;;AAGD,cAAc;EACb,UAAA;;AAGD;EACC,kBAAA;;AADD,eAGC,MAAK;EACJ,aAAA;EACA,kBAAA;EACA,UAAA;EACA,QAAA;EACA,gBAAA;;AAIF,eAAe,MACd,MAAK;EACJ,eAAA","file":"index.css"}
\ No newline at end of file
diff --git a/web/views/@default/servers/index.html b/web/views/@default/servers/index.html
index 662f7694..202e9ac9 100644
--- a/web/views/@default/servers/index.html
+++ b/web/views/@default/servers/index.html
@@ -81,7 +81,7 @@
 		</tr>
 	</thead>
 	<tr v-for="server in servers">
-        <td><a :href="'/servers/server?serverId=' + server.id"><keyword :v-word="keyword">{{server.name}}</keyword></a>
+        <td class="server-name-td"><a :href="'/servers/server?serverId=' + server.id"><keyword :v-word="keyword">{{server.name}}</keyword></a>  &nbsp; <a :href="'/servers/server/settings?serverId=' + server.id" title="设置"><i class="icon setting grey"></i></a>
 			<div style="margin-top:0.4em">
 				<grey-label>{{server.serverTypeName}}</grey-label>
 			</div>
diff --git a/web/views/@default/servers/index.less b/web/views/@default/servers/index.less
index 0cc94727..2556d024 100644
--- a/web/views/@default/servers/index.less
+++ b/web/views/@default/servers/index.less
@@ -17,4 +17,22 @@
 
 .node-logs-box::-webkit-scrollbar {
 	width: 4px;
+}
+
+.server-name-td {
+	position: relative;
+
+	.icon.setting {
+		display: none;
+		position: absolute;
+		right: 1em;
+		top: 50%;
+		margin-top: -1em;
+	}
+}
+
+.server-name-td:hover {
+	.icon.setting {
+		display: inline;
+	}
 }
\ No newline at end of file
diff --git a/web/views/@default/servers/server/settings/headers/createSetPopup.html b/web/views/@default/servers/server/settings/headers/createSetPopup.html
index 126dd001..de1228f7 100644
--- a/web/views/@default/servers/server/settings/headers/createSetPopup.html
+++ b/web/views/@default/servers/server/settings/headers/createSetPopup.html
@@ -26,7 +26,7 @@
                 <td>支持的状态码</td>
                 <td>
                     <http-status-box></http-status-box>
-                    <p class="comment">只有在设置响应Header时才会起作用。</p>
+                    <p class="comment">不填表示支持所有的状态码。</p>
                 </td>
             </tr>
             <tr>
diff --git a/web/views/@default/servers/server/settings/headers/updateSetPopup.html b/web/views/@default/servers/server/settings/headers/updateSetPopup.html
index 2b9b5350..90a02736 100644
--- a/web/views/@default/servers/server/settings/headers/updateSetPopup.html
+++ b/web/views/@default/servers/server/settings/headers/updateSetPopup.html
@@ -27,6 +27,7 @@
                 <td>支持的状态码</td>
                 <td>
                     <http-status-box :v-status-list="statusList"></http-status-box>
+                    <p class="comment">不填表示支持所有的状态码。</p>
                 </td>
             </tr>
             <tr>