增加城市/ISP查询接口；WAF增加国家/地区、省份、城市、ISP等参数

pkg/rpc/protos/models/model_region_city.proto

@@ -7,4 +7,5 @@ message RegionCity {
 	int64 id = 1;
 	string name = 2;
 	repeated string codes = 3;
+	int64 regionProvinceId = 4;
 }

pkg/rpc/protos/service_region_city.proto

@@ -0,0 +1,33 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+import "models/model_region_city.proto";
+
+// 城市相关服务
+service RegionCityService {
+	// 查找所有城市
+	rpc findAllEnabledRegionCities (FindAllEnabledRegionCitiesRequest) returns (FindAllEnabledRegionCitiesResponse);
+
+	// 查找单个城市信息
+	rpc findEnabledRegionCity (FindEnabledRegionCityRequest) returns (FindEnabledRegionCityResponse);
+}
+
+// 查找所有城市
+message FindAllEnabledRegionCitiesRequest {
+
+}
+
+message FindAllEnabledRegionCitiesResponse {
+	repeated RegionCity regionCities = 1;
+}
+
+// 查找单个城市信息
+message FindEnabledRegionCityRequest {
+	int64 regionCityId = 1;
+}
+
+message FindEnabledRegionCityResponse {
+	RegionCity regionCity = 1;
+}

pkg/rpc/protos/service_region_country.proto

@@ -20,14 +20,14 @@ message FindAllEnabledRegionCountriesRequest {
 }
 
 message FindAllEnabledRegionCountriesResponse {
-	repeated RegionCountry countries = 1;
+	repeated RegionCountry regionCountries = 1;
 }
 
 // 查找单个国家信息
 message FindEnabledRegionCountryRequest {
-	int64 countryId = 1;
+	int64 regionCountryId = 1;
 }
 
 message FindEnabledRegionCountryResponse {
-	RegionCountry country = 1;
+	RegionCountry regionCountry = 1;
 }

pkg/rpc/protos/service_region_provider.proto

@@ -0,0 +1,33 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+import "models/model_region_provider.proto";
+
+// ISP相关服务
+service RegionProviderService {
+	// 查找所有ISP
+	rpc findAllEnabledRegionProviders (FindAllEnabledRegionProvidersRequest) returns (FindAllEnabledRegionProvidersResponse);
+
+	// 查找单个ISP信息
+	rpc findEnabledRegionProvider (FindEnabledRegionProviderRequest) returns (FindEnabledRegionProviderResponse);
+}
+
+// 查找所有ISP
+message FindAllEnabledRegionProvidersRequest {
+
+}
+
+message FindAllEnabledRegionProvidersResponse {
+	repeated RegionProvider regionProviders = 1;
+}
+
+// 查找单个ISP信息
+message FindEnabledRegionProviderRequest {
+	int64 regionProviderId = 1;
+}
+
+message FindEnabledRegionProviderResponse {
+	RegionProvider regionProvider = 1;
+}

pkg/rpc/protos/service_region_province.proto

@@ -16,18 +16,18 @@ service RegionProvinceService {
 
 // 查找所有省份
 message FindAllEnabledRegionProvincesWithCountryIdRequest {
-	int64 countryId = 1;
+	int64 regionCountryId = 1;
 }
 
 message FindAllEnabledRegionProvincesWithCountryIdResponse {
-	repeated RegionProvince provinces = 1;
+	repeated RegionProvince regionProvinces = 1;
 }
 
 // 查找单个省份信息
 message FindEnabledRegionProvinceRequest {
-	int64 provinceId = 1;
+	int64 regionProvinceId = 1;
 }
 
 message FindEnabledRegionProvinceResponse {
-	RegionProvince province = 1;
+	RegionProvince regionProvince = 1;
 }