wfz 3 лет назад
Родитель
Сommit
a2b949e903
5 измененных файлов с 1116 добавлено и 1003 удалено
  1. 1067 1002
      api/user/user.pb.go
  2. 6 0
      api/user/user.proto
  3. 38 0
      api/user/user_grpc.pb.go
  4. 1 1
      js/api/user/user_http_pb.ts
  5. 4 0
      js/api/user/user_pb.ts

Разница между файлами не показана из-за своего большого размера
+ 1067 - 1002
api/user/user.pb.go


+ 6 - 0
api/user/user.proto

@@ -619,6 +619,12 @@ service User {
   rpc UpdateUserMatchedNumAndReturnUserMsg (UpdateUserMatchedNumRequest) returns (UpdateUserMatchedNumAndReturnUserMsgReply){};
   // 获取未匹配的离线用户
   rpc GetRecommendUserDB(GetRecommendUserDBRequest) returns(common.PersonDB){}
+  // 举报超过3次拉黑用户
+  rpc ReportUserBlack (ReportUserBlackRequest) returns (google.protobuf.Empty){};
+}
+message ReportUserBlackRequest{
+  string personId = 1;
+  string result = 2;
 }
 
 message SendMessageRequest{

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

@@ -221,6 +221,8 @@ type UserClient interface {
 	UpdateUserMatchedNumAndReturnUserMsg(ctx context.Context, in *UpdateUserMatchedNumRequest, opts ...grpc.CallOption) (*UpdateUserMatchedNumAndReturnUserMsgReply, error)
 	// 获取未匹配的离线用户
 	GetRecommendUserDB(ctx context.Context, in *GetRecommendUserDBRequest, opts ...grpc.CallOption) (*common.PersonDB, error)
+	// 举报超过3次拉黑用户
+	ReportUserBlack(ctx context.Context, in *ReportUserBlackRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type userClient struct {
@@ -1104,6 +1106,15 @@ func (c *userClient) GetRecommendUserDB(ctx context.Context, in *GetRecommendUse
 	return out, nil
 }
 
+func (c *userClient) ReportUserBlack(ctx context.Context, in *ReportUserBlackRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.user.User/ReportUserBlack", 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
@@ -1307,6 +1318,8 @@ type UserServer interface {
 	UpdateUserMatchedNumAndReturnUserMsg(context.Context, *UpdateUserMatchedNumRequest) (*UpdateUserMatchedNumAndReturnUserMsgReply, error)
 	// 获取未匹配的离线用户
 	GetRecommendUserDB(context.Context, *GetRecommendUserDBRequest) (*common.PersonDB, error)
+	// 举报超过3次拉黑用户
+	ReportUserBlack(context.Context, *ReportUserBlackRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -1605,6 +1618,9 @@ func (UnimplementedUserServer) UpdateUserMatchedNumAndReturnUserMsg(context.Cont
 func (UnimplementedUserServer) GetRecommendUserDB(context.Context, *GetRecommendUserDBRequest) (*common.PersonDB, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetRecommendUserDB not implemented")
 }
+func (UnimplementedUserServer) ReportUserBlack(context.Context, *ReportUserBlackRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ReportUserBlack not implemented")
+}
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 
 // UnsafeUserServer may be embedded to opt out of forward compatibility for this service.
@@ -3364,6 +3380,24 @@ func _User_GetRecommendUserDB_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_ReportUserBlack_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ReportUserBlackRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).ReportUserBlack(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/ReportUserBlack",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).ReportUserBlack(ctx, req.(*ReportUserBlackRequest))
+	}
+	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)
@@ -3759,6 +3793,10 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "GetRecommendUserDB",
 			Handler:    _User_GetRecommendUserDB_Handler,
 		},
+		{
+			MethodName: "ReportUserBlack",
+			Handler:    _User_ReportUserBlack_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "user.proto",

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

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendMessageRequest,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest} from "./user_pb";
+import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendMessageRequest,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest} from "./user_pb";
 import {SendPhoneCodeRequest,CheckPhoneCodeRequest,UpdateInformationRequest,CreateChatRoomParam,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,ChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,PartnerIDParam,AddFriendMessageInfo,ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,PersonIDParam,PersonIDList,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,PersonMsg,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,IDParam,PersonDB} from "../common/common_pb";
 import {RoomReply,UnreadNumReply,UserRoomInfo,CheckUserPartnerIsRelationshipReply,WindowInfo,GetRandomMatchingReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";

+ 4 - 0
js/api/user/user_pb.ts

@@ -1,5 +1,9 @@
 import {Message} from "../common/common_pb";
 
+export interface ReportUserBlackRequest{
+    personId?:string;
+    result?:string;
+}
 export interface SendMessageRequest{
     /**  房间ID */
     roomId?:number;

Некоторые файлы не были показаны из-за большого количества измененных файлов