wfz 3 jaren geleden
bovenliggende
commit
47139d1858

File diff suppressed because it is too large
+ 528 - 437
api/chat/chat.pb.go


+ 10 - 1
api/chat/chat.proto

@@ -64,7 +64,7 @@ service Chat {
   // 随机匹配接待员
   rpc GetMatchingPartnerInfo (common.SexReq) returns (common.GetMatchingPartnerInfoReply){};
   // 接待员收藏某条记录
-  rpc PartnerCollect (PartnerCollectRequest) returns (google.protobuf.Empty){};
+  rpc PartnerCollect (PartnerCollectIDsRequest) returns (google.protobuf.Empty){};
   // 接待员取消收藏某条记录
   rpc PartnerDeleteCollect (PartnerCollectRequest) returns (google.protobuf.Empty){};
   // 查询接待员在本房间的收藏列表
@@ -82,6 +82,15 @@ message UserUnlockRequest{
   string identifyId = 4;
 }
 
+message PartnerCollectIDsRequest{
+  repeated int64 chatRecordIds = 1;// 记录ID
+  string personId = 2;
+  string personType = 3;
+  string identifyId = 4;
+  int64 roomId = 5;// 房间ID
+}
+
+
 message PartnerCollectRequest{
   int64 chatRecordId = 1;// 记录ID
   string personId = 2;

+ 6 - 6
api/chat/chat_grpc.pb.go

@@ -72,7 +72,7 @@ type ChatClient interface {
 	// 随机匹配接待员
 	GetMatchingPartnerInfo(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.GetMatchingPartnerInfoReply, error)
 	// 接待员收藏某条记录
-	PartnerCollect(ctx context.Context, in *PartnerCollectRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	PartnerCollect(ctx context.Context, in *PartnerCollectIDsRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 接待员取消收藏某条记录
 	PartnerDeleteCollect(ctx context.Context, in *PartnerCollectRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 查询接待员在本房间的收藏列表
@@ -325,7 +325,7 @@ func (c *chatClient) GetMatchingPartnerInfo(ctx context.Context, in *common.SexR
 	return out, nil
 }
 
-func (c *chatClient) PartnerCollect(ctx context.Context, in *PartnerCollectRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+func (c *chatClient) PartnerCollect(ctx context.Context, in *PartnerCollectIDsRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/PartnerCollect", in, out, opts...)
 	if err != nil {
@@ -426,7 +426,7 @@ type ChatServer interface {
 	// 随机匹配接待员
 	GetMatchingPartnerInfo(context.Context, *common.SexReq) (*common.GetMatchingPartnerInfoReply, error)
 	// 接待员收藏某条记录
-	PartnerCollect(context.Context, *PartnerCollectRequest) (*emptypb.Empty, error)
+	PartnerCollect(context.Context, *PartnerCollectIDsRequest) (*emptypb.Empty, error)
 	// 接待员取消收藏某条记录
 	PartnerDeleteCollect(context.Context, *PartnerCollectRequest) (*emptypb.Empty, error)
 	// 查询接待员在本房间的收藏列表
@@ -520,7 +520,7 @@ func (UnimplementedChatServer) GetRandomMatching(context.Context, *common.Matchi
 func (UnimplementedChatServer) GetMatchingPartnerInfo(context.Context, *common.SexReq) (*common.GetMatchingPartnerInfoReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetMatchingPartnerInfo not implemented")
 }
-func (UnimplementedChatServer) PartnerCollect(context.Context, *PartnerCollectRequest) (*emptypb.Empty, error) {
+func (UnimplementedChatServer) PartnerCollect(context.Context, *PartnerCollectIDsRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PartnerCollect not implemented")
 }
 func (UnimplementedChatServer) PartnerDeleteCollect(context.Context, *PartnerCollectRequest) (*emptypb.Empty, error) {
@@ -1017,7 +1017,7 @@ func _Chat_GetMatchingPartnerInfo_Handler(srv interface{}, ctx context.Context,
 }
 
 func _Chat_PartnerCollect_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PartnerCollectRequest)
+	in := new(PartnerCollectIDsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1029,7 +1029,7 @@ func _Chat_PartnerCollect_Handler(srv interface{}, ctx context.Context, dec func
 		FullMethod: "/api.chat.Chat/PartnerCollect",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).PartnerCollect(ctx, req.(*PartnerCollectRequest))
+		return srv.(ChatServer).PartnerCollect(ctx, req.(*PartnerCollectIDsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }

File diff suppressed because it is too large
+ 662 - 601
api/partner/partner.pb.go


+ 6 - 1
api/partner/partner.proto

@@ -292,7 +292,7 @@ service Partner {
 
   // ---接待员专用---
   // 接待员收藏某条记录
-  rpc PartnerCollect (PartnerCollectRequest) returns (google.protobuf.Empty){
+  rpc PartnerCollect (PartnerCollectIDsRequest) returns (google.protobuf.Empty){
     option (google.api.http) = {
       post: "/api/partner/collect",
       body:"*"
@@ -404,6 +404,11 @@ service Partner {
   rpc GetPartnerCircleInfo (common.PartnerIDParam) returns (common.AddFriendMessageInfo);
 }
 
+message PartnerCollectIDsRequest{
+  repeated int64 chatRecordIds = 1;// 记录ID
+  int64 roomId = 2;// 房间ID
+}
+
 message PartnerCollectRequest{
   int64 chatRecordId = 1;// 记录ID
 }

+ 6 - 6
api/partner/partner_grpc.pb.go

@@ -100,7 +100,7 @@ type PartnerClient interface {
 	PartnerDeleteChat(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// ---接待员专用---
 	// 接待员收藏某条记录
-	PartnerCollect(ctx context.Context, in *PartnerCollectRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	PartnerCollect(ctx context.Context, in *PartnerCollectIDsRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 接待员取消收藏某条记录
 	PartnerDeleteCollect(ctx context.Context, in *PartnerCollectRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 查询接待员在本房间的收藏列表
@@ -494,7 +494,7 @@ func (c *partnerClient) PartnerDeleteChat(ctx context.Context, in *common.RoomID
 	return out, nil
 }
 
-func (c *partnerClient) PartnerCollect(ctx context.Context, in *PartnerCollectRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+func (c *partnerClient) PartnerCollect(ctx context.Context, in *PartnerCollectIDsRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/api.partner.Partner/PartnerCollect", in, out, opts...)
 	if err != nil {
@@ -765,7 +765,7 @@ type PartnerServer interface {
 	PartnerDeleteChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
 	// ---接待员专用---
 	// 接待员收藏某条记录
-	PartnerCollect(context.Context, *PartnerCollectRequest) (*emptypb.Empty, error)
+	PartnerCollect(context.Context, *PartnerCollectIDsRequest) (*emptypb.Empty, error)
 	// 接待员取消收藏某条记录
 	PartnerDeleteCollect(context.Context, *PartnerCollectRequest) (*emptypb.Empty, error)
 	// 查询接待员在本房间的收藏列表
@@ -928,7 +928,7 @@ func (UnimplementedPartnerServer) PersonReplyScrip(context.Context, *ReplyScripR
 func (UnimplementedPartnerServer) PartnerDeleteChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PartnerDeleteChat not implemented")
 }
-func (UnimplementedPartnerServer) PartnerCollect(context.Context, *PartnerCollectRequest) (*emptypb.Empty, error) {
+func (UnimplementedPartnerServer) PartnerCollect(context.Context, *PartnerCollectIDsRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PartnerCollect not implemented")
 }
 func (UnimplementedPartnerServer) PartnerDeleteCollect(context.Context, *PartnerCollectRequest) (*emptypb.Empty, error) {
@@ -1689,7 +1689,7 @@ func _Partner_PartnerDeleteChat_Handler(srv interface{}, ctx context.Context, de
 }
 
 func _Partner_PartnerCollect_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PartnerCollectRequest)
+	in := new(PartnerCollectIDsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1701,7 +1701,7 @@ func _Partner_PartnerCollect_Handler(srv interface{}, ctx context.Context, dec f
 		FullMethod: "/api.partner.Partner/PartnerCollect",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PartnerServer).PartnerCollect(ctx, req.(*PartnerCollectRequest))
+		return srv.(PartnerServer).PartnerCollect(ctx, req.(*PartnerCollectIDsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }

+ 5 - 5
api/partner/partner_http.pb.go

@@ -59,7 +59,7 @@ type PartnerHTTPServer interface {
 	GetPartnerLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
 	GetPartnerMessage(context.Context, *emptypb.Empty) (*PartnerMessage, error)
 	PartnerApplyWithdraw(context.Context, *PartnerApplyWithdrawRequest) (*emptypb.Empty, error)
-	PartnerCollect(context.Context, *PartnerCollectRequest) (*emptypb.Empty, error)
+	PartnerCollect(context.Context, *PartnerCollectIDsRequest) (*emptypb.Empty, error)
 	PartnerDeleteChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
 	PartnerDeleteCollect(context.Context, *PartnerCollectRequest) (*emptypb.Empty, error)
 	PartnerGetAward(context.Context, *PartnerGetAwardRequest) (*emptypb.Empty, error)
@@ -1166,7 +1166,7 @@ func _Partner_PartnerDeleteChat0_HTTP_Handler(srv PartnerHTTPServer) func(ctx ht
 
 func _Partner_PartnerCollect0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in PartnerCollectRequest
+		var in PartnerCollectIDsRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -1175,7 +1175,7 @@ func _Partner_PartnerCollect0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.
 		}
 		http.SetOperation(ctx, "/api.partner.Partner/PartnerCollect")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.PartnerCollect(ctx, req.(*PartnerCollectRequest))
+			return srv.PartnerCollect(ctx, req.(*PartnerCollectIDsRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -1545,7 +1545,7 @@ type PartnerHTTPClient interface {
 	GetPartnerLookNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *statistics.LookMessageReply, err error)
 	GetPartnerMessage(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *PartnerMessage, err error)
 	PartnerApplyWithdraw(ctx context.Context, req *PartnerApplyWithdrawRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
-	PartnerCollect(ctx context.Context, req *PartnerCollectRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
+	PartnerCollect(ctx context.Context, req *PartnerCollectIDsRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerDeleteChat(ctx context.Context, req *common.RoomIDRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerDeleteCollect(ctx context.Context, req *PartnerCollectRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerGetAward(ctx context.Context, req *PartnerGetAwardRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
@@ -1954,7 +1954,7 @@ func (c *PartnerHTTPClientImpl) PartnerApplyWithdraw(ctx context.Context, in *Pa
 	return &out, err
 }
 
-func (c *PartnerHTTPClientImpl) PartnerCollect(ctx context.Context, in *PartnerCollectRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
+func (c *PartnerHTTPClientImpl) PartnerCollect(ctx context.Context, in *PartnerCollectIDsRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
 	pattern := "/api/partner/collect"
 	path := binding.EncodeURL(pattern, in, false)

+ 9 - 0
js/api/chat/chat_pb.ts

@@ -5,6 +5,15 @@ export interface UserUnlockRequest{
     personType?:string;
     identifyId?:string;
 }
+export interface PartnerCollectIDsRequest{
+    /**  记录ID */
+    chatRecordIds?:Array<number>;
+    personId?:string;
+    personType?:string;
+    identifyId?:string;
+    /**  房间ID */
+    roomId?:number;
+}
 export interface PartnerCollectRequest{
     /**  记录ID */
     chatRecordId?:number;

+ 2 - 2
js/api/partner/partner_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {PartnerInfo,PartnerBalance,CreateScripRequest,ReplyScripRequest,PartnerCollectRequest,PartnerMessage,LevelTable,PartnerGetAwardRequest,PartnerUpdateWorkingStatusRequest,PartnerApplyWithdrawRequest,PartnerWithdrawTemplateListReply,PartnerWithdrawRecordListReply,PartnerDBBalance,AddPartnerBalanceRequest} from "./partner_pb";
+import {PartnerInfo,PartnerBalance,CreateScripRequest,ReplyScripRequest,PartnerCollectIDsRequest,PartnerCollectRequest,PartnerMessage,LevelTable,PartnerGetAwardRequest,PartnerUpdateWorkingStatusRequest,PartnerApplyWithdrawRequest,PartnerWithdrawTemplateListReply,PartnerWithdrawRecordListReply,PartnerDBBalance,AddPartnerBalanceRequest} from "./partner_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,PartnerChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripIdRequest,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,PersonIDParam,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,PartnerIDParam,AddFriendMessageInfo} from "../common/common_pb";
 import {RoomReply,PartnerFindRoomListReply,FindNotReplyNumReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookMessageReply} from "../statistics/statistics_pb";
@@ -198,7 +198,7 @@ const PartnerService = {
   },
   /**  ---接待员专用---
 // 接待员收藏某条记录 */
-  PartnerCollect: async (req?: PartnerCollectRequest) => {
+  PartnerCollect: async (req?: PartnerCollectIDsRequest) => {
 	const res = await request.post('/api/partner/collect', req);
     return res.data.data;
   },

+ 6 - 0
js/api/partner/partner_pb.ts

@@ -1,5 +1,11 @@
 import {Message} from "../common/common_pb";
 
+export interface PartnerCollectIDsRequest{
+    /**  记录ID */
+    chatRecordIds?:Array<number>;
+    /**  房间ID */
+    roomId?:number;
+}
 export interface PartnerCollectRequest{
     /**  记录ID */
     chatRecordId?:number;

Some files were not shown because too many files changed in this diff