新版IP库管理阶段性提交（未完成）

pkg/rpc/protos/models/model_ip_library_file.proto

@@ -0,0 +1,34 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+message IPLibraryFile {
+	int64 id = 1;
+	int64 fileId = 2;
+	bool isFinished = 3;
+	int64 createdAt = 4;
+	repeated string countryNames = 5;
+	repeated Province provinces = 6;
+	repeated City cities = 7;
+	repeated Town towns = 8;
+	repeated string providerNames = 9;
+
+	message Province {
+		string countryName = 1;
+		string provinceName = 2;
+	}
+
+	message City {
+		string countryName = 1;
+		string provinceName = 2;
+		string cityName = 3;
+	}
+
+	message Town {
+		string countryName = 1;
+		string provinceName = 2;
+		string cityName = 3;
+		string townName = 4;
+	}
+}

pkg/rpc/protos/models/model_region_city.proto

@@ -10,6 +10,9 @@ message RegionCity {
 	string name = 2;
 	repeated string codes = 3;
 	int64 regionProvinceId = 4;
+	string customName = 5;
+	repeated string customCodes = 6;
+	string displayName = 7;
 
 	RegionProvince regionProvince = 30;
 }

pkg/rpc/protos/models/model_region_country.proto

@@ -8,4 +8,7 @@ message RegionCountry {
 	string name = 2;
 	repeated string codes = 3;
 	repeated string pinyin = 4;
+	string customName = 5;
+	repeated string customCodes = 6;
+	string displayName = 7;
 }

pkg/rpc/protos/models/model_region_provider.proto

@@ -7,4 +7,7 @@ message RegionProvider {
 	int64 id = 1;
 	string name = 2;
 	repeated string codes = 3;
+	string customName = 4;
+	repeated string customCodes = 5;
+	string displayName = 6;
 }

pkg/rpc/protos/models/model_region_province.proto

@@ -7,4 +7,8 @@ message RegionProvince {
 	int64 id = 1;
 	string name = 2;
 	repeated string codes = 3;
+	int64 regionCountryId = 4;
+	string customName = 5;
+	repeated string customCodes = 6;
+	string displayName = 7;
 }

pkg/rpc/protos/service_ip_library_file.proto

