From debb72c2d376eed0b94ac1aeed956f0bd398bd06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Thu, 14 Mar 2024 20:12:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BDDNS=E4=B8=AD=E5=9B=BD?= =?UTF-8?q?=E5=AE=B6/=E5=9C=B0=E5=8C=BA=E7=BA=BF=E8=B7=AF=E4=B8=8B?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9C=81/=E5=B7=9E=E7=9A=84=E7=BB=86?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/rpc.json | 54 ++- pkg/rpc/pb/model_region_country.pb.go | 18 +- pkg/rpc/pb/model_region_province.pb.go | 73 ++-- pkg/rpc/pb/service_region_province.pb.go | 344 ++++++++++++------ pkg/rpc/pb/service_region_province_grpc.pb.go | 47 ++- .../protos/models/model_region_country.proto | 1 + .../protos/models/model_region_province.proto | 5 + pkg/rpc/protos/service_region_province.proto | 42 ++- 8 files changed, 410 insertions(+), 174 deletions(-) diff --git a/build/rpc.json b/build/rpc.json index fc11547..2b65e81 100644 --- a/build/rpc.json +++ b/build/rpc.json @@ -9964,7 +9964,7 @@ "requestMessageName": "FindAllEnabledRegionProvincesWithCountryIdRequest", "responseMessageName": "FindAllEnabledRegionProvincesWithCountryIdResponse", "code": "rpc findAllEnabledRegionProvincesWithCountryId (FindAllEnabledRegionProvincesWithCountryIdRequest) returns (FindAllEnabledRegionProvincesWithCountryIdResponse) {\n\t\toption deprecated = true;\n\t};\n\n\t// 查找单个省份信息\n\trpc findEnabledRegionProvince (FindEnabledRegionProvinceRequest) returns (FindEnabledRegionProvinceResponse) {\n\t\toption deprecated = true;\n\t};", - "doc": "查找所有省份", + "doc": "根据国家|地区ID查找所有省份", "roles": [], "isDeprecated": true }, @@ -9973,10 +9973,22 @@ "requestMessageName": "FindAllRegionProvincesWithRegionCountryIdRequest", "responseMessageName": "FindAllRegionProvincesWithRegionCountryIdResponse", "code": "rpc findAllRegionProvincesWithRegionCountryId (FindAllRegionProvincesWithRegionCountryIdRequest) returns (FindAllRegionProvincesWithRegionCountryIdResponse);", - "doc": "查找所有省份", + "doc": "根据国家|地区ID查找所有省份", "roles": [], "isDeprecated": false }, + { + "name": "findAllRegionProvinces", + "requestMessageName": "FindAllRegionProvincesRequest", + "responseMessageName": "FindAllRegionProvincesResponse", + "code": "rpc findAllRegionProvinces(FindAllRegionProvincesRequest) returns (FindAllRegionProvincesResponse);", + "doc": "查找所有国家|地区的所有省份", + "roles": [ + "admin", + "user" + ], + "isDeprecated": false + }, { "name": "findRegionProvince", "requestMessageName": "FindRegionProvinceRequest", @@ -17612,12 +17624,12 @@ }, { "name": "FindAllEnabledRegionProvincesWithCountryIdRequest", - "code": "message FindAllEnabledRegionProvincesWithCountryIdRequest {\n\tint64 regionCountryId = 1;\n}", - "doc": "查找所有省份" + "code": "message FindAllEnabledRegionProvincesWithCountryIdRequest {\n\tint64 regionCountryId = 1; // 国家|地区ID\n}", + "doc": "根据国家|地区ID查找所有省份" }, { "name": "FindAllEnabledRegionProvincesWithCountryIdResponse", - "code": "message FindAllEnabledRegionProvincesWithCountryIdResponse {\n\trepeated RegionProvince regionProvinces = 1;\n}", + "code": "message FindAllEnabledRegionProvincesWithCountryIdResponse {\n\trepeated RegionProvince regionProvinces = 1; // 省份列表\n}", "doc": "" }, { @@ -17940,14 +17952,24 @@ "code": "message FindAllRegionProvidersResponse {\n\trepeated RegionProvider regionProviders = 1;\n}", "doc": "" }, + { + "name": "FindAllRegionProvincesRequest", + "code": "message FindAllRegionProvincesRequest {\n\n}", + "doc": "查找所有国家|地区的所有省份" + }, + { + "name": "FindAllRegionProvincesResponse", + "code": "message FindAllRegionProvincesResponse {\n\trepeated RegionProvince regionProvinces = 1; // 省份列表\n}", + "doc": "" + }, { "name": "FindAllRegionProvincesWithRegionCountryIdRequest", - "code": "message FindAllRegionProvincesWithRegionCountryIdRequest {\n\tint64 regionCountryId = 1;\n}", - "doc": "查找所有省份" + "code": "message FindAllRegionProvincesWithRegionCountryIdRequest {\n\tint64 regionCountryId = 1; // 国家|地区ID\n}", + "doc": "根据国家|地区ID查找所有省份" }, { "name": "FindAllRegionProvincesWithRegionCountryIdResponse", - "code": "message FindAllRegionProvincesWithRegionCountryIdResponse {\n\trepeated RegionProvince regionProvinces = 1;\n}", + "code": "message FindAllRegionProvincesWithRegionCountryIdResponse {\n\trepeated RegionProvince regionProvinces = 1; // 省份列表\n}", "doc": "" }, { @@ -18917,12 +18939,12 @@ }, { "name": "FindEnabledRegionProvinceRequest", - "code": "message FindEnabledRegionProvinceRequest {\n\tint64 regionProvinceId = 1;\n}", + "code": "message FindEnabledRegionProvinceRequest {\n\tint64 regionProvinceId = 1; // 省份ID\n}", "doc": "查找单个省份信息" }, { "name": "FindEnabledRegionProvinceResponse", - "code": "message FindEnabledRegionProvinceResponse {\n\tRegionProvince regionProvince = 1;\n}", + "code": "message FindEnabledRegionProvinceResponse {\n\tRegionProvince regionProvince = 1; // 省份信息\n}", "doc": "" }, { @@ -20102,12 +20124,12 @@ }, { "name": "FindRegionProvinceRequest", - "code": "message FindRegionProvinceRequest {\n\tint64 regionProvinceId = 1;\n}", + "code": "message FindRegionProvinceRequest {\n\tint64 regionProvinceId = 1; // 省份ID\n}", "doc": "查找单个省份信息" }, { "name": "FindRegionProvinceResponse", - "code": "message FindRegionProvinceResponse {\n\tRegionProvince regionProvince = 1;\n}", + "code": "message FindRegionProvinceResponse {\n\tRegionProvince regionProvince = 1; // 省份信息\n}", "doc": "" }, { @@ -21887,7 +21909,7 @@ }, { "name": "RegionCountry", - "code": "message RegionCountry {\n\tint64 id = 1;\n\tstring name = 2;\n\trepeated string codes = 3;\n\trepeated string pinyin = 4;\n\tstring customName = 5;\n\trepeated string customCodes = 6;\n\tstring displayName = 7;\n\tbool isCommon = 8; // 是否常用\n}", + "code": "message RegionCountry {\n\tint64 id = 1;\n\tstring name = 2;\n\trepeated string codes = 3;\n\trepeated string pinyin = 4;\n\tstring customName = 5;\n\trepeated string customCodes = 6;\n\tstring displayName = 7;\n\tbool isCommon = 8; // 是否常用\n\tstring routeCode = 9; // 线路代号\n}", "doc": "国家/地区" }, { @@ -21897,8 +21919,8 @@ }, { "name": "RegionProvince", - "code": "message RegionProvince {\n\tint64 id = 1;\n\tstring name = 2;\n\trepeated string codes = 3;\n\tint64 regionCountryId = 4;\n\tstring customName = 5;\n\trepeated string customCodes = 6;\n\tstring displayName = 7;\n}", - "doc": "" + "code": "message RegionProvince {\n\tint64 id = 1;\n\tstring name = 2;\n\trepeated string codes = 3;\n\tint64 regionCountryId = 4;\n\tstring customName = 5;\n\trepeated string customCodes = 6;\n\tstring displayName = 7;\n\n\tRegionCountry regionCountry = 30; // 国家|地区信息\n}", + "doc": "省份｜州|区域信息" }, { "name": "RegionTown", @@ -23267,7 +23289,7 @@ }, { "name": "UpdateRegionProvinceCustomRequest", - "code": "message UpdateRegionProvinceCustomRequest {\n\tint64 regionProvinceId = 1;\n\tstring customName = 2;\n\trepeated string customCodes = 3;\n}", + "code": "message UpdateRegionProvinceCustomRequest {\n\tint64 regionProvinceId = 1; // 省份ID\n\tstring customName = 2; // 自定义名称\n\trepeated string customCodes = 3; // 自定义代号\n}", "doc": "修改省份定制信息" }, { diff --git a/pkg/rpc/pb/model_region_country.pb.go b/pkg/rpc/pb/model_region_country.pb.go index 926c318..8b7fc39 100644 --- a/pkg/rpc/pb/model_region_country.pb.go +++ b/pkg/rpc/pb/model_region_country.pb.go @@ -33,7 +33,8 @@ type RegionCountry struct { CustomName string `protobuf:"bytes,5,opt,name=customName,proto3" json:"customName,omitempty"` CustomCodes []string `protobuf:"bytes,6,rep,name=customCodes,proto3" json:"customCodes,omitempty"` DisplayName string `protobuf:"bytes,7,opt,name=displayName,proto3" json:"displayName,omitempty"` - IsCommon bool `protobuf:"varint,8,opt,name=isCommon,proto3" json:"isCommon,omitempty"` // 是否常用 + IsCommon bool `protobuf:"varint,8,opt,name=isCommon,proto3" json:"isCommon,omitempty"` // 是否常用 + RouteCode string `protobuf:"bytes,9,opt,name=routeCode,proto3" json:"routeCode,omitempty"` // 线路代号 } func (x *RegionCountry) Reset() { @@ -124,12 +125,19 @@ func (x *RegionCountry) GetIsCommon() bool { return false } +func (x *RegionCountry) GetRouteCode() string { + if x != nil { + return x.RouteCode + } + return "" +} + var File_models_model_region_country_proto protoreflect.FileDescriptor var file_models_model_region_country_proto_rawDesc = []byte{ 0x0a, 0x21, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xe1, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x67, 0x69, + 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xff, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, @@ -143,8 +151,10 @@ var file_models_model_region_country_proto_rawDesc = []byte{ 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x08, 0x69, 0x73, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x08, 0x52, 0x08, 0x69, 0x73, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x72, + 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/rpc/pb/model_region_province.pb.go b/pkg/rpc/pb/model_region_province.pb.go index 214d841..38d10a8 100644 --- a/pkg/rpc/pb/model_region_province.pb.go +++ b/pkg/rpc/pb/model_region_province.pb.go @@ -20,18 +20,20 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// 省份｜州|区域信息 type RegionProvince struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - Codes []string `protobuf:"bytes,3,rep,name=codes,proto3" json:"codes,omitempty"` - RegionCountryId int64 `protobuf:"varint,4,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"` - CustomName string `protobuf:"bytes,5,opt,name=customName,proto3" json:"customName,omitempty"` - CustomCodes []string `protobuf:"bytes,6,rep,name=customCodes,proto3" json:"customCodes,omitempty"` - DisplayName string `protobuf:"bytes,7,opt,name=displayName,proto3" json:"displayName,omitempty"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Codes []string `protobuf:"bytes,3,rep,name=codes,proto3" json:"codes,omitempty"` + RegionCountryId int64 `protobuf:"varint,4,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"` + CustomName string `protobuf:"bytes,5,opt,name=customName,proto3" json:"customName,omitempty"` + CustomCodes []string `protobuf:"bytes,6,rep,name=customCodes,proto3" json:"customCodes,omitempty"` + DisplayName string `protobuf:"bytes,7,opt,name=displayName,proto3" json:"displayName,omitempty"` + RegionCountry *RegionCountry `protobuf:"bytes,30,opt,name=regionCountry,proto3" json:"regionCountry,omitempty"` // 国家|地区信息 } func (x *RegionProvince) Reset() { @@ -115,27 +117,39 @@ func (x *RegionProvince) GetDisplayName() string { return "" } +func (x *RegionProvince) GetRegionCountry() *RegionCountry { + if x != nil { + return x.RegionCountry + } + return nil +} + var File_models_model_region_province_proto protoreflect.FileDescriptor var file_models_model_region_province_proto_rawDesc = []byte{ 0x0a, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xd8, 0x01, 0x0a, 0x0e, 0x52, 0x65, 0x67, - 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, - 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, - 0x63, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, - 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x12, - 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, - 0x20, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x06, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, - 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, - 0x61, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x21, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x91, 0x02, 0x0a, 0x0e, + 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, + 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x05, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x67, 0x69, + 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, + 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, + 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, + 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, + 0x6f, 0x64, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, + 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, + 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x0d, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, + 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x0d, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -153,13 +167,15 @@ func file_models_model_region_province_proto_rawDescGZIP() []byte { var file_models_model_region_province_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_models_model_region_province_proto_goTypes = []interface{}{ (*RegionProvince)(nil), // 0: pb.RegionProvince + (*RegionCountry)(nil), // 1: pb.RegionCountry } var file_models_model_region_province_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name + 1, // 0: pb.RegionProvince.regionCountry:type_name -> pb.RegionCountry + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_models_model_region_province_proto_init() } @@ -167,6 +183,7 @@ func file_models_model_region_province_proto_init() { if File_models_model_region_province_proto != nil { return } + file_models_model_region_country_proto_init() if !protoimpl.UnsafeEnabled { file_models_model_region_province_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RegionProvince); i { diff --git a/pkg/rpc/pb/service_region_province.pb.go b/pkg/rpc/pb/service_region_province.pb.go index f838eac..140ca90 100644 --- a/pkg/rpc/pb/service_region_province.pb.go +++ b/pkg/rpc/pb/service_region_province.pb.go @@ -20,13 +20,13 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// 查找所有省份 +// 根据国家|地区ID查找所有省份 type FindAllEnabledRegionProvincesWithCountryIdRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RegionCountryId int64 `protobuf:"varint,1,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"` + RegionCountryId int64 `protobuf:"varint,1,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"` // 国家|地区ID } func (x *FindAllEnabledRegionProvincesWithCountryIdRequest) Reset() { @@ -73,7 +73,7 @@ type FindAllEnabledRegionProvincesWithCountryIdResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RegionProvinces []*RegionProvince `protobuf:"bytes,1,rep,name=regionProvinces,proto3" json:"regionProvinces,omitempty"` + RegionProvinces []*RegionProvince `protobuf:"bytes,1,rep,name=regionProvinces,proto3" json:"regionProvinces,omitempty"` // 省份列表 } func (x *FindAllEnabledRegionProvincesWithCountryIdResponse) Reset() { @@ -121,7 +121,7 @@ type FindEnabledRegionProvinceRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RegionProvinceId int64 `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"` + RegionProvinceId int64 `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"` // 省份ID } func (x *FindEnabledRegionProvinceRequest) Reset() { @@ -168,7 +168,7 @@ type FindEnabledRegionProvinceResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RegionProvince *RegionProvince `protobuf:"bytes,1,opt,name=regionProvince,proto3" json:"regionProvince,omitempty"` + RegionProvince *RegionProvince `protobuf:"bytes,1,opt,name=regionProvince,proto3" json:"regionProvince,omitempty"` // 省份信息 } func (x *FindEnabledRegionProvinceResponse) Reset() { @@ -210,13 +210,13 @@ func (x *FindEnabledRegionProvinceResponse) GetRegionProvince() *RegionProvince return nil } -// 查找所有省份 +// 根据国家|地区ID查找所有省份 type FindAllRegionProvincesWithRegionCountryIdRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RegionCountryId int64 `protobuf:"varint,1,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"` + RegionCountryId int64 `protobuf:"varint,1,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"` // 国家|地区ID } func (x *FindAllRegionProvincesWithRegionCountryIdRequest) Reset() { @@ -263,7 +263,7 @@ type FindAllRegionProvincesWithRegionCountryIdResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RegionProvinces []*RegionProvince `protobuf:"bytes,1,rep,name=regionProvinces,proto3" json:"regionProvinces,omitempty"` + RegionProvinces []*RegionProvince `protobuf:"bytes,1,rep,name=regionProvinces,proto3" json:"regionProvinces,omitempty"` // 省份列表 } func (x *FindAllRegionProvincesWithRegionCountryIdResponse) Reset() { @@ -305,19 +305,105 @@ func (x *FindAllRegionProvincesWithRegionCountryIdResponse) GetRegionProvinces() return nil } +// 查找所有国家|地区的所有省份 +type FindAllRegionProvincesRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *FindAllRegionProvincesRequest) Reset() { + *x = FindAllRegionProvincesRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_service_region_province_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FindAllRegionProvincesRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindAllRegionProvincesRequest) ProtoMessage() {} + +func (x *FindAllRegionProvincesRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_region_province_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindAllRegionProvincesRequest.ProtoReflect.Descriptor instead. +func (*FindAllRegionProvincesRequest) Descriptor() ([]byte, []int) { + return file_service_region_province_proto_rawDescGZIP(), []int{6} +} + +type FindAllRegionProvincesResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RegionProvinces []*RegionProvince `protobuf:"bytes,1,rep,name=regionProvinces,proto3" json:"regionProvinces,omitempty"` // 省份列表 +} + +func (x *FindAllRegionProvincesResponse) Reset() { + *x = FindAllRegionProvincesResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_service_region_province_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FindAllRegionProvincesResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindAllRegionProvincesResponse) ProtoMessage() {} + +func (x *FindAllRegionProvincesResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_region_province_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindAllRegionProvincesResponse.ProtoReflect.Descriptor instead. +func (*FindAllRegionProvincesResponse) Descriptor() ([]byte, []int) { + return file_service_region_province_proto_rawDescGZIP(), []int{7} +} + +func (x *FindAllRegionProvincesResponse) GetRegionProvinces() []*RegionProvince { + if x != nil { + return x.RegionProvinces + } + return nil +} + // 查找单个省份信息 type FindRegionProvinceRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RegionProvinceId int64 `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"` + RegionProvinceId int64 `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"` // 省份ID } func (x *FindRegionProvinceRequest) Reset() { *x = FindRegionProvinceRequest{} if protoimpl.UnsafeEnabled { - mi := &file_service_region_province_proto_msgTypes[6] + mi := &file_service_region_province_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -330,7 +416,7 @@ func (x *FindRegionProvinceRequest) String() string { func (*FindRegionProvinceRequest) ProtoMessage() {} func (x *FindRegionProvinceRequest) ProtoReflect() protoreflect.Message { - mi := &file_service_region_province_proto_msgTypes[6] + mi := &file_service_region_province_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -343,7 +429,7 @@ func (x *FindRegionProvinceRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use FindRegionProvinceRequest.ProtoReflect.Descriptor instead. func (*FindRegionProvinceRequest) Descriptor() ([]byte, []int) { - return file_service_region_province_proto_rawDescGZIP(), []int{6} + return file_service_region_province_proto_rawDescGZIP(), []int{8} } func (x *FindRegionProvinceRequest) GetRegionProvinceId() int64 { @@ -358,13 +444,13 @@ type FindRegionProvinceResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RegionProvince *RegionProvince `protobuf:"bytes,1,opt,name=regionProvince,proto3" json:"regionProvince,omitempty"` + RegionProvince *RegionProvince `protobuf:"bytes,1,opt,name=regionProvince,proto3" json:"regionProvince,omitempty"` // 省份信息 } func (x *FindRegionProvinceResponse) Reset() { *x = FindRegionProvinceResponse{} if protoimpl.UnsafeEnabled { - mi := &file_service_region_province_proto_msgTypes[7] + mi := &file_service_region_province_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -377,7 +463,7 @@ func (x *FindRegionProvinceResponse) String() string { func (*FindRegionProvinceResponse) ProtoMessage() {} func (x *FindRegionProvinceResponse) ProtoReflect() protoreflect.Message { - mi := &file_service_region_province_proto_msgTypes[7] + mi := &file_service_region_province_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -390,7 +476,7 @@ func (x *FindRegionProvinceResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use FindRegionProvinceResponse.ProtoReflect.Descriptor instead. func (*FindRegionProvinceResponse) Descriptor() ([]byte, []int) { - return file_service_region_province_proto_rawDescGZIP(), []int{7} + return file_service_region_province_proto_rawDescGZIP(), []int{9} } func (x *FindRegionProvinceResponse) GetRegionProvince() *RegionProvince { @@ -406,15 +492,15 @@ type UpdateRegionProvinceCustomRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RegionProvinceId int64 `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"` - CustomName string `protobuf:"bytes,2,opt,name=customName,proto3" json:"customName,omitempty"` - CustomCodes []string `protobuf:"bytes,3,rep,name=customCodes,proto3" json:"customCodes,omitempty"` + RegionProvinceId int64 `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"` // 省份ID + CustomName string `protobuf:"bytes,2,opt,name=customName,proto3" json:"customName,omitempty"` // 自定义名称 + CustomCodes []string `protobuf:"bytes,3,rep,name=customCodes,proto3" json:"customCodes,omitempty"` // 自定义代号 } func (x *UpdateRegionProvinceCustomRequest) Reset() { *x = UpdateRegionProvinceCustomRequest{} if protoimpl.UnsafeEnabled { - mi := &file_service_region_province_proto_msgTypes[8] + mi := &file_service_region_province_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -427,7 +513,7 @@ func (x *UpdateRegionProvinceCustomRequest) String() string { func (*UpdateRegionProvinceCustomRequest) ProtoMessage() {} func (x *UpdateRegionProvinceCustomRequest) ProtoReflect() protoreflect.Message { - mi := &file_service_region_province_proto_msgTypes[8] + mi := &file_service_region_province_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -440,7 +526,7 @@ func (x *UpdateRegionProvinceCustomRequest) ProtoReflect() protoreflect.Message // Deprecated: Use UpdateRegionProvinceCustomRequest.ProtoReflect.Descriptor instead. func (*UpdateRegionProvinceCustomRequest) Descriptor() ([]byte, []int) { - return file_service_region_province_proto_rawDescGZIP(), []int{8} + return file_service_region_province_proto_rawDescGZIP(), []int{10} } func (x *UpdateRegionProvinceCustomRequest) GetRegionProvinceId() int64 { @@ -510,66 +596,81 @@ var file_service_region_province_proto_rawDesc = []byte{ 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x0f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, - 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x22, 0x47, 0x0a, 0x19, 0x46, 0x69, 0x6e, 0x64, 0x52, - 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, - 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, - 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, - 0x22, 0x58, 0x0a, 0x1a, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, - 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, - 0x0a, 0x0e, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, - 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x0e, 0x72, 0x65, 0x67, 0x69, - 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x91, 0x01, 0x0a, 0x21, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, - 0x6e, 0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, - 0x63, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x72, 0x65, 0x67, 0x69, - 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, - 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, - 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x32, 0xee, - 0x04, 0x0a, 0x15, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, - 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xa0, 0x01, 0x0a, 0x2a, 0x66, 0x69, 0x6e, - 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, - 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x12, 0x35, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, - 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, - 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36, - 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, - 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, - 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x6d, 0x0a, 0x19, 0x66, + 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x22, 0x1f, 0x0a, 0x1d, 0x46, 0x69, 0x6e, 0x64, 0x41, + 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, + 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x5e, 0x0a, 0x1e, 0x46, 0x69, 0x6e, 0x64, + 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, + 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3c, 0x0a, 0x0f, 0x72, 0x65, + 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, + 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x0f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, + 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x22, 0x47, 0x0a, 0x19, 0x46, 0x69, 0x6e, 0x64, + 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, + 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, + 0x64, 0x22, 0x58, 0x0a, 0x1a, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, + 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x3a, 0x0a, 0x0e, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, + 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x0e, 0x72, 0x65, 0x67, + 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x91, 0x01, 0x0a, 0x21, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, + 0x69, 0x6e, 0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, + 0x6e, 0x63, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x72, 0x65, 0x67, + 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, + 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, + 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x32, + 0xcf, 0x05, 0x0a, 0x15, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, + 0x63, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xa0, 0x01, 0x0a, 0x2a, 0x66, 0x69, + 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, + 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x12, 0x35, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, + 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, + 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x36, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, + 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, + 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x6d, 0x0a, 0x19, + 0x66, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, + 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x24, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, - 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x24, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, - 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, - 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, - 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, - 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x98, 0x01, 0x0a, 0x29, 0x66, + 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x25, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, + 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x98, 0x01, 0x0a, 0x29, + 0x66, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, + 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x12, 0x34, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x12, 0x34, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, - 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, - 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, - 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, - 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, - 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x12, 0x66, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, - 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x1d, 0x2e, 0x70, 0x62, - 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, - 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x70, 0x62, 0x2e, - 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, - 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x1a, 0x75, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, - 0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x12, 0x25, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, - 0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x35, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, + 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x52, + 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5f, 0x0a, 0x16, 0x66, 0x69, 0x6e, 0x64, 0x41, 0x6c, + 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, + 0x12, 0x21, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, + 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, + 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x12, 0x66, 0x69, 0x6e, 0x64, 0x52, + 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x1d, 0x2e, + 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, + 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x70, + 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, + 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x1a, + 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, + 0x69, 0x6e, 0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x12, 0x25, 0x2e, 0x70, 0x62, 0x2e, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, + 0x69, 0x6e, 0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, + 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -584,7 +685,7 @@ func file_service_region_province_proto_rawDescGZIP() []byte { return file_service_region_province_proto_rawDescData } -var file_service_region_province_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_service_region_province_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_service_region_province_proto_goTypes = []interface{}{ (*FindAllEnabledRegionProvincesWithCountryIdRequest)(nil), // 0: pb.FindAllEnabledRegionProvincesWithCountryIdRequest (*FindAllEnabledRegionProvincesWithCountryIdResponse)(nil), // 1: pb.FindAllEnabledRegionProvincesWithCountryIdResponse @@ -592,32 +693,37 @@ var file_service_region_province_proto_goTypes = []interface{}{ (*FindEnabledRegionProvinceResponse)(nil), // 3: pb.FindEnabledRegionProvinceResponse (*FindAllRegionProvincesWithRegionCountryIdRequest)(nil), // 4: pb.FindAllRegionProvincesWithRegionCountryIdRequest (*FindAllRegionProvincesWithRegionCountryIdResponse)(nil), // 5: pb.FindAllRegionProvincesWithRegionCountryIdResponse - (*FindRegionProvinceRequest)(nil), // 6: pb.FindRegionProvinceRequest - (*FindRegionProvinceResponse)(nil), // 7: pb.FindRegionProvinceResponse - (*UpdateRegionProvinceCustomRequest)(nil), // 8: pb.UpdateRegionProvinceCustomRequest - (*RegionProvince)(nil), // 9: pb.RegionProvince - (*RPCSuccess)(nil), // 10: pb.RPCSuccess + (*FindAllRegionProvincesRequest)(nil), // 6: pb.FindAllRegionProvincesRequest + (*FindAllRegionProvincesResponse)(nil), // 7: pb.FindAllRegionProvincesResponse + (*FindRegionProvinceRequest)(nil), // 8: pb.FindRegionProvinceRequest + (*FindRegionProvinceResponse)(nil), // 9: pb.FindRegionProvinceResponse + (*UpdateRegionProvinceCustomRequest)(nil), // 10: pb.UpdateRegionProvinceCustomRequest + (*RegionProvince)(nil), // 11: pb.RegionProvince + (*RPCSuccess)(nil), // 12: pb.RPCSuccess } var file_service_region_province_proto_depIdxs = []int32{ - 9, // 0: pb.FindAllEnabledRegionProvincesWithCountryIdResponse.regionProvinces:type_name -> pb.RegionProvince - 9, // 1: pb.FindEnabledRegionProvinceResponse.regionProvince:type_name -> pb.RegionProvince - 9, // 2: pb.FindAllRegionProvincesWithRegionCountryIdResponse.regionProvinces:type_name -> pb.RegionProvince - 9, // 3: pb.FindRegionProvinceResponse.regionProvince:type_name -> pb.RegionProvince - 0, // 4: pb.RegionProvinceService.findAllEnabledRegionProvincesWithCountryId:input_type -> pb.FindAllEnabledRegionProvincesWithCountryIdRequest - 2, // 5: pb.RegionProvinceService.findEnabledRegionProvince:input_type -> pb.FindEnabledRegionProvinceRequest - 4, // 6: pb.RegionProvinceService.findAllRegionProvincesWithRegionCountryId:input_type -> pb.FindAllRegionProvincesWithRegionCountryIdRequest - 6, // 7: pb.RegionProvinceService.findRegionProvince:input_type -> pb.FindRegionProvinceRequest - 8, // 8: pb.RegionProvinceService.updateRegionProvinceCustom:input_type -> pb.UpdateRegionProvinceCustomRequest - 1, // 9: pb.RegionProvinceService.findAllEnabledRegionProvincesWithCountryId:output_type -> pb.FindAllEnabledRegionProvincesWithCountryIdResponse - 3, // 10: pb.RegionProvinceService.findEnabledRegionProvince:output_type -> pb.FindEnabledRegionProvinceResponse - 5, // 11: pb.RegionProvinceService.findAllRegionProvincesWithRegionCountryId:output_type -> pb.FindAllRegionProvincesWithRegionCountryIdResponse - 7, // 12: pb.RegionProvinceService.findRegionProvince:output_type -> pb.FindRegionProvinceResponse - 10, // 13: pb.RegionProvinceService.updateRegionProvinceCustom:output_type -> pb.RPCSuccess - 9, // [9:14] is the sub-list for method output_type - 4, // [4:9] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 11, // 0: pb.FindAllEnabledRegionProvincesWithCountryIdResponse.regionProvinces:type_name -> pb.RegionProvince + 11, // 1: pb.FindEnabledRegionProvinceResponse.regionProvince:type_name -> pb.RegionProvince + 11, // 2: pb.FindAllRegionProvincesWithRegionCountryIdResponse.regionProvinces:type_name -> pb.RegionProvince + 11, // 3: pb.FindAllRegionProvincesResponse.regionProvinces:type_name -> pb.RegionProvince + 11, // 4: pb.FindRegionProvinceResponse.regionProvince:type_name -> pb.RegionProvince + 0, // 5: pb.RegionProvinceService.findAllEnabledRegionProvincesWithCountryId:input_type -> pb.FindAllEnabledRegionProvincesWithCountryIdRequest + 2, // 6: pb.RegionProvinceService.findEnabledRegionProvince:input_type -> pb.FindEnabledRegionProvinceRequest + 4, // 7: pb.RegionProvinceService.findAllRegionProvincesWithRegionCountryId:input_type -> pb.FindAllRegionProvincesWithRegionCountryIdRequest + 6, // 8: pb.RegionProvinceService.findAllRegionProvinces:input_type -> pb.FindAllRegionProvincesRequest + 8, // 9: pb.RegionProvinceService.findRegionProvince:input_type -> pb.FindRegionProvinceRequest + 10, // 10: pb.RegionProvinceService.updateRegionProvinceCustom:input_type -> pb.UpdateRegionProvinceCustomRequest + 1, // 11: pb.RegionProvinceService.findAllEnabledRegionProvincesWithCountryId:output_type -> pb.FindAllEnabledRegionProvincesWithCountryIdResponse + 3, // 12: pb.RegionProvinceService.findEnabledRegionProvince:output_type -> pb.FindEnabledRegionProvinceResponse + 5, // 13: pb.RegionProvinceService.findAllRegionProvincesWithRegionCountryId:output_type -> pb.FindAllRegionProvincesWithRegionCountryIdResponse + 7, // 14: pb.RegionProvinceService.findAllRegionProvinces:output_type -> pb.FindAllRegionProvincesResponse + 9, // 15: pb.RegionProvinceService.findRegionProvince:output_type -> pb.FindRegionProvinceResponse + 12, // 16: pb.RegionProvinceService.updateRegionProvinceCustom:output_type -> pb.RPCSuccess + 11, // [11:17] is the sub-list for method output_type + 5, // [5:11] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_service_region_province_proto_init() } @@ -701,7 +807,7 @@ func file_service_region_province_proto_init() { } } file_service_region_province_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FindRegionProvinceRequest); i { + switch v := v.(*FindAllRegionProvincesRequest); i { case 0: return &v.state case 1: @@ -713,7 +819,7 @@ func file_service_region_province_proto_init() { } } file_service_region_province_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FindRegionProvinceResponse); i { + switch v := v.(*FindAllRegionProvincesResponse); i { case 0: return &v.state case 1: @@ -725,6 +831,30 @@ func file_service_region_province_proto_init() { } } file_service_region_province_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*FindRegionProvinceRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_service_region_province_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*FindRegionProvinceResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_service_region_province_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UpdateRegionProvinceCustomRequest); i { case 0: return &v.state @@ -743,7 +873,7 @@ func file_service_region_province_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_service_region_province_proto_rawDesc, NumEnums: 0, - NumMessages: 9, + NumMessages: 11, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/rpc/pb/service_region_province_grpc.pb.go b/pkg/rpc/pb/service_region_province_grpc.pb.go index 0739f9e..3e4c2e2 100644 --- a/pkg/rpc/pb/service_region_province_grpc.pb.go +++ b/pkg/rpc/pb/service_region_province_grpc.pb.go @@ -22,6 +22,7 @@ const ( RegionProvinceService_FindAllEnabledRegionProvincesWithCountryId_FullMethodName = "/pb.RegionProvinceService/findAllEnabledRegionProvincesWithCountryId" RegionProvinceService_FindEnabledRegionProvince_FullMethodName = "/pb.RegionProvinceService/findEnabledRegionProvince" RegionProvinceService_FindAllRegionProvincesWithRegionCountryId_FullMethodName = "/pb.RegionProvinceService/findAllRegionProvincesWithRegionCountryId" + RegionProvinceService_FindAllRegionProvinces_FullMethodName = "/pb.RegionProvinceService/findAllRegionProvinces" RegionProvinceService_FindRegionProvince_FullMethodName = "/pb.RegionProvinceService/findRegionProvince" RegionProvinceService_UpdateRegionProvinceCustom_FullMethodName = "/pb.RegionProvinceService/updateRegionProvinceCustom" ) @@ -31,13 +32,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type RegionProvinceServiceClient interface { // Deprecated: Do not use. - // 查找所有省份 + // 根据国家|地区ID查找所有省份 FindAllEnabledRegionProvincesWithCountryId(ctx context.Context, in *FindAllEnabledRegionProvincesWithCountryIdRequest, opts ...grpc.CallOption) (*FindAllEnabledRegionProvincesWithCountryIdResponse, error) // Deprecated: Do not use. // 查找单个省份信息 FindEnabledRegionProvince(ctx context.Context, in *FindEnabledRegionProvinceRequest, opts ...grpc.CallOption) (*FindEnabledRegionProvinceResponse, error) - // 查找所有省份 + // 根据国家|地区ID查找所有省份 FindAllRegionProvincesWithRegionCountryId(ctx context.Context, in *FindAllRegionProvincesWithRegionCountryIdRequest, opts ...grpc.CallOption) (*FindAllRegionProvincesWithRegionCountryIdResponse, error) + // 查找所有国家|地区的所有省份 + FindAllRegionProvinces(ctx context.Context, in *FindAllRegionProvincesRequest, opts ...grpc.CallOption) (*FindAllRegionProvincesResponse, error) // 查找单个省份信息 FindRegionProvince(ctx context.Context, in *FindRegionProvinceRequest, opts ...grpc.CallOption) (*FindRegionProvinceResponse, error) // 修改国家/地区定制信息 @@ -81,6 +84,15 @@ func (c *regionProvinceServiceClient) FindAllRegionProvincesWithRegionCountryId( return out, nil } +func (c *regionProvinceServiceClient) FindAllRegionProvinces(ctx context.Context, in *FindAllRegionProvincesRequest, opts ...grpc.CallOption) (*FindAllRegionProvincesResponse, error) { + out := new(FindAllRegionProvincesResponse) + err := c.cc.Invoke(ctx, RegionProvinceService_FindAllRegionProvinces_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *regionProvinceServiceClient) FindRegionProvince(ctx context.Context, in *FindRegionProvinceRequest, opts ...grpc.CallOption) (*FindRegionProvinceResponse, error) { out := new(FindRegionProvinceResponse) err := c.cc.Invoke(ctx, RegionProvinceService_FindRegionProvince_FullMethodName, in, out, opts...) @@ -104,13 +116,15 @@ func (c *regionProvinceServiceClient) UpdateRegionProvinceCustom(ctx context.Con // for forward compatibility type RegionProvinceServiceServer interface { // Deprecated: Do not use. - // 查找所有省份 + // 根据国家|地区ID查找所有省份 FindAllEnabledRegionProvincesWithCountryId(context.Context, *FindAllEnabledRegionProvincesWithCountryIdRequest) (*FindAllEnabledRegionProvincesWithCountryIdResponse, error) // Deprecated: Do not use. // 查找单个省份信息 FindEnabledRegionProvince(context.Context, *FindEnabledRegionProvinceRequest) (*FindEnabledRegionProvinceResponse, error) - // 查找所有省份 + // 根据国家|地区ID查找所有省份 FindAllRegionProvincesWithRegionCountryId(context.Context, *FindAllRegionProvincesWithRegionCountryIdRequest) (*FindAllRegionProvincesWithRegionCountryIdResponse, error) + // 查找所有国家|地区的所有省份 + FindAllRegionProvinces(context.Context, *FindAllRegionProvincesRequest) (*FindAllRegionProvincesResponse, error) // 查找单个省份信息 FindRegionProvince(context.Context, *FindRegionProvinceRequest) (*FindRegionProvinceResponse, error) // 修改国家/地区定制信息 @@ -130,6 +144,9 @@ func (UnimplementedRegionProvinceServiceServer) FindEnabledRegionProvince(contex func (UnimplementedRegionProvinceServiceServer) FindAllRegionProvincesWithRegionCountryId(context.Context, *FindAllRegionProvincesWithRegionCountryIdRequest) (*FindAllRegionProvincesWithRegionCountryIdResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method FindAllRegionProvincesWithRegionCountryId not implemented") } +func (UnimplementedRegionProvinceServiceServer) FindAllRegionProvinces(context.Context, *FindAllRegionProvincesRequest) (*FindAllRegionProvincesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FindAllRegionProvinces not implemented") +} func (UnimplementedRegionProvinceServiceServer) FindRegionProvince(context.Context, *FindRegionProvinceRequest) (*FindRegionProvinceResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method FindRegionProvince not implemented") } @@ -202,6 +219,24 @@ func _RegionProvinceService_FindAllRegionProvincesWithRegionCountryId_Handler(sr return interceptor(ctx, in, info, handler) } +func _RegionProvinceService_FindAllRegionProvinces_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindAllRegionProvincesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RegionProvinceServiceServer).FindAllRegionProvinces(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: RegionProvinceService_FindAllRegionProvinces_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RegionProvinceServiceServer).FindAllRegionProvinces(ctx, req.(*FindAllRegionProvincesRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _RegionProvinceService_FindRegionProvince_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(FindRegionProvinceRequest) if err := dec(in); err != nil { @@ -257,6 +292,10 @@ var RegionProvinceService_ServiceDesc = grpc.ServiceDesc{ MethodName: "findAllRegionProvincesWithRegionCountryId", Handler: _RegionProvinceService_FindAllRegionProvincesWithRegionCountryId_Handler, }, + { + MethodName: "findAllRegionProvinces", + Handler: _RegionProvinceService_FindAllRegionProvinces_Handler, + }, { MethodName: "findRegionProvince", Handler: _RegionProvinceService_FindRegionProvince_Handler, diff --git a/pkg/rpc/protos/models/model_region_country.proto b/pkg/rpc/protos/models/model_region_country.proto index 6edccec..5588d6c 100644 --- a/pkg/rpc/protos/models/model_region_country.proto +++ b/pkg/rpc/protos/models/model_region_country.proto @@ -13,4 +13,5 @@ message RegionCountry { repeated string customCodes = 6; string displayName = 7; bool isCommon = 8; // 是否常用 + string routeCode = 9; // 线路代号 } \ No newline at end of file diff --git a/pkg/rpc/protos/models/model_region_province.proto b/pkg/rpc/protos/models/model_region_province.proto index 8741c32..f4d17d3 100644 --- a/pkg/rpc/protos/models/model_region_province.proto +++ b/pkg/rpc/protos/models/model_region_province.proto @@ -3,6 +3,9 @@ option go_package = "./pb"; package pb; +import "models/model_region_country.proto"; + +// 省份｜州|区域信息 message RegionProvince { int64 id = 1; string name = 2; @@ -11,4 +14,6 @@ message RegionProvince { string customName = 5; repeated string customCodes = 6; string displayName = 7; + + RegionCountry regionCountry = 30; // 国家|地区信息 } diff --git a/pkg/rpc/protos/service_region_province.proto b/pkg/rpc/protos/service_region_province.proto index 77bd14a..6d59712 100644 --- a/pkg/rpc/protos/service_region_province.proto +++ b/pkg/rpc/protos/service_region_province.proto @@ -8,7 +8,7 @@ import "models/rpc_messages.proto"; // 省份相关服务 service RegionProvinceService { - // 查找所有省份 + // 根据国家|地区ID查找所有省份 rpc findAllEnabledRegionProvincesWithCountryId (FindAllEnabledRegionProvincesWithCountryIdRequest) returns (FindAllEnabledRegionProvincesWithCountryIdResponse) { option deprecated = true; }; @@ -18,9 +18,12 @@ service RegionProvinceService { option deprecated = true; }; - // 查找所有省份 + // 根据国家|地区ID查找所有省份 rpc findAllRegionProvincesWithRegionCountryId (FindAllRegionProvincesWithRegionCountryIdRequest) returns (FindAllRegionProvincesWithRegionCountryIdResponse); + // 查找所有国家|地区的所有省份 + rpc findAllRegionProvinces(FindAllRegionProvincesRequest) returns (FindAllRegionProvincesResponse); + // 查找单个省份信息 rpc findRegionProvince (FindRegionProvinceRequest) returns (FindRegionProvinceResponse); @@ -28,45 +31,54 @@ service RegionProvinceService { rpc updateRegionProvinceCustom(UpdateRegionProvinceCustomRequest) returns (RPCSuccess); } -// 查找所有省份 +// 根据国家|地区ID查找所有省份 message FindAllEnabledRegionProvincesWithCountryIdRequest { - int64 regionCountryId = 1; + int64 regionCountryId = 1; // 国家|地区ID } message FindAllEnabledRegionProvincesWithCountryIdResponse { - repeated RegionProvince regionProvinces = 1; + repeated RegionProvince regionProvinces = 1; // 省份列表 } // 查找单个省份信息 message FindEnabledRegionProvinceRequest { - int64 regionProvinceId = 1; + int64 regionProvinceId = 1; // 省份ID } message FindEnabledRegionProvinceResponse { - RegionProvince regionProvince = 1; + RegionProvince regionProvince = 1; // 省份信息 } -// 查找所有省份 +// 根据国家|地区ID查找所有省份 message FindAllRegionProvincesWithRegionCountryIdRequest { - int64 regionCountryId = 1; + int64 regionCountryId = 1; // 国家|地区ID } message FindAllRegionProvincesWithRegionCountryIdResponse { - repeated RegionProvince regionProvinces = 1; + repeated RegionProvince regionProvinces = 1; // 省份列表 +} + +// 查找所有国家|地区的所有省份 +message FindAllRegionProvincesRequest { + +} + +message FindAllRegionProvincesResponse { + repeated RegionProvince regionProvinces = 1; // 省份列表 } // 查找单个省份信息 message FindRegionProvinceRequest { - int64 regionProvinceId = 1; + int64 regionProvinceId = 1; // 省份ID } message FindRegionProvinceResponse { - RegionProvince regionProvince = 1; + RegionProvince regionProvince = 1; // 省份信息 } // 修改省份定制信息 message UpdateRegionProvinceCustomRequest { - int64 regionProvinceId = 1; - string customName = 2; - repeated string customCodes = 3; + int64 regionProvinceId = 1; // 省份ID + string customName = 2; // 自定义名称 + repeated string customCodes = 3; // 自定义代号 }