wfz 3 years ago
parent
commit
1dabea0dd0

+ 55 - 45
api/common/common.pb.go

@@ -3622,7 +3622,8 @@ type ReportChatRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ReportedPersonID   string   `protobuf:"bytes,4,opt,name=reportedPersonID,proto3" json:"reportedPersonID"`     // 被举报的人的ID
+	ReportMsg          string   `protobuf:"bytes,1,opt,name=reportMsg,proto3" json:"reportMsg"`                   // 举报的详情
+	ReportedPersonId   string   `protobuf:"bytes,4,opt,name=reportedPersonId,proto3" json:"reportedPersonId"`     // 被举报的人的ID
 	ReportedPersonType string   `protobuf:"bytes,5,opt,name=reportedPersonType,proto3" json:"reportedPersonType"` // 被举报的人的类型
 	ContactInformation string   `protobuf:"bytes,6,opt,name=contactInformation,proto3" json:"contactInformation"` // 联系方式
 	Picture            string   `protobuf:"bytes,7,opt,name=picture,proto3" json:"picture"`                       // 图片
@@ -3661,9 +3662,16 @@ func (*ReportChatRequest) Descriptor() ([]byte, []int) {
 	return file_common_proto_rawDescGZIP(), []int{53}
 }
 
-func (x *ReportChatRequest) GetReportedPersonID() string {
+func (x *ReportChatRequest) GetReportMsg() string {
 	if x != nil {
-		return x.ReportedPersonID
+		return x.ReportMsg
+	}
+	return ""
+}
+
+func (x *ReportChatRequest) GetReportedPersonId() string {
+	if x != nil {
+		return x.ReportedPersonId
 	}
 	return ""
 }
@@ -4205,49 +4213,51 @@ var file_common_proto_rawDesc = []byte{
 	0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e,
 	0x65, 0x78, 0x74, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x74, 0x54, 0x6f, 0x70,
 	0x69, 0x63, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0xd5, 0x01, 0x0a, 0x11, 0x52,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0xf3, 0x01, 0x0a, 0x11, 0x52,
 	0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x65, 0x72, 0x73,
-	0x6f, 0x6e, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x65, 0x70, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x2e, 0x0a, 0x12,
-	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79,
-	0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x12,
-	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63,
-	0x74, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07,
-	0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70,
-	0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f,
-	0x72, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f,
-	0x72, 0x79, 0x22, 0xfb, 0x02, 0x0a, 0x0d, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x66, 0x79, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64,
-	0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x2e, 0x0a, 0x12, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e,
-	0x74, 0x69, 0x66, 0x79, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x65,
-	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x49, 0x64,
-	0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x65, 0x72, 0x73,
-	0x6f, 0x6e, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x65, 0x70, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x12,
-	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79,
-	0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x12,
-	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63,
-	0x74, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07,
-	0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70,
-	0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f,
-	0x72, 0x79, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f,
-	0x72, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x73, 0x67, 0x18,
-	0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x73, 0x67,
-	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,
+	0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x73, 0x67, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x73, 0x67, 0x12, 0x2a,
+	0x0a, 0x10, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e,
+	0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
+	0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x12, 0x72, 0x65,
+	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
+	0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x6f,
+	0x6e, 0x74, 0x61, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x49,
+	0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x69,
+	0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x69, 0x63,
+	0x74, 0x75, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79,
+	0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79,
+	0x22, 0xfb, 0x02, 0x0a, 0x0d, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x49, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79,
+	0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1e,
+	0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e,
+	0x0a, 0x12, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x66, 0x79, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x65, 0x70, 0x6f,
+	0x72, 0x74, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x49, 0x64, 0x12, 0x2a,
+	0x0a, 0x10, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e,
+	0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
+	0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x12, 0x72, 0x65,
+	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
+	0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x6f,
+	0x6e, 0x74, 0x61, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x49,
+	0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x69,
+	0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x69, 0x63,
+	0x74, 0x75, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79,
+	0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79,
+	0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x73, 0x67, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x73, 0x67, 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 (

+ 2 - 1
api/common/common.proto

@@ -364,7 +364,8 @@ message ChatTopicList {
 }
 
 message ReportChatRequest{
-  string reportedPersonID = 4; // 被举报的人的ID
+  string reportMsg = 1;// 举报的详情
+  string reportedPersonId = 4; // 被举报的人的ID
   string reportedPersonType = 5; // 被举报的人的类型
   string contactInformation = 6; // 联系方式
   string picture = 7;  // 图片

+ 74 - 64
api/partner/partner.pb.go

@@ -788,7 +788,7 @@ var file_partner_proto_rawDesc = []byte{
 	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x22, 0x2b, 0x0a, 0x17, 0x47, 0x65,
 	0x74, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0xa6, 0x1e, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74,
+	0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0x87, 0x1f, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74,
 	0x6e, 0x65, 0x72, 0x12, 0x60, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65,
 	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0x2e,
@@ -1031,11 +1031,18 @@ var file_partner_proto_rawDesc = []byte{
 	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
 	0x22, 0x1e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x22, 0x13, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70,
 	0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x75, 0x6e, 0x6c, 0x69, 0x6b, 0x65, 0x3a, 0x01, 0x2a,
-	0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x50,
-	0x01, 0x5a, 0x35, 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, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
-	0x3b, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x5f, 0x0a, 0x06, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x68,
+	0x61, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74,
+	0x79, 0x22, 0x1e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x22, 0x13, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x3a, 0x01,
+	0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
+	0x50, 0x01, 0x5a, 0x35, 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, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65,
+	0x72, 0x3b, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -1079,26 +1086,27 @@ var file_partner_proto_goTypes = []interface{}{
 	(*common.FindChatTopicRequest)(nil),      // 24: api.common.FindChatTopicRequest
 	(*common.RandomNum)(nil),                 // 25: api.common.RandomNum
 	(*common.RandomNumAndSex)(nil),           // 26: api.common.RandomNumAndSex
-	(*common.PersonMsg)(nil),                 // 27: api.common.PersonMsg
-	(*statistics.LookMessageReply)(nil),      // 28: api.statistics.LookMessageReply
-	(*common.AddFriendMessageInfo)(nil),      // 29: api.common.AddFriendMessageInfo
-	(*common.HomeInfo)(nil),                  // 30: api.common.HomeInfo
-	(*common.LookedAndLikedNum)(nil),         // 31: api.common.LookedAndLikedNum
-	(*statistics.LookAndLikeListReply)(nil),  // 32: api.statistics.LookAndLikeListReply
-	(*common.PersonDBReply)(nil),             // 33: api.common.PersonDBReply
-	(*common.WxConfResponse)(nil),            // 34: api.common.WxConfResponse
-	(*chat.RoomReply)(nil),                   // 35: api.chat.RoomReply
-	(*common.TagListReply)(nil),              // 36: api.common.TagListReply
-	(*common.OnlinePersonListReply)(nil),     // 37: api.common.OnlinePersonListReply
-	(*chat.PartnerFindRoomListReply)(nil),    // 38: api.chat.PartnerFindRoomListReply
-	(*common.ChatRecordListReply)(nil),       // 39: api.common.ChatRecordListReply
-	(*common.ChatRoomMsg)(nil),               // 40: api.common.ChatRoomMsg
-	(*common.IsLike)(nil),                    // 41: api.common.IsLike
-	(*common.MemeList)(nil),                  // 42: api.common.MemeList
-	(*common.ChatTopicList)(nil),             // 43: api.common.ChatTopicList
-	(*common.CommonTextList)(nil),            // 44: api.common.CommonTextList
-	(*common.MemeTitleList)(nil),             // 45: api.common.MemeTitleList
-	(*common.ChatCardInfo)(nil),              // 46: api.common.ChatCardInfo
+	(*common.ReportChatRequest)(nil),         // 27: api.common.ReportChatRequest
+	(*common.PersonMsg)(nil),                 // 28: api.common.PersonMsg
+	(*statistics.LookMessageReply)(nil),      // 29: api.statistics.LookMessageReply
+	(*common.AddFriendMessageInfo)(nil),      // 30: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                  // 31: api.common.HomeInfo
+	(*common.LookedAndLikedNum)(nil),         // 32: api.common.LookedAndLikedNum
+	(*statistics.LookAndLikeListReply)(nil),  // 33: api.statistics.LookAndLikeListReply
+	(*common.PersonDBReply)(nil),             // 34: api.common.PersonDBReply
+	(*common.WxConfResponse)(nil),            // 35: api.common.WxConfResponse
+	(*chat.RoomReply)(nil),                   // 36: api.chat.RoomReply
+	(*common.TagListReply)(nil),              // 37: api.common.TagListReply
+	(*common.OnlinePersonListReply)(nil),     // 38: api.common.OnlinePersonListReply
+	(*chat.PartnerFindRoomListReply)(nil),    // 39: api.chat.PartnerFindRoomListReply
+	(*common.ChatRecordListReply)(nil),       // 40: api.common.ChatRecordListReply
+	(*common.ChatRoomMsg)(nil),               // 41: api.common.ChatRoomMsg
+	(*common.IsLike)(nil),                    // 42: api.common.IsLike
+	(*common.MemeList)(nil),                  // 43: api.common.MemeList
+	(*common.ChatTopicList)(nil),             // 44: api.common.ChatTopicList
+	(*common.CommonTextList)(nil),            // 45: api.common.CommonTextList
+	(*common.MemeTitleList)(nil),             // 46: api.common.MemeTitleList
+	(*common.ChatCardInfo)(nil),              // 47: api.common.ChatCardInfo
 }
 var file_partner_proto_depIdxs = []int32{
 	1,  // 0: api.partner.LevelTable.list:type_name -> api.partner.LevelInfo
@@ -1138,44 +1146,46 @@ var file_partner_proto_depIdxs = []int32{
 	9,  // 34: api.partner.Partner.FindChatTopicTitle:input_type -> google.protobuf.Empty
 	15, // 35: api.partner.Partner.PartnerLike:input_type -> api.common.PersonParam
 	15, // 36: api.partner.Partner.PartnerUnLike:input_type -> api.common.PersonParam
-	3,  // 37: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
-	5,  // 38: api.partner.Partner.GetPartnerBalance:output_type -> api.partner.PartnerBalance
-	6,  // 39: api.partner.Partner.GetPartnerDBBalance:output_type -> api.partner.PartnerDBBalance
-	27, // 40: api.partner.Partner.GetPartnerDBMsg:output_type -> api.common.PersonMsg
-	4,  // 41: api.partner.Partner.GetPartnerMessage:output_type -> api.partner.PartnerMessage
-	28, // 42: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
-	9,  // 43: api.partner.Partner.SendPhoneCode:output_type -> google.protobuf.Empty
-	9,  // 44: api.partner.Partner.CheckPhoneCode:output_type -> google.protobuf.Empty
-	29, // 45: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	9,  // 46: api.partner.Partner.UpdatePartnerInformation:output_type -> google.protobuf.Empty
-	7,  // 47: api.partner.Partner.GetRandomPartnerInfo:output_type -> api.partner.RandomPartnerInfo
-	30, // 48: api.partner.Partner.PartnerGetHomeInfo:output_type -> api.common.HomeInfo
-	31, // 49: api.partner.Partner.PartnerGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
-	32, // 50: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	33, // 51: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
-	34, // 52: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
-	35, // 53: api.partner.Partner.CreateUserPartnerRoom:output_type -> api.chat.RoomReply
-	36, // 54: api.partner.Partner.FindTagListBySex:output_type -> api.common.TagListReply
-	37, // 55: api.partner.Partner.FindOnlineList:output_type -> api.common.OnlinePersonListReply
-	38, // 56: api.partner.Partner.FindUnReplyRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	38, // 57: api.partner.Partner.FindWithinSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	38, // 58: api.partner.Partner.FindOverSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	39, // 59: api.partner.Partner.FindChatRecordList:output_type -> api.common.ChatRecordListReply
-	40, // 60: api.partner.Partner.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
-	9,  // 61: api.partner.Partner.AddPartnerBalance:output_type -> google.protobuf.Empty
-	0,  // 62: api.partner.Partner.GetLevelBalanceTable:output_type -> api.partner.LevelTable
-	41, // 63: api.partner.Partner.GetPartnerIsLike:output_type -> api.common.IsLike
-	42, // 64: api.partner.Partner.FindMemeByType:output_type -> api.common.MemeList
-	43, // 65: api.partner.Partner.FindChatTopic:output_type -> api.common.ChatTopicList
-	44, // 66: api.partner.Partner.RandomMeme:output_type -> api.common.CommonTextList
-	44, // 67: api.partner.Partner.RandomSwiftMessage:output_type -> api.common.CommonTextList
-	45, // 68: api.partner.Partner.FindMemeTitle:output_type -> api.common.MemeTitleList
-	46, // 69: api.partner.Partner.PartnerGetChatCard:output_type -> api.common.ChatCardInfo
-	45, // 70: api.partner.Partner.FindChatTopicTitle:output_type -> api.common.MemeTitleList
-	9,  // 71: api.partner.Partner.PartnerLike:output_type -> google.protobuf.Empty
-	9,  // 72: api.partner.Partner.PartnerUnLike:output_type -> google.protobuf.Empty
-	37, // [37:73] is the sub-list for method output_type
-	1,  // [1:37] is the sub-list for method input_type
+	27, // 37: api.partner.Partner.Report:input_type -> api.common.ReportChatRequest
+	3,  // 38: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
+	5,  // 39: api.partner.Partner.GetPartnerBalance:output_type -> api.partner.PartnerBalance
+	6,  // 40: api.partner.Partner.GetPartnerDBBalance:output_type -> api.partner.PartnerDBBalance
+	28, // 41: api.partner.Partner.GetPartnerDBMsg:output_type -> api.common.PersonMsg
+	4,  // 42: api.partner.Partner.GetPartnerMessage:output_type -> api.partner.PartnerMessage
+	29, // 43: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
+	9,  // 44: api.partner.Partner.SendPhoneCode:output_type -> google.protobuf.Empty
+	9,  // 45: api.partner.Partner.CheckPhoneCode:output_type -> google.protobuf.Empty
+	30, // 46: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	9,  // 47: api.partner.Partner.UpdatePartnerInformation:output_type -> google.protobuf.Empty
+	7,  // 48: api.partner.Partner.GetRandomPartnerInfo:output_type -> api.partner.RandomPartnerInfo
+	31, // 49: api.partner.Partner.PartnerGetHomeInfo:output_type -> api.common.HomeInfo
+	32, // 50: api.partner.Partner.PartnerGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
+	33, // 51: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	34, // 52: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
+	35, // 53: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
+	36, // 54: api.partner.Partner.CreateUserPartnerRoom:output_type -> api.chat.RoomReply
+	37, // 55: api.partner.Partner.FindTagListBySex:output_type -> api.common.TagListReply
+	38, // 56: api.partner.Partner.FindOnlineList:output_type -> api.common.OnlinePersonListReply
+	39, // 57: api.partner.Partner.FindUnReplyRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	39, // 58: api.partner.Partner.FindWithinSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	39, // 59: api.partner.Partner.FindOverSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	40, // 60: api.partner.Partner.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	41, // 61: api.partner.Partner.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	9,  // 62: api.partner.Partner.AddPartnerBalance:output_type -> google.protobuf.Empty
+	0,  // 63: api.partner.Partner.GetLevelBalanceTable:output_type -> api.partner.LevelTable
+	42, // 64: api.partner.Partner.GetPartnerIsLike:output_type -> api.common.IsLike
+	43, // 65: api.partner.Partner.FindMemeByType:output_type -> api.common.MemeList
+	44, // 66: api.partner.Partner.FindChatTopic:output_type -> api.common.ChatTopicList
+	45, // 67: api.partner.Partner.RandomMeme:output_type -> api.common.CommonTextList
+	45, // 68: api.partner.Partner.RandomSwiftMessage:output_type -> api.common.CommonTextList
+	46, // 69: api.partner.Partner.FindMemeTitle:output_type -> api.common.MemeTitleList
+	47, // 70: api.partner.Partner.PartnerGetChatCard:output_type -> api.common.ChatCardInfo
+	46, // 71: api.partner.Partner.FindChatTopicTitle:output_type -> api.common.MemeTitleList
+	9,  // 72: api.partner.Partner.PartnerLike:output_type -> google.protobuf.Empty
+	9,  // 73: api.partner.Partner.PartnerUnLike:output_type -> google.protobuf.Empty
+	9,  // 74: api.partner.Partner.Report:output_type -> google.protobuf.Empty
+	38, // [38:75] is the sub-list for method output_type
+	1,  // [1:38] 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

+ 7 - 0
api/partner/partner.proto

@@ -233,6 +233,13 @@ service Partner {
       body:"*"
     };
   };
+  // 举报某人
+  rpc Report (common.ReportChatRequest) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/partner/report",
+      body:"*"
+    };
+  };
 }
 
 message LevelTable{

+ 38 - 0
api/partner/partner_grpc.pb.go

@@ -91,6 +91,8 @@ type PartnerClient interface {
 	PartnerLike(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 接待员取关某人
 	PartnerUnLike(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 举报某人
+	Report(ctx context.Context, in *common.ReportChatRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type partnerClient struct {
@@ -425,6 +427,15 @@ func (c *partnerClient) PartnerUnLike(ctx context.Context, in *common.PersonPara
 	return out, nil
 }
 
+func (c *partnerClient) Report(ctx context.Context, in *common.ReportChatRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/Report", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // PartnerServer is the server API for Partner service.
 // All implementations must embed UnimplementedPartnerServer
 // for forward compatibility
@@ -498,6 +509,8 @@ type PartnerServer interface {
 	PartnerLike(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	// 接待员取关某人
 	PartnerUnLike(context.Context, *common.PersonParam) (*emptypb.Empty, error)
+	// 举报某人
+	Report(context.Context, *common.ReportChatRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedPartnerServer()
 }
 
@@ -613,6 +626,9 @@ func (UnimplementedPartnerServer) PartnerLike(context.Context, *common.PersonPar
 func (UnimplementedPartnerServer) PartnerUnLike(context.Context, *common.PersonParam) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PartnerUnLike not implemented")
 }
+func (UnimplementedPartnerServer) Report(context.Context, *common.ReportChatRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Report not implemented")
+}
 func (UnimplementedPartnerServer) mustEmbedUnimplementedPartnerServer() {}
 
 // UnsafePartnerServer may be embedded to opt out of forward compatibility for this service.
@@ -1274,6 +1290,24 @@ func _Partner_PartnerUnLike_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Partner_Report_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ReportChatRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).Report(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/Report",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).Report(ctx, req.(*common.ReportChatRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Partner_ServiceDesc is the grpc.ServiceDesc for Partner service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1425,6 +1459,10 @@ var Partner_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "PartnerUnLike",
 			Handler:    _Partner_PartnerUnLike_Handler,
 		},
+		{
+			MethodName: "Report",
+			Handler:    _Partner_Report_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "partner.proto",

+ 43 - 0
api/partner/partner_http.pb.go

@@ -57,6 +57,7 @@ type PartnerHTTPServer interface {
 	PartnerUnLike(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error)
 	RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error)
+	Report(context.Context, *common.ReportChatRequest) (*emptypb.Empty, error)
 	SendPhoneCode(context.Context, *common.SendPhoneCodeRequest) (*emptypb.Empty, error)
 	UpdatePartnerInformation(context.Context, *common.UpdateInformationRequest) (*emptypb.Empty, error)
 	WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error)
@@ -94,6 +95,7 @@ func RegisterPartnerHTTPServer(s *http.Server, srv PartnerHTTPServer) {
 	r.POST("/api/partner/find/chat/title", _Partner_FindChatTopicTitle0_HTTP_Handler(srv))
 	r.POST("/api/partner/like", _Partner_PartnerLike0_HTTP_Handler(srv))
 	r.POST("/api/partner/unlike", _Partner_PartnerUnLike0_HTTP_Handler(srv))
+	r.POST("/api/partner/report", _Partner_Report0_HTTP_Handler(srv))
 }
 
 func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
@@ -906,6 +908,33 @@ func _Partner_PartnerUnLike0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.C
 	}
 }
 
+func _Partner_Report0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.ReportChatRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/Report")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.Report(ctx, req.(*common.ReportChatRequest))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
 type PartnerHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	CreateUserPartnerRoom(ctx context.Context, req *common.PersonIDParam, opts ...http.CallOption) (rsp *chat.RoomReply, err error)
@@ -934,6 +963,7 @@ type PartnerHTTPClient interface {
 	PartnerUnLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	RandomMeme(ctx context.Context, req *common.RandomNum, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
 	RandomSwiftMessage(ctx context.Context, req *common.RandomNumAndSex, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
+	Report(ctx context.Context, req *common.ReportChatRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	SendPhoneCode(ctx context.Context, req *common.SendPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UpdatePartnerInformation(ctx context.Context, req *common.UpdateInformationRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	WxConf(ctx context.Context, req *common.WxConfReq, opts ...http.CallOption) (rsp *common.WxConfResponse, err error)
@@ -1298,6 +1328,19 @@ func (c *PartnerHTTPClientImpl) RandomSwiftMessage(ctx context.Context, in *comm
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) Report(ctx context.Context, in *common.ReportChatRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
+	var out emptypb.Empty
+	pattern := "/api/partner/report"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/Report"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *PartnerHTTPClientImpl) SendPhoneCode(ctx context.Context, in *common.SendPhoneCodeRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
 	pattern := "/api/partner/code/send"

+ 82 - 73
api/user/user.pb.go

@@ -1255,7 +1255,7 @@ var file_user_proto_rawDesc = []byte{
 	0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
 	0x73, 0x22, 0x2a, 0x0a, 0x10, 0x50, 0x61, 0x79, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b,
 	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x32, 0xfc, 0x23,
+	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x32, 0xda, 0x24,
 	0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x7e, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
 	0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
 	0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64,
@@ -1543,12 +1543,18 @@ var file_user_proto_rawDesc = []byte{
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72,
 	0x2e, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x1d, 0x82,
 	0xd3, 0xe4, 0x93, 0x02, 0x17, 0x22, 0x12, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72,
-	0x2f, 0x70, 0x61, 0x79, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x42, 0x3d, 0x0a, 0x08,
-	0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x2f, 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, 0x75, 0x73, 0x65, 0x72, 0x3b, 0x75, 0x73, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x2f, 0x70, 0x61, 0x79, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0x5c, 0x0a, 0x06,
+	0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x1b, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x15, 0x22, 0x10, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72,
+	0x2f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x3a, 0x01, 0x2a, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70,
+	0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x2f, 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,
+	0x75, 0x73, 0x65, 0x72, 0x3b, 0x75, 0x73, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -1600,27 +1606,28 @@ var file_user_proto_goTypes = []interface{}{
 	(*common.RandomNum)(nil),                         // 32: api.common.RandomNum
 	(*common.RandomNumAndSex)(nil),                   // 33: api.common.RandomNumAndSex
 	(*common.RoomIDRequest)(nil),                     // 34: api.common.RoomIDRequest
-	(*common.PersonMsg)(nil),                         // 35: api.common.PersonMsg
-	(*chat.CheckUserPartnerIsRelationshipReply)(nil), // 36: api.chat.CheckUserPartnerIsRelationshipReply
-	(*chat.RoomReply)(nil),                           // 37: api.chat.RoomReply
-	(*common.AddFriendMessageInfo)(nil),              // 38: api.common.AddFriendMessageInfo
-	(*common.HomeInfo)(nil),                          // 39: api.common.HomeInfo
-	(*common.PersonDBReply)(nil),                     // 40: api.common.PersonDBReply
-	(*statistics.LookAndLikeListReply)(nil),          // 41: api.statistics.LookAndLikeListReply
-	(*statistics.LookAndLikeMessageReply)(nil),       // 42: api.statistics.LookAndLikeMessageReply
-	(*common.WxConfResponse)(nil),                    // 43: api.common.WxConfResponse
-	(*common.TagListReply)(nil),                      // 44: api.common.TagListReply
-	(*common.OnlinePersonListReply)(nil),             // 45: api.common.OnlinePersonListReply
-	(*common.LookedAndLikedNum)(nil),                 // 46: api.common.LookedAndLikedNum
-	(*statistics.LookMessageReply)(nil),              // 47: api.statistics.LookMessageReply
-	(*common.ChatRecordListReply)(nil),               // 48: api.common.ChatRecordListReply
-	(*common.ChatRoomMsg)(nil),                       // 49: api.common.ChatRoomMsg
-	(*common.IsLike)(nil),                            // 50: api.common.IsLike
-	(*common.ChatCardInfo)(nil),                      // 51: api.common.ChatCardInfo
-	(*common.MemeList)(nil),                          // 52: api.common.MemeList
-	(*common.ChatTopicList)(nil),                     // 53: api.common.ChatTopicList
-	(*common.CommonTextList)(nil),                    // 54: api.common.CommonTextList
-	(*common.MemeTitleList)(nil),                     // 55: api.common.MemeTitleList
+	(*common.ReportChatRequest)(nil),                 // 35: api.common.ReportChatRequest
+	(*common.PersonMsg)(nil),                         // 36: api.common.PersonMsg
+	(*chat.CheckUserPartnerIsRelationshipReply)(nil), // 37: api.chat.CheckUserPartnerIsRelationshipReply
+	(*chat.RoomReply)(nil),                           // 38: api.chat.RoomReply
+	(*common.AddFriendMessageInfo)(nil),              // 39: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                          // 40: api.common.HomeInfo
+	(*common.PersonDBReply)(nil),                     // 41: api.common.PersonDBReply
+	(*statistics.LookAndLikeListReply)(nil),          // 42: api.statistics.LookAndLikeListReply
+	(*statistics.LookAndLikeMessageReply)(nil),       // 43: api.statistics.LookAndLikeMessageReply
+	(*common.WxConfResponse)(nil),                    // 44: api.common.WxConfResponse
+	(*common.TagListReply)(nil),                      // 45: api.common.TagListReply
+	(*common.OnlinePersonListReply)(nil),             // 46: api.common.OnlinePersonListReply
+	(*common.LookedAndLikedNum)(nil),                 // 47: api.common.LookedAndLikedNum
+	(*statistics.LookMessageReply)(nil),              // 48: api.statistics.LookMessageReply
+	(*common.ChatRecordListReply)(nil),               // 49: api.common.ChatRecordListReply
+	(*common.ChatRoomMsg)(nil),                       // 50: api.common.ChatRoomMsg
+	(*common.IsLike)(nil),                            // 51: api.common.IsLike
+	(*common.ChatCardInfo)(nil),                      // 52: api.common.ChatCardInfo
+	(*common.MemeList)(nil),                          // 53: api.common.MemeList
+	(*common.ChatTopicList)(nil),                     // 54: api.common.ChatTopicList
+	(*common.CommonTextList)(nil),                    // 55: api.common.CommonTextList
+	(*common.MemeTitleList)(nil),                     // 56: api.common.MemeTitleList
 }
 var file_user_proto_depIdxs = []int32{
 	2,  // 0: api.user.RechargeList.list:type_name -> api.user.RechargeInfo
@@ -1670,51 +1677,53 @@ var file_user_proto_depIdxs = []int32{
 	0,  // 44: api.user.User.UserRecharge:input_type -> api.user.UserRechargeRequest
 	17, // 45: api.user.User.FindRechargeList:input_type -> google.protobuf.Empty
 	13, // 46: api.user.User.FindPayList:input_type -> api.user.FindPayOrderListRequest
-	17, // 47: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
-	7,  // 48: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
-	35, // 49: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
-	17, // 50: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
-	17, // 51: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
-	36, // 52: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	37, // 53: api.user.User.CreateUserPersonRoom:output_type -> api.chat.RoomReply
-	38, // 54: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	39, // 55: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
-	40, // 56: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
-	41, // 57: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	41, // 58: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
-	41, // 59: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
-	42, // 60: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
-	43, // 61: api.user.User.WxConf:output_type -> api.common.WxConfResponse
-	44, // 62: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
-	45, // 63: api.user.User.FindOnlineList:output_type -> api.common.OnlinePersonListReply
-	5,  // 64: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	5,  // 65: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	46, // 66: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
-	4,  // 67: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
-	47, // 68: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
-	48, // 69: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
-	49, // 70: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
-	50, // 71: api.user.User.GetUserIsLike:output_type -> api.common.IsLike
-	17, // 72: api.user.User.UserFinishInformation:output_type -> google.protobuf.Empty
-	3,  // 73: api.user.User.UserInformationStatus:output_type -> api.user.InformationStatus
-	17, // 74: api.user.User.UserGetInformationAward:output_type -> google.protobuf.Empty
-	51, // 75: api.user.User.UserGetChatCard:output_type -> api.common.ChatCardInfo
-	17, // 76: api.user.User.UserLike:output_type -> google.protobuf.Empty
-	17, // 77: api.user.User.UserUnLike:output_type -> google.protobuf.Empty
-	17, // 78: api.user.User.UnlockLookRecord:output_type -> google.protobuf.Empty
-	17, // 79: api.user.User.SendMsgReduceCredit:output_type -> google.protobuf.Empty
-	52, // 80: api.user.User.FindMemeByType:output_type -> api.common.MemeList
-	53, // 81: api.user.User.FindChatTopic:output_type -> api.common.ChatTopicList
-	54, // 82: api.user.User.RandomMeme:output_type -> api.common.CommonTextList
-	54, // 83: api.user.User.RandomSwiftMessage:output_type -> api.common.CommonTextList
-	55, // 84: api.user.User.FindMemeTitle:output_type -> api.common.MemeTitleList
-	17, // 85: api.user.User.UserSetBlackChat:output_type -> google.protobuf.Empty
-	55, // 86: api.user.User.FindChatTopicTitle:output_type -> api.common.MemeTitleList
-	10, // 87: api.user.User.UserRecharge:output_type -> api.user.PayInfo
-	1,  // 88: api.user.User.FindRechargeList:output_type -> api.user.RechargeList
-	12, // 89: api.user.User.FindPayList:output_type -> api.user.PayOrderList
-	47, // [47:90] is the sub-list for method output_type
-	4,  // [4:47] is the sub-list for method input_type
+	35, // 47: api.user.User.Report:input_type -> api.common.ReportChatRequest
+	17, // 48: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
+	7,  // 49: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
+	36, // 50: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
+	17, // 51: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
+	17, // 52: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
+	37, // 53: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	38, // 54: api.user.User.CreateUserPersonRoom:output_type -> api.chat.RoomReply
+	39, // 55: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	40, // 56: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
+	41, // 57: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
+	42, // 58: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	42, // 59: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
+	42, // 60: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
+	43, // 61: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
+	44, // 62: api.user.User.WxConf:output_type -> api.common.WxConfResponse
+	45, // 63: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
+	46, // 64: api.user.User.FindOnlineList:output_type -> api.common.OnlinePersonListReply
+	5,  // 65: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	5,  // 66: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	47, // 67: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
+	4,  // 68: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
+	48, // 69: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
+	49, // 70: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	50, // 71: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	51, // 72: api.user.User.GetUserIsLike:output_type -> api.common.IsLike
+	17, // 73: api.user.User.UserFinishInformation:output_type -> google.protobuf.Empty
+	3,  // 74: api.user.User.UserInformationStatus:output_type -> api.user.InformationStatus
+	17, // 75: api.user.User.UserGetInformationAward:output_type -> google.protobuf.Empty
+	52, // 76: api.user.User.UserGetChatCard:output_type -> api.common.ChatCardInfo
+	17, // 77: api.user.User.UserLike:output_type -> google.protobuf.Empty
+	17, // 78: api.user.User.UserUnLike:output_type -> google.protobuf.Empty
+	17, // 79: api.user.User.UnlockLookRecord:output_type -> google.protobuf.Empty
+	17, // 80: api.user.User.SendMsgReduceCredit:output_type -> google.protobuf.Empty
+	53, // 81: api.user.User.FindMemeByType:output_type -> api.common.MemeList
+	54, // 82: api.user.User.FindChatTopic:output_type -> api.common.ChatTopicList
+	55, // 83: api.user.User.RandomMeme:output_type -> api.common.CommonTextList
+	55, // 84: api.user.User.RandomSwiftMessage:output_type -> api.common.CommonTextList
+	56, // 85: api.user.User.FindMemeTitle:output_type -> api.common.MemeTitleList
+	17, // 86: api.user.User.UserSetBlackChat:output_type -> google.protobuf.Empty
+	56, // 87: api.user.User.FindChatTopicTitle:output_type -> api.common.MemeTitleList
+	10, // 88: api.user.User.UserRecharge:output_type -> api.user.PayInfo
+	1,  // 89: api.user.User.FindRechargeList:output_type -> api.user.RechargeList
+	12, // 90: api.user.User.FindPayList:output_type -> api.user.PayOrderList
+	17, // 91: api.user.User.Report:output_type -> google.protobuf.Empty
+	48, // [48:92] is the sub-list for method output_type
+	4,  // [4:48] 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

+ 7 - 0
api/user/user.proto

@@ -301,6 +301,13 @@ service User {
       body:"*"
     };
   };
+  // 举报某人
+  rpc Report (common.ReportChatRequest) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/user/report",
+      body:"*"
+    };
+  };
 }
 
 message UserRechargeRequest{

+ 38 - 0
api/user/user_grpc.pb.go

@@ -107,6 +107,8 @@ type UserClient interface {
 	FindRechargeList(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*RechargeList, error)
 	// 用户充值记录列表
 	FindPayList(ctx context.Context, in *FindPayOrderListRequest, opts ...grpc.CallOption) (*PayOrderList, error)
+	// 举报某人
+	Report(ctx context.Context, in *common.ReportChatRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type userClient struct {
@@ -504,6 +506,15 @@ func (c *userClient) FindPayList(ctx context.Context, in *FindPayOrderListReques
 	return out, nil
 }
 
+func (c *userClient) Report(ctx context.Context, in *common.ReportChatRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.user.User/Report", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // UserServer is the server API for User service.
 // All implementations must embed UnimplementedUserServer
 // for forward compatibility
@@ -593,6 +604,8 @@ type UserServer interface {
 	FindRechargeList(context.Context, *emptypb.Empty) (*RechargeList, error)
 	// 用户充值记录列表
 	FindPayList(context.Context, *FindPayOrderListRequest) (*PayOrderList, error)
+	// 举报某人
+	Report(context.Context, *common.ReportChatRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -729,6 +742,9 @@ func (UnimplementedUserServer) FindRechargeList(context.Context, *emptypb.Empty)
 func (UnimplementedUserServer) FindPayList(context.Context, *FindPayOrderListRequest) (*PayOrderList, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindPayList not implemented")
 }
+func (UnimplementedUserServer) Report(context.Context, *common.ReportChatRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Report not implemented")
+}
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 
 // UnsafeUserServer may be embedded to opt out of forward compatibility for this service.
@@ -1516,6 +1532,24 @@ func _User_FindPayList_Handler(srv interface{}, ctx context.Context, dec func(in
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_Report_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ReportChatRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).Report(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/Report",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).Report(ctx, req.(*common.ReportChatRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // User_ServiceDesc is the grpc.ServiceDesc for User service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1695,6 +1729,10 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindPayList",
 			Handler:    _User_FindPayList_Handler,
 		},
+		{
+			MethodName: "Report",
+			Handler:    _User_Report_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "user.proto",

+ 43 - 0
api/user/user_http.pb.go

@@ -56,6 +56,7 @@ type UserHTTPServer interface {
 	GetUserLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
 	RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error)
 	RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error)
+	Report(context.Context, *common.ReportChatRequest) (*emptypb.Empty, error)
 	SendPhoneCode(context.Context, *common.SendPhoneCodeRequest) (*emptypb.Empty, error)
 	UnlockLookRecord(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	UpdateUserInformation(context.Context, *common.UpdateInformationRequest) (*emptypb.Empty, error)
@@ -114,6 +115,7 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/recharge", _User_UserRecharge0_HTTP_Handler(srv))
 	r.POST("/api/user/recharge/list", _User_FindRechargeList0_HTTP_Handler(srv))
 	r.POST("/api/user/pay/list", _User_FindPayList0_HTTP_Handler(srv))
+	r.POST("/api/user/report", _User_Report0_HTTP_Handler(srv))
 }
 
 func _User_UpdateUserInformation0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
@@ -1196,6 +1198,33 @@ func _User_FindPayList0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context)
 	}
 }
 
+func _User_Report0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.ReportChatRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/Report")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.Report(ctx, req.(*common.ReportChatRequest))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
 type UserHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	CheckUserPartnerIsRelationship(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *chat.CheckUserPartnerIsRelationshipReply, err error)
@@ -1223,6 +1252,7 @@ type UserHTTPClient interface {
 	GetUserLookNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *statistics.LookMessageReply, err error)
 	RandomMeme(ctx context.Context, req *common.RandomNum, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
 	RandomSwiftMessage(ctx context.Context, req *common.RandomNumAndSex, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
+	Report(ctx context.Context, req *common.ReportChatRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	SendPhoneCode(ctx context.Context, req *common.SendPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UnlockLookRecord(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UpdateUserInformation(ctx context.Context, req *common.UpdateInformationRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
@@ -1585,6 +1615,19 @@ func (c *UserHTTPClientImpl) RandomSwiftMessage(ctx context.Context, in *common.
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) Report(ctx context.Context, in *common.ReportChatRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
+	var out emptypb.Empty
+	pattern := "/api/user/report"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/Report"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *UserHTTPClientImpl) SendPhoneCode(ctx context.Context, in *common.SendPhoneCodeRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
 	pattern := "/api/user/code/send"

+ 3 - 1
js/api/common/common_pb.ts

@@ -448,8 +448,10 @@ export interface ChatTopicList{
     list?:Array<string>;
 }
 export interface ReportChatRequest{
+    /**  举报的详情 */
+    reportMsg?:string;
     /**  被举报的人的ID */
-    reportedPersonID?:string;
+    reportedPersonId?:string;
     /**  被举报的人的类型 */
     reportedPersonType?:string;
     /**  联系方式 */

+ 6 - 1
js/api/partner/partner_http_pb.ts

@@ -1,7 +1,7 @@
 // @ts-ignore
 import request from '@/libs/request';
 import {PartnerInfo,PartnerBalance,PartnerDBBalance,PartnerMessage,GetRandomPartnerRequest,RandomPartnerInfo,AddPartnerBalanceRequest,LevelTable} from "./partner_pb";
-import {PartnerIDParam,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,ChatCardInfo} from "../common/common_pb";
+import {PartnerIDParam,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,ChatCardInfo,ReportChatRequest} from "../common/common_pb";
 import {LookMessageReply,LookAndLikeListReply} from "../statistics/statistics_pb";
 import {RoomReply,PartnerFindRoomListReply} from "../chat/chat_pb";
 
@@ -156,6 +156,11 @@ const PartnerService = {
 	const res = await request.post('/api/partner/unlike', req);
     return res.data.data;
   },
+  /**  举报某人 */
+  Report: async (req?: ReportChatRequest) => {
+	const res = await request.post('/api/partner/report', req);
+    return res.data.data;
+  },
 
 };
 

+ 6 - 1
js/api/user/user_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {UpdateInformationRequest,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,PersonParam,AddFriendMessageInfo,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,ChatCardInfo,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,RoomIDRequest} from "../common/common_pb";
+import {UpdateInformationRequest,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,PersonParam,AddFriendMessageInfo,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,ChatCardInfo,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,RoomIDRequest,ReportChatRequest} from "../common/common_pb";
 import {UserInfo,KeyRequest,UserFindChatListReply,UserBalance,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList} from "./user_pb";
 import {CheckUserPartnerIsRelationshipReply,RoomReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";
@@ -206,6 +206,11 @@ const UserService = {
 	const res = await request.post<{ data: PayOrderList, code: string, message: string }>('/api/user/pay/list', req);
     return res.data.data;
   },
+  /**  举报某人 */
+  Report: async (req?: ReportChatRequest) => {
+	const res = await request.post('/api/user/report', req);
+    return res.data.data;
+  },
 
 };