@@ -0,0 +1,138 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+import "models/rpc_messages.proto";
+import "models/model_ip_library_file.proto";
+import "models/model_region_country.proto";
+import "models/model_region_province.proto";
+import "models/model_region_city.proto";
+import "models/model_region_provider.proto";
+
+
+// IP库文件管理
+service IPLibraryFileService {
+	// 查找所有未完成的IP库文件
+	rpc findAllUnfinishedIPLibraryFiles(FindAllUnfinishedIPLibraryFilesRequest) returns (FindAllUnfinishedIPLibraryFilesResponse);
+
+	// 查找单个IP库文件
+	rpc findIPLibraryFile(FindIPLibraryFileRequest) returns (FindIPLibraryFileResponse);
+
+	// 创建IP库文件
+	rpc createIPLibraryFile(CreateIPLibraryFileRequest) returns (CreateIPLibraryFileResponse);
+
+	// 检查国家/地区
+	rpc checkCountriesWithIPLibraryFileId(CheckCountriesWithIPLibraryFileIdRequest) returns (CheckCountriesWithIPLibraryFileIdResponse);
+
+	// 检查省份/州
+	rpc checkProvincesWithIPLibraryFileId(CheckProvincesWithIPLibraryFileIdRequest) returns (CheckProvincesWithIPLibraryFileIdResponse);
+
+	// 检查城市/市
+	rpc checkCitiesWithIPLibraryFileId(CheckCitiesWithIPLibraryFileIdRequest) returns (CheckCitiesWithIPLibraryFileIdResponse);
+
+	// 检查ISP运营商
+	rpc checkProvidersWithIPLibraryFileId(CheckProvidersWithIPLibraryFileIdRequest) returns (CheckProvidersWithIPLibraryFileIdResponse);
+
+	// 生成IP库文件
+	rpc generateIPLibraryFile(GenerateIPLibraryFileRequest) returns (RPCSuccess);
+}
+
+// 查找所有未完成的IP库文件
+message FindAllUnfinishedIPLibraryFilesRequest {
+
+}
+
+message FindAllUnfinishedIPLibraryFilesResponse {
+	repeated IPLibraryFile ipLibraryFiles = 1;
+}
+
+// 查找单个IP库文件
+message FindIPLibraryFileRequest {
+	int64 ipLibraryFileId = 1;
+}
+
+message FindIPLibraryFileResponse {
+	IPLibraryFile ipLibraryFile = 1;
+}
+
+// 创建IP库文件
+message CreateIPLibraryFileRequest {
+	string template = 1;
+	repeated string emptyValues = 2;
+	int64 fileId = 3;
+	bytes countriesJSON = 4;
+	bytes provincesJSON = 5;
+	bytes citiesJSON = 6;
+	bytes townsJSON = 7;
+	bytes providersJSON = 8;
+}
+
+message CreateIPLibraryFileResponse {
+	int64 ipLibraryFileId = 1;
+}
+
+// 检查国家/地区
+message CheckCountriesWithIPLibraryFileIdRequest {
+	int64 ipLibraryFileId = 1;
+}
+
+message CheckCountriesWithIPLibraryFileIdResponse {
+	repeated MissingCountry missingCountries = 1;
+
+	message MissingCountry {
+		string countryName = 1;
+		repeated RegionCountry similarCountries = 2;
+	}
+}
+
+// 检查省份/州
+message CheckProvincesWithIPLibraryFileIdRequest{
+	int64 ipLibraryFileId = 1;
+}
+
+message CheckProvincesWithIPLibraryFileIdResponse {
+	repeated MissingProvince missingProvinces = 1;
+
+	message MissingProvince {
+		string countryName = 1;
+		string provinceName = 2;
+		repeated RegionProvince similarProvinces = 3;
+	}
+}
+
+
+// 检查城市/市
+message CheckCitiesWithIPLibraryFileIdRequest{
+	int64 ipLibraryFileId = 1;
+}
+
+message CheckCitiesWithIPLibraryFileIdResponse {
+	repeated MissingCity missingCities = 1;
+
+	message MissingCity {
+		string countryName = 1;
+		string provinceName = 2;
+		string cityName = 3;
+		repeated RegionCity similarCities = 4;
+	}
+}
+
+// 检查ISP运营商
+message CheckProvidersWithIPLibraryFileIdRequest{
+	int64 ipLibraryFileId = 1;
+}
+
+message CheckProvidersWithIPLibraryFileIdResponse {
+	repeated MissingProvider missingProviders = 1;
+
+	message MissingProvider {
+		string providerName = 1;
+		repeated RegionProvider similarProviders = 2;
+	}
+}
+
+// 生成IP库文件
+message GenerateIPLibraryFileRequest {
+	int64 ipLibraryFileId = 1;
+}

pkg/rpc/protos/service_region_city.proto

@@ -4,14 +4,31 @@ option go_package = "./pb";
 package pb;
 
 import "models/model_region_city.proto";
+import "models/rpc_messages.proto";
 
 // 城市相关服务
 service RegionCityService {
 	// 查找所有城市
-	rpc findAllEnabledRegionCities (FindAllEnabledRegionCitiesRequest) returns (FindAllEnabledRegionCitiesResponse);
+	rpc findAllEnabledRegionCities (FindAllEnabledRegionCitiesRequest) returns (FindAllEnabledRegionCitiesResponse) {
+		option deprecated = true;
+	};
 
 	// 查找单个城市信息
-	rpc findEnabledRegionCity (FindEnabledRegionCityRequest) returns (FindEnabledRegionCityResponse);
+	rpc findEnabledRegionCity (FindEnabledRegionCityRequest) returns (FindEnabledRegionCityResponse) {
+		option deprecated = true;
+	};
+
+	// 查找所有城市
+	rpc findAllRegionCities (FindAllRegionCitiesRequest) returns (FindAllRegionCitiesResponse);
+
+	// 查找某个省份的所有城市
+	rpc findAllRegionCitiesWithRegionProvinceId(FindAllRegionCitiesWithRegionProvinceIdRequest) returns (FindAllRegionCitiesWithRegionProvinceIdResponse);
+
+	// 查找单个城市信息
+	rpc findRegionCity (FindRegionCityRequest) returns (FindRegionCityResponse);
+
+	// 修改城市定制信息
+	rpc updateRegionCityCustom(UpdateRegionCityCustomRequest) returns (RPCSuccess);
 }
 
 // 查找所有城市
