Browse Source

省市区

wfz 3 năm trước cách đây
mục cha
commit
351e792c80
3 tập tin đã thay đổi với 43 bổ sung31 xóa
  1. 33 24
      api/common/common.pb.go
  2. 4 3
      api/common/common.proto
  3. 6 4
      js/api/common/common_pb.ts

+ 33 - 24
api/common/common.pb.go

@@ -1379,9 +1379,10 @@ type UpdateInformationRequest struct {
 	Birthday       int64    `protobuf:"varint,4,opt,name=birthday,proto3" json:"birthday"`            // 出生日期(毫秒级时间戳)
 	TagList        []int64  `protobuf:"varint,5,rep,packed,name=tagList,proto3" json:"tagList"`       // 标签id列表
 	IntroduceVoice string   `protobuf:"bytes,6,opt,name=introduceVoice,proto3" json:"introduceVoice"` // 介绍语音的链接
-	Longitude      float64  `protobuf:"fixed64,7,opt,name=longitude,proto3" json:"longitude"`         // 经度
-	Latitude       float64  `protobuf:"fixed64,8,opt,name=latitude,proto3" json:"latitude"`           // 纬度
-	Pictures       []string `protobuf:"bytes,9,rep,name=pictures,proto3" json:"pictures"`             // 相册(主页图片)
+	Pictures       []string `protobuf:"bytes,7,rep,name=pictures,proto3" json:"pictures"`             // 相册(主页图片)
+	Province       string   `protobuf:"bytes,8,opt,name=province,proto3" json:"province"`             // 省
+	City           string   `protobuf:"bytes,9,opt,name=city,proto3" json:"city"`                     // 市
+	Area           string   `protobuf:"bytes,10,opt,name=area,proto3" json:"area"`                    // 区
 }
 
 func (x *UpdateInformationRequest) Reset() {
@@ -1458,25 +1459,32 @@ func (x *UpdateInformationRequest) GetIntroduceVoice() string {
 	return ""
 }
 
-func (x *UpdateInformationRequest) GetLongitude() float64 {
+func (x *UpdateInformationRequest) GetPictures() []string {
 	if x != nil {
-		return x.Longitude
+		return x.Pictures
 	}
-	return 0
+	return nil
 }
 
-func (x *UpdateInformationRequest) GetLatitude() float64 {
+func (x *UpdateInformationRequest) GetProvince() string {
 	if x != nil {
-		return x.Latitude
+		return x.Province
 	}
-	return 0
+	return ""
 }
 
-func (x *UpdateInformationRequest) GetPictures() []string {
+func (x *UpdateInformationRequest) GetCity() string {
 	if x != nil {
-		return x.Pictures
+		return x.City
 	}
-	return nil
+	return ""
+}
+
+func (x *UpdateInformationRequest) GetArea() string {
+	if x != nil {
+		return x.Area
+	}
+	return ""
 }
 
 var File_common_proto protoreflect.FileDescriptor
@@ -1608,7 +1616,7 @@ var file_common_proto_rawDesc = []byte{
 	0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x22, 0x34, 0x0a, 0x14, 0x52, 0x61, 0x6e, 0x64,
 	0x6f, 0x6d, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79,
 	0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x22, 0x9a,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x22, 0xa4,
 	0x02, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x4e,
 	0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e,
@@ -1621,17 +1629,18 @@ var file_common_proto_rawDesc = []byte{
 	0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x74, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x26, 0x0a,
 	0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x18,
 	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65,
-	0x56, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x6f, 0x6e, 0x67, 0x69, 0x74, 0x75,
-	0x64, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x6c, 0x6f, 0x6e, 0x67, 0x69, 0x74,
-	0x75, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x74, 0x69, 0x74, 0x75, 0x64, 0x65, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x6c, 0x61, 0x74, 0x69, 0x74, 0x75, 0x64, 0x65, 0x12,
-	0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x42, 0x43, 0x0a, 0x0a, 0x61,
-	0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74,
-	0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61,
-	0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x56, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65,
+	0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65,
+	0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x12, 0x0a,
+	0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74,
+	0x79, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x61, 0x72, 0x65, 0x61, 0x42, 0x43, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61,
+	0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (

+ 4 - 3
api/common/common.proto

@@ -146,7 +146,8 @@ message UpdateInformationRequest {
   int64 birthday = 4;// 出生日期(毫秒级时间戳)
   repeated int64 tagList = 5;// 标签id列表
   string introduceVoice = 6;// 介绍语音的链接
-  double longitude = 7;// 经度
-  double latitude = 8;// 纬度
-  repeated string pictures = 9;// 相册(主页图片)
+  repeated string pictures = 7;// 相册(主页图片)
+  string province = 8;// 省
+  string city = 9;// 市
+  string area = 10;// 区
 }

+ 6 - 4
js/api/common/common_pb.ts

@@ -160,11 +160,13 @@ export interface UpdateInformationRequest{
     tagList?:Array<number>;
     /**  介绍语音的链接 */
     introduceVoice?:string;
-    /**  经度 */
-    longitude?:number;
-    /**  纬度 */
-    latitude?:number;
     /**  相册(主页图片) */
     pictures?:Array<string>;
+    /**  省 */
+    province?:string;
+    /**  市 */
+    city?:string;
+    /**  区 */
+    area?:string;
 }