@@ -31,3 +48,37 @@ message FindEnabledRegionCityRequest {
 message FindEnabledRegionCityResponse {
 	RegionCity regionCity = 1;
 }
+
+// 查找所有城市
+message FindAllRegionCitiesRequest {
+	bool includeRegionProvince = 1;
+}
+
+message FindAllRegionCitiesResponse {
+	repeated RegionCity regionCities = 1;
+}
+
+// 查找某个省份的所有城市
+message FindAllRegionCitiesWithRegionProvinceIdRequest {
+	int64 regionProvinceId = 1;
+}
+
+message FindAllRegionCitiesWithRegionProvinceIdResponse {
+	repeated RegionCity regionCities = 1;
+}
+
+// 查找单个城市信息
+message FindRegionCityRequest {
+	int64 regionCityId = 1;
+}
+
+message FindRegionCityResponse {
+	RegionCity regionCity = 1;
+}
+
+// 修改城市定制信息
+message UpdateRegionCityCustomRequest {
+	int64 regionCityId = 1;
+	string customName = 2;
+	repeated string customCodes = 3;
+}

pkg/rpc/protos/service_region_country.proto

@@ -4,17 +4,31 @@ option go_package = "./pb";
 package pb;
 
 import "models/model_region_country.proto";
+import "models/rpc_messages.proto";
 
 // 国家相关服务
 service RegionCountryService {
-	// 查找所有的国家列表
-	rpc findAllEnabledRegionCountries (FindAllEnabledRegionCountriesRequest) returns (FindAllEnabledRegionCountriesResponse);
+	// 查找所有的国家/地区列表
+	rpc findAllEnabledRegionCountries (FindAllEnabledRegionCountriesRequest) returns (FindAllEnabledRegionCountriesResponse) {
+		option deprecated = true;
+	};
 
-	// 查找单个国家信息
-	rpc findEnabledRegionCountry (FindEnabledRegionCountryRequest) returns (FindEnabledRegionCountryResponse);
+	// 查找单个国家/地区信息
+	rpc findEnabledRegionCountry (FindEnabledRegionCountryRequest) returns (FindEnabledRegionCountryResponse) {
+		option deprecated = true;
+	};
+
+	// 查找所有的国家/地区列表
+	rpc findAllRegionCountries (FindAllRegionCountriesRequest) returns (FindAllRegionCountriesResponse);
+
+	// 查找单个国家/地区信息
+	rpc findRegionCountry (FindRegionCountryRequest) returns (FindRegionCountryResponse);
+
+	// 修改国家/地区定制信息
+	rpc updateRegionCountryCustom(UpdateRegionCountryCustomRequest) returns (RPCSuccess);
 }
 
-// 查找所有的国家列表
+// 查找所有的国家/地区列表
 message FindAllEnabledRegionCountriesRequest {
 
 }
@@ -23,11 +37,36 @@ message FindAllEnabledRegionCountriesResponse {
 	repeated RegionCountry regionCountries = 1;
 }
 
-// 查找单个国家信息
+// 查找单个国家/地区信息
 message FindEnabledRegionCountryRequest {
 	int64 regionCountryId = 1;
 }
 
 message FindEnabledRegionCountryResponse {
 	RegionCountry regionCountry = 1;
+}
+
+// 查找所有的国家/地区列表
+message FindAllRegionCountriesRequest {
+
+}
+
+message FindAllRegionCountriesResponse {
+	repeated RegionCountry regionCountries = 1;
+}
+
+// 查找单个国家/地区信息
+message FindRegionCountryRequest {
+	int64 regionCountryId = 1;
+}
+
+message FindRegionCountryResponse {
+	RegionCountry regionCountry = 1;
+}
+
+// 修改国家/地区定制信息
+message UpdateRegionCountryCustomRequest {
+	int64 regionCountryId = 1;
+	string customName = 2;
+	repeated string customCodes = 3;
 }

pkg/rpc/protos/service_region_provider.proto

@@ -4,14 +4,28 @@ option go_package = "./pb";
 package pb;
 
 import "models/model_region_provider.proto";
+import "models/rpc_messages.proto";
 
 // ISP相关服务
 service RegionProviderService {
 	// 查找所有ISP
-	rpc findAllEnabledRegionProviders (FindAllEnabledRegionProvidersRequest) returns (FindAllEnabledRegionProvidersResponse);
+	rpc findAllEnabledRegionProviders (FindAllEnabledRegionProvidersRequest) returns (FindAllEnabledRegionProvidersResponse) {
+		option deprecated = true;
+	};
 
 	// 查找单个ISP信息
-	rpc findEnabledRegionProvider (FindEnabledRegionProviderRequest) returns (FindEnabledRegionProviderResponse);
+	rpc findEnabledRegionProvider (FindEnabledRegionProviderRequest) returns (FindEnabledRegionProviderResponse) {
+		option deprecated = true;
+	};
+
+	// 查找所有ISP
+	rpc findAllRegionProviders (FindAllRegionProvidersRequest) returns (FindAllRegionProvidersResponse);
+
+	// 查找单个ISP信息
+	rpc findRegionProvider (FindRegionProviderRequest) returns (FindRegionProviderResponse);
+
+	// 修改ISP定制信息
+	rpc updateRegionProviderCustom(UpdateRegionProviderCustomRequest) returns (RPCSuccess);
 }
 
 // 查找所有ISP
@@ -31,3 +45,28 @@ message FindEnabledRegionProviderRequest {
 message FindEnabledRegionProviderResponse {
 	RegionProvider regionProvider = 1;
 }
+
+// 查找所有ISP
+message FindAllRegionProvidersRequest {
+
+}
+
+message FindAllRegionProvidersResponse {
+	repeated RegionProvider regionProviders = 1;
+}
+
+// 查找单个ISP信息
+message FindRegionProviderRequest {
+	int64 regionProviderId = 1;
+}
+
+message FindRegionProviderResponse {
+	RegionProvider regionProvider = 1;
+}
+
+// 修改ISP定制信息
+message UpdateRegionProviderCustomRequest {
+	int64 regionProviderId = 1;
+	string customName = 2;
+	repeated string customCodes = 3;
+}

pkg/rpc/protos/service_region_province.proto

@@ -4,14 +4,28 @@ option go_package = "./pb";
 package pb;
 
 import "models/model_region_province.proto";
+import "models/rpc_messages.proto";
 
 // 省份相关服务
 service RegionProvinceService {
 	// 查找所有省份
-	rpc findAllEnabledRegionProvincesWithCountryId (FindAllEnabledRegionProvincesWithCountryIdRequest) returns (FindAllEnabledRegionProvincesWithCountryIdResponse);
+	rpc findAllEnabledRegionProvincesWithCountryId (FindAllEnabledRegionProvincesWithCountryIdRequest) returns (FindAllEnabledRegionProvincesWithCountryIdResponse) {
+		option deprecated = true;
+	};
 
 	// 查找单个省份信息
-	rpc findEnabledRegionProvince (FindEnabledRegionProvinceRequest) returns (FindEnabledRegionProvinceResponse);
+	rpc findEnabledRegionProvince (FindEnabledRegionProvinceRequest) returns (FindEnabledRegionProvinceResponse) {
+		option deprecated = true;
+	};
+
+	// 查找所有省份
+	rpc findAllRegionProvincesWithRegionCountryId (FindAllRegionProvincesWithRegionCountryIdRequest) returns (FindAllRegionProvincesWithRegionCountryIdResponse);
+
+	// 查找单个省份信息
+	rpc findRegionProvince (FindRegionProvinceRequest) returns (FindRegionProvinceResponse);
+
+	// 修改国家/地区定制信息
+	rpc updateRegionProvinceCustom(UpdateRegionProvinceCustomRequest) returns (RPCSuccess);
 }
 
 // 查找所有省份
@@ -31,3 +45,28 @@ message FindEnabledRegionProvinceRequest {
 message FindEnabledRegionProvinceResponse {
 	RegionProvince regionProvince = 1;
 }
+
+// 查找所有省份
+message FindAllRegionProvincesWithRegionCountryIdRequest {
+	int64 regionCountryId = 1;
+}
+
+message FindAllRegionProvincesWithRegionCountryIdResponse {
+	repeated RegionProvince regionProvinces = 1;
+}
+
+// 查找单个省份信息
+message FindRegionProvinceRequest {
+	int64 regionProvinceId = 1;
+}
+
+message FindRegionProvinceResponse {
+	RegionProvince regionProvince = 1;
+}
+
+// 修改省份定制信息
+message UpdateRegionProvinceCustomRequest {
+	int64 regionProvinceId = 1;
+	string customName = 2;
+	repeated string customCodes = 3;
+}