wfz 3 жил өмнө
parent
commit
f61403364b

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 153 - 106
api/common/common.pb.go


+ 4 - 0
api/common/common.proto

@@ -186,6 +186,10 @@ message PersonDB{
   repeated int64 tagList = 14;// 标签列表
 }
 
+message ScripIdRequest {
+  int64 scripId = 1;// 纸条id
+}
+
 message ListPageRequest{
   int64 nextId = 1;
   int64 offset = 2;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 669 - 483
api/partner/partner.pb.go


+ 67 - 2
api/partner/partner.proto

@@ -217,8 +217,62 @@ service Partner {
       body:"*"
     };
   };
-
-
+  // 30、创建纸条
+  rpc CreateScrip (CreateScripRequest) returns (common.ScripID){
+    option (google.api.http) = {
+      post: "/api/partner/scrip/create",
+      body:"*"
+    };
+  };
+  // 31、删除纸条
+  rpc DeleteScrip (common.ScripIdRequest) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/partner/scrip/delete",
+      body:"*"
+    };
+  };
+  // 32、查询自己的小纸条
+  rpc FindMyScrip (common.ListPageRequest) returns (common.ScripReply){
+    option (google.api.http) = {
+      post: "/api/partner/scrip/find/self",
+      body:"*"
+    };
+  };
+  // 33、查询别人的小纸条
+  rpc FindOtherScrip (common.FindScripRequest) returns (common.ScripReply){
+    option (google.api.http) = {
+      post: "/api/partner/scrip/find/other",
+      body:"*"
+    };
+  };
+  // 34、查询随机纸条列表
+  rpc FindRecommendScrip (common.ListPageRequest) returns (common.ScripReply){
+    option (google.api.http) = {
+      post: "/api/partner/scrip/find/recommend",
+      body:"*"
+    };
+  };
+  // 35、用户查看纸条
+  rpc PersonLookScrip (common.ScripIdRequest) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/partner/scrip/look",
+      body:"*"
+    };
+  };
+  // 36、用户点击回看
+  rpc PersonClickLookBack (google.protobuf.Empty) returns (common.ScripInfo){
+    option (google.api.http) = {
+      post: "/api/partner/scrip/look/back",
+      body:"*"
+    };
+  };
+  // 37、用户回复小纸条
+  rpc PersonReplyScrip (ReplyScripRequest) returns (common.ChatRecordInfo){
+    option (google.api.http) = {
+      post: "/api/partner/scrip/reply",
+      body:"*"
+    };
+  };
 
   //  // 拉黑某人
   //  rpc PartnerSetBlackChat (common.RoomIDRequest) returns (google.protobuf.Empty){
@@ -321,6 +375,17 @@ service Partner {
   rpc GetPartnerCircleInfo (common.PartnerIDParam) returns (common.AddFriendMessageInfo);
 }
 
+message CreateScripRequest {
+  string text = 1;// 纸条内容
+  string pictureUrl = 2; // 纸条背景图
+}
+
+message ReplyScripRequest {
+  int64 scripId = 4;// 小纸条ID
+  common.Message message = 5;// 回复内容 只需要提供 回复小纸条的内容 或 回复小纸条的素材链接
+  string msgType = 6;
+}
+
 message PartnerWithdrawRecordListReply{
   int64 nextId = 1;
   repeated WithdrawInfo list = 2;

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

@@ -80,6 +80,22 @@ type PartnerClient interface {
 	FindOverSevenDayAvatar(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.FindOverSevenDayAvatarReply, error)
 	// 29、更新上次访问的小纸条
 	UpdateLastScripID(ctx context.Context, in *common.UpdateLastScripIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 30、创建纸条
+	CreateScrip(ctx context.Context, in *CreateScripRequest, opts ...grpc.CallOption) (*common.ScripID, error)
+	// 31、删除纸条
+	DeleteScrip(ctx context.Context, in *common.ScripIdRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 32、查询自己的小纸条
+	FindMyScrip(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
+	// 33、查询别人的小纸条
+	FindOtherScrip(ctx context.Context, in *common.FindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
+	// 34、查询随机纸条列表
+	FindRecommendScrip(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
+	// 35、用户查看纸条
+	PersonLookScrip(ctx context.Context, in *common.ScripIdRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 36、用户点击回看
+	PersonClickLookBack(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.ScripInfo, error)
+	// 37、用户回复小纸条
+	PersonReplyScrip(ctx context.Context, in *ReplyScripRequest, opts ...grpc.CallOption) (*common.ChatRecordInfo, error)
 	// ---接待员专用---
 	// 获取接待员的部分信息
 	GetPartnerMessage(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PartnerMessage, error)
@@ -389,6 +405,78 @@ func (c *partnerClient) UpdateLastScripID(ctx context.Context, in *common.Update
 	return out, nil
 }
 
+func (c *partnerClient) CreateScrip(ctx context.Context, in *CreateScripRequest, opts ...grpc.CallOption) (*common.ScripID, error) {
+	out := new(common.ScripID)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/CreateScrip", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *partnerClient) DeleteScrip(ctx context.Context, in *common.ScripIdRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/DeleteScrip", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *partnerClient) FindMyScrip(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*common.ScripReply, error) {
+	out := new(common.ScripReply)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindMyScrip", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *partnerClient) FindOtherScrip(ctx context.Context, in *common.FindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error) {
+	out := new(common.ScripReply)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindOtherScrip", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *partnerClient) FindRecommendScrip(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*common.ScripReply, error) {
+	out := new(common.ScripReply)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindRecommendScrip", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *partnerClient) PersonLookScrip(ctx context.Context, in *common.ScripIdRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/PersonLookScrip", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *partnerClient) PersonClickLookBack(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.ScripInfo, error) {
+	out := new(common.ScripInfo)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/PersonClickLookBack", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *partnerClient) PersonReplyScrip(ctx context.Context, in *ReplyScripRequest, opts ...grpc.CallOption) (*common.ChatRecordInfo, error) {
+	out := new(common.ChatRecordInfo)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/PersonReplyScrip", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *partnerClient) GetPartnerMessage(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PartnerMessage, error) {
 	out := new(PartnerMessage)
 	err := c.cc.Invoke(ctx, "/api.partner.Partner/GetPartnerMessage", in, out, opts...)
@@ -613,6 +701,22 @@ type PartnerServer interface {
 	FindOverSevenDayAvatar(context.Context, *emptypb.Empty) (*common.FindOverSevenDayAvatarReply, error)
 	// 29、更新上次访问的小纸条
 	UpdateLastScripID(context.Context, *common.UpdateLastScripIDRequest) (*emptypb.Empty, error)
+	// 30、创建纸条
+	CreateScrip(context.Context, *CreateScripRequest) (*common.ScripID, error)
+	// 31、删除纸条
+	DeleteScrip(context.Context, *common.ScripIdRequest) (*emptypb.Empty, error)
+	// 32、查询自己的小纸条
+	FindMyScrip(context.Context, *common.ListPageRequest) (*common.ScripReply, error)
+	// 33、查询别人的小纸条
+	FindOtherScrip(context.Context, *common.FindScripRequest) (*common.ScripReply, error)
+	// 34、查询随机纸条列表
+	FindRecommendScrip(context.Context, *common.ListPageRequest) (*common.ScripReply, error)
+	// 35、用户查看纸条
+	PersonLookScrip(context.Context, *common.ScripIdRequest) (*emptypb.Empty, error)
+	// 36、用户点击回看
+	PersonClickLookBack(context.Context, *emptypb.Empty) (*common.ScripInfo, error)
+	// 37、用户回复小纸条
+	PersonReplyScrip(context.Context, *ReplyScripRequest) (*common.ChatRecordInfo, error)
 	// ---接待员专用---
 	// 获取接待员的部分信息
 	GetPartnerMessage(context.Context, *emptypb.Empty) (*PartnerMessage, error)
@@ -745,6 +849,30 @@ func (UnimplementedPartnerServer) FindOverSevenDayAvatar(context.Context, *empty
 func (UnimplementedPartnerServer) UpdateLastScripID(context.Context, *common.UpdateLastScripIDRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateLastScripID not implemented")
 }
+func (UnimplementedPartnerServer) CreateScrip(context.Context, *CreateScripRequest) (*common.ScripID, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CreateScrip not implemented")
+}
+func (UnimplementedPartnerServer) DeleteScrip(context.Context, *common.ScripIdRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeleteScrip not implemented")
+}
+func (UnimplementedPartnerServer) FindMyScrip(context.Context, *common.ListPageRequest) (*common.ScripReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindMyScrip not implemented")
+}
+func (UnimplementedPartnerServer) FindOtherScrip(context.Context, *common.FindScripRequest) (*common.ScripReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindOtherScrip not implemented")
+}
+func (UnimplementedPartnerServer) FindRecommendScrip(context.Context, *common.ListPageRequest) (*common.ScripReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindRecommendScrip not implemented")
+}
+func (UnimplementedPartnerServer) PersonLookScrip(context.Context, *common.ScripIdRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PersonLookScrip not implemented")
+}
+func (UnimplementedPartnerServer) PersonClickLookBack(context.Context, *emptypb.Empty) (*common.ScripInfo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PersonClickLookBack not implemented")
+}
+func (UnimplementedPartnerServer) PersonReplyScrip(context.Context, *ReplyScripRequest) (*common.ChatRecordInfo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PersonReplyScrip not implemented")
+}
 func (UnimplementedPartnerServer) GetPartnerMessage(context.Context, *emptypb.Empty) (*PartnerMessage, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerMessage not implemented")
 }
@@ -1334,6 +1462,150 @@ func _Partner_UpdateLastScripID_Handler(srv interface{}, ctx context.Context, de
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Partner_CreateScrip_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateScripRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).CreateScrip(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/CreateScrip",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).CreateScrip(ctx, req.(*CreateScripRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Partner_DeleteScrip_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ScripIdRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).DeleteScrip(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/DeleteScrip",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).DeleteScrip(ctx, req.(*common.ScripIdRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Partner_FindMyScrip_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ListPageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).FindMyScrip(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/FindMyScrip",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).FindMyScrip(ctx, req.(*common.ListPageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Partner_FindOtherScrip_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.FindScripRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).FindOtherScrip(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/FindOtherScrip",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).FindOtherScrip(ctx, req.(*common.FindScripRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Partner_FindRecommendScrip_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ListPageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).FindRecommendScrip(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/FindRecommendScrip",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).FindRecommendScrip(ctx, req.(*common.ListPageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Partner_PersonLookScrip_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ScripIdRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).PersonLookScrip(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/PersonLookScrip",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).PersonLookScrip(ctx, req.(*common.ScripIdRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Partner_PersonClickLookBack_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(emptypb.Empty)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).PersonClickLookBack(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/PersonClickLookBack",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).PersonClickLookBack(ctx, req.(*emptypb.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Partner_PersonReplyScrip_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ReplyScripRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).PersonReplyScrip(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/PersonReplyScrip",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).PersonReplyScrip(ctx, req.(*ReplyScripRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Partner_GetPartnerMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
@@ -1781,6 +2053,38 @@ var Partner_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UpdateLastScripID",
 			Handler:    _Partner_UpdateLastScripID_Handler,
 		},
+		{
+			MethodName: "CreateScrip",
+			Handler:    _Partner_CreateScrip_Handler,
+		},
+		{
+			MethodName: "DeleteScrip",
+			Handler:    _Partner_DeleteScrip_Handler,
+		},
+		{
+			MethodName: "FindMyScrip",
+			Handler:    _Partner_FindMyScrip_Handler,
+		},
+		{
+			MethodName: "FindOtherScrip",
+			Handler:    _Partner_FindOtherScrip_Handler,
+		},
+		{
+			MethodName: "FindRecommendScrip",
+			Handler:    _Partner_FindRecommendScrip_Handler,
+		},
+		{
+			MethodName: "PersonLookScrip",
+			Handler:    _Partner_PersonLookScrip_Handler,
+		},
+		{
+			MethodName: "PersonClickLookBack",
+			Handler:    _Partner_PersonClickLookBack_Handler,
+		},
+		{
+			MethodName: "PersonReplyScrip",
+			Handler:    _Partner_PersonReplyScrip_Handler,
+		},
 		{
 			MethodName: "GetPartnerMessage",
 			Handler:    _Partner_GetPartnerMessage_Handler,

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

@@ -31,7 +31,9 @@ const _ = http.SupportPackageIsVersion1
 
 type PartnerHTTPServer interface {
 	CheckPhoneCode(context.Context, *common.CheckPhoneCodeRequest) (*emptypb.Empty, error)
+	CreateScrip(context.Context, *CreateScripRequest) (*common.ScripID, error)
 	CreateUserPartnerRoom(context.Context, *common.CreateChatRoomParam) (*chat.RoomReply, error)
+	DeleteScrip(context.Context, *common.ScripIdRequest) (*emptypb.Empty, error)
 	FindChatRecordList(context.Context, *common.FindChatRecordListRequest) (*common.ChatRecordListReply, error)
 	FindChatRoomMsg(context.Context, *common.FindChatRoomMsgRequest) (*common.ChatRoomMsg, error)
 	FindChatTopic(context.Context, *common.FindChatTopicRequest) (*common.ChatTopicList, error)
@@ -39,10 +41,13 @@ type PartnerHTTPServer interface {
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error)
 	FindMemeTitle(context.Context, *emptypb.Empty) (*common.MemeTitleList, error)
+	FindMyScrip(context.Context, *common.ListPageRequest) (*common.ScripReply, error)
 	FindNotReplyNum(context.Context, *emptypb.Empty) (*chat.FindNotReplyNumReply, error)
 	FindOnlineList(context.Context, *common.ListPage2Request) (*common.RecommendPersonListReply, error)
+	FindOtherScrip(context.Context, *common.FindScripRequest) (*common.ScripReply, error)
 	FindOverSevenDayAvatar(context.Context, *emptypb.Empty) (*common.FindOverSevenDayAvatarReply, error)
 	FindOverSevenDayRoomList(context.Context, *common.ListPageRequest) (*chat.PartnerFindRoomListReply, error)
+	FindRecommendScrip(context.Context, *common.ListPageRequest) (*common.ScripReply, error)
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	FindUnReplyRoomList(context.Context, *common.ListPageRequest) (*chat.PartnerFindRoomListReply, error)
 	FindWithinSevenDayRoomList(context.Context, *common.ListPageRequest) (*chat.PartnerFindRoomListReply, error)
@@ -62,6 +67,9 @@ type PartnerHTTPServer interface {
 	PartnerUpdateWorkingStatus(context.Context, *PartnerUpdateWorkingStatusRequest) (*emptypb.Empty, error)
 	PartnerWithdrawRecordList(context.Context, *common.ListPageRequest) (*PartnerWithdrawRecordListReply, error)
 	PartnerWithdrawTemplateList(context.Context, *emptypb.Empty) (*PartnerWithdrawTemplateListReply, error)
+	PersonClickLookBack(context.Context, *emptypb.Empty) (*common.ScripInfo, error)
+	PersonLookScrip(context.Context, *common.ScripIdRequest) (*emptypb.Empty, error)
+	PersonReplyScrip(context.Context, *ReplyScripRequest) (*common.ChatRecordInfo, 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)
@@ -102,6 +110,14 @@ func RegisterPartnerHTTPServer(s *http.Server, srv PartnerHTTPServer) {
 	r.POST("/api/partner/report", _Partner_Report0_HTTP_Handler(srv))
 	r.POST("/api/partner/over/avatar/list", _Partner_FindOverSevenDayAvatar0_HTTP_Handler(srv))
 	r.POST("/api/partner/scrip/last/update", _Partner_UpdateLastScripID0_HTTP_Handler(srv))
+	r.POST("/api/partner/scrip/create", _Partner_CreateScrip0_HTTP_Handler(srv))
+	r.POST("/api/partner/scrip/delete", _Partner_DeleteScrip0_HTTP_Handler(srv))
+	r.POST("/api/partner/scrip/find/self", _Partner_FindMyScrip0_HTTP_Handler(srv))
+	r.POST("/api/partner/scrip/find/other", _Partner_FindOtherScrip0_HTTP_Handler(srv))
+	r.POST("/api/partner/scrip/find/recommend", _Partner_FindRecommendScrip0_HTTP_Handler(srv))
+	r.POST("/api/partner/scrip/look", _Partner_PersonLookScrip0_HTTP_Handler(srv))
+	r.POST("/api/partner/scrip/look/back", _Partner_PersonClickLookBack0_HTTP_Handler(srv))
+	r.POST("/api/partner/scrip/reply", _Partner_PersonReplyScrip0_HTTP_Handler(srv))
 	r.POST("/api/partner/message", _Partner_GetPartnerMessage0_HTTP_Handler(srv))
 	r.POST("/api/partner/num/look", _Partner_GetPartnerLookNum0_HTTP_Handler(srv))
 	r.POST("/api/partner/list/chat/unreply", _Partner_FindUnReplyRoomList0_HTTP_Handler(srv))
@@ -897,6 +913,222 @@ func _Partner_UpdateLastScripID0_HTTP_Handler(srv PartnerHTTPServer) func(ctx ht
 	}
 }
 
+func _Partner_CreateScrip0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in CreateScripRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/CreateScrip")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.CreateScrip(ctx, req.(*CreateScripRequest))
+		})
+		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)
+	}
+}
+
+func _Partner_DeleteScrip0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.ScripIdRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/DeleteScrip")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.DeleteScrip(ctx, req.(*common.ScripIdRequest))
+		})
+		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)
+	}
+}
+
+func _Partner_FindMyScrip0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.ListPageRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/FindMyScrip")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.FindMyScrip(ctx, req.(*common.ListPageRequest))
+		})
+		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)
+	}
+}
+
+func _Partner_FindOtherScrip0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.FindScripRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/FindOtherScrip")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.FindOtherScrip(ctx, req.(*common.FindScripRequest))
+		})
+		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)
+	}
+}
+
+func _Partner_FindRecommendScrip0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.ListPageRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/FindRecommendScrip")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.FindRecommendScrip(ctx, req.(*common.ListPageRequest))
+		})
+		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)
+	}
+}
+
+func _Partner_PersonLookScrip0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.ScripIdRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/PersonLookScrip")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.PersonLookScrip(ctx, req.(*common.ScripIdRequest))
+		})
+		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)
+	}
+}
+
+func _Partner_PersonClickLookBack0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in emptypb.Empty
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/PersonClickLookBack")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.PersonClickLookBack(ctx, req.(*emptypb.Empty))
+		})
+		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)
+	}
+}
+
+func _Partner_PersonReplyScrip0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in ReplyScripRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/PersonReplyScrip")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.PersonReplyScrip(ctx, req.(*ReplyScripRequest))
+		})
+		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)
+	}
+}
+
 func _Partner_GetPartnerMessage0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
 		var in emptypb.Empty
@@ -1169,7 +1401,9 @@ func _Partner_PartnerWithdrawRecordList0_HTTP_Handler(srv PartnerHTTPServer) fun
 
 type PartnerHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
+	CreateScrip(ctx context.Context, req *CreateScripRequest, opts ...http.CallOption) (rsp *common.ScripID, err error)
 	CreateUserPartnerRoom(ctx context.Context, req *common.CreateChatRoomParam, opts ...http.CallOption) (rsp *chat.RoomReply, err error)
+	DeleteScrip(ctx context.Context, req *common.ScripIdRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	FindChatRecordList(ctx context.Context, req *common.FindChatRecordListRequest, opts ...http.CallOption) (rsp *common.ChatRecordListReply, err error)
 	FindChatRoomMsg(ctx context.Context, req *common.FindChatRoomMsgRequest, opts ...http.CallOption) (rsp *common.ChatRoomMsg, err error)
 	FindChatTopic(ctx context.Context, req *common.FindChatTopicRequest, opts ...http.CallOption) (rsp *common.ChatTopicList, err error)
@@ -1177,10 +1411,13 @@ type PartnerHTTPClient interface {
 	FindLookList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
 	FindMemeByType(ctx context.Context, req *common.MemeRequest, opts ...http.CallOption) (rsp *common.MemeList, err error)
 	FindMemeTitle(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *common.MemeTitleList, err error)
+	FindMyScrip(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *common.ScripReply, err error)
 	FindNotReplyNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *chat.FindNotReplyNumReply, err error)
 	FindOnlineList(ctx context.Context, req *common.ListPage2Request, opts ...http.CallOption) (rsp *common.RecommendPersonListReply, err error)
+	FindOtherScrip(ctx context.Context, req *common.FindScripRequest, opts ...http.CallOption) (rsp *common.ScripReply, err error)
 	FindOverSevenDayAvatar(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *common.FindOverSevenDayAvatarReply, err error)
 	FindOverSevenDayRoomList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *chat.PartnerFindRoomListReply, err error)
+	FindRecommendScrip(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *common.ScripReply, err error)
 	FindTagListBySex(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *common.TagListReply, err error)
 	FindUnReplyRoomList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *chat.PartnerFindRoomListReply, err error)
 	FindWithinSevenDayRoomList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *chat.PartnerFindRoomListReply, err error)
@@ -1200,6 +1437,9 @@ type PartnerHTTPClient interface {
 	PartnerUpdateWorkingStatus(ctx context.Context, req *PartnerUpdateWorkingStatusRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerWithdrawRecordList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *PartnerWithdrawRecordListReply, err error)
 	PartnerWithdrawTemplateList(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *PartnerWithdrawTemplateListReply, err error)
+	PersonClickLookBack(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *common.ScripInfo, err error)
+	PersonLookScrip(ctx context.Context, req *common.ScripIdRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
+	PersonReplyScrip(ctx context.Context, req *ReplyScripRequest, opts ...http.CallOption) (rsp *common.ChatRecordInfo, 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)
@@ -1230,6 +1470,19 @@ func (c *PartnerHTTPClientImpl) CheckPhoneCode(ctx context.Context, in *common.C
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) CreateScrip(ctx context.Context, in *CreateScripRequest, opts ...http.CallOption) (*common.ScripID, error) {
+	var out common.ScripID
+	pattern := "/api/partner/scrip/create"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/CreateScrip"))
+	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) CreateUserPartnerRoom(ctx context.Context, in *common.CreateChatRoomParam, opts ...http.CallOption) (*chat.RoomReply, error) {
 	var out chat.RoomReply
 	pattern := "/api/partner/create/room"
@@ -1243,6 +1496,19 @@ func (c *PartnerHTTPClientImpl) CreateUserPartnerRoom(ctx context.Context, in *c
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) DeleteScrip(ctx context.Context, in *common.ScripIdRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
+	var out emptypb.Empty
+	pattern := "/api/partner/scrip/delete"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/DeleteScrip"))
+	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) FindChatRecordList(ctx context.Context, in *common.FindChatRecordListRequest, opts ...http.CallOption) (*common.ChatRecordListReply, error) {
 	var out common.ChatRecordListReply
 	pattern := "/api/partner/chat/record"
@@ -1334,6 +1600,19 @@ func (c *PartnerHTTPClientImpl) FindMemeTitle(ctx context.Context, in *emptypb.E
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) FindMyScrip(ctx context.Context, in *common.ListPageRequest, opts ...http.CallOption) (*common.ScripReply, error) {
+	var out common.ScripReply
+	pattern := "/api/partner/scrip/find/self"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/FindMyScrip"))
+	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) FindNotReplyNum(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*chat.FindNotReplyNumReply, error) {
 	var out chat.FindNotReplyNumReply
 	pattern := "/api/partner/chat/unreply/num"
@@ -1360,6 +1639,19 @@ func (c *PartnerHTTPClientImpl) FindOnlineList(ctx context.Context, in *common.L
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) FindOtherScrip(ctx context.Context, in *common.FindScripRequest, opts ...http.CallOption) (*common.ScripReply, error) {
+	var out common.ScripReply
+	pattern := "/api/partner/scrip/find/other"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/FindOtherScrip"))
+	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) FindOverSevenDayAvatar(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*common.FindOverSevenDayAvatarReply, error) {
 	var out common.FindOverSevenDayAvatarReply
 	pattern := "/api/partner/over/avatar/list"
@@ -1386,6 +1678,19 @@ func (c *PartnerHTTPClientImpl) FindOverSevenDayRoomList(ctx context.Context, in
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) FindRecommendScrip(ctx context.Context, in *common.ListPageRequest, opts ...http.CallOption) (*common.ScripReply, error) {
+	var out common.ScripReply
+	pattern := "/api/partner/scrip/find/recommend"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/FindRecommendScrip"))
+	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) FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...http.CallOption) (*common.TagListReply, error) {
 	var out common.TagListReply
 	pattern := "/api/partner/list/tag"
@@ -1633,6 +1938,45 @@ func (c *PartnerHTTPClientImpl) PartnerWithdrawTemplateList(ctx context.Context,
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) PersonClickLookBack(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*common.ScripInfo, error) {
+	var out common.ScripInfo
+	pattern := "/api/partner/scrip/look/back"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/PersonClickLookBack"))
+	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) PersonLookScrip(ctx context.Context, in *common.ScripIdRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
+	var out emptypb.Empty
+	pattern := "/api/partner/scrip/look"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/PersonLookScrip"))
+	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) PersonReplyScrip(ctx context.Context, in *ReplyScripRequest, opts ...http.CallOption) (*common.ChatRecordInfo, error) {
+	var out common.ChatRecordInfo
+	pattern := "/api/partner/scrip/reply"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/PersonReplyScrip"))
+	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) RandomMeme(ctx context.Context, in *common.RandomNum, opts ...http.CallOption) (*common.CommonTextList, error) {
 	var out common.CommonTextList
 	pattern := "/api/partner/find/meme/random"

+ 86 - 86
api/user/user.pb.go

@@ -1942,74 +1942,74 @@ var file_user_proto_rawDesc = []byte{
 	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74,
 	0x79, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x22, 0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f,
 	0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x6c, 0x61, 0x73, 0x74, 0x2f,
-	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x65, 0x0a, 0x10, 0x55, 0x73, 0x65,
-	0x72, 0x53, 0x65, 0x74, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x43, 0x68, 0x61, 0x74, 0x12, 0x19, 0x2e,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x63, 0x0a, 0x0b, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75,
+	0x73, 0x65, 0x72, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x49, 0x44, 0x22, 0x21, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x1b, 0x22, 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x66,
+	0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1c, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53,
+	0x63, 0x72, 0x69, 0x70, 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, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x22, 0x16, 0x2f, 0x61, 0x70,
+	0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x64, 0x65, 0x6c,
+	0x65, 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x6b, 0x0a, 0x0b, 0x46, 0x69, 0x6e, 0x64, 0x4d, 0x79,
+	0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72,
+	0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x24, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72,
+	0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x73, 0x65, 0x6c, 0x66,
+	0x3a, 0x01, 0x2a, 0x12, 0x6d, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x74, 0x68, 0x65, 0x72,
+	0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x25, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x1f, 0x22, 0x1a, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x3a,
+	0x01, 0x2a, 0x12, 0x77, 0x0a, 0x12, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d,
+	0x65, 0x6e, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75,
+	0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x63, 0x72, 0x69,
+	0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79,
+	0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75,
+	0x73, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x72,
+	0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x3a, 0x01, 0x2a, 0x12, 0x6c, 0x0a, 0x0f, 0x50,
+	0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x20,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e,
+	0x4c, 0x6f, 0x6f, 0x6b, 0x53, 0x63, 0x72, 0x69, 0x70, 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, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19,
+	0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x2f, 0x6c, 0x6f, 0x6f, 0x6b, 0x3a, 0x01, 0x2a, 0x12, 0x6a, 0x0a, 0x13, 0x50, 0x65, 0x72,
+	0x73, 0x6f, 0x6e, 0x43, 0x6c, 0x69, 0x63, 0x6b, 0x4c, 0x6f, 0x6f, 0x6b, 0x42, 0x61, 0x63, 0x6b,
+	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, 0x15, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x22,
+	0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73,
+	0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x6c, 0x6f, 0x6f, 0x6b, 0x2f, 0x62, 0x61,
+	0x63, 0x6b, 0x3a, 0x01, 0x2a, 0x12, 0x6d, 0x0a, 0x10, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x52,
+	0x65, 0x70, 0x6c, 0x79, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1b, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x75, 0x73, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x49, 0x6e,
+	0x66, 0x6f, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70, 0x69,
+	0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x72, 0x65, 0x70, 0x6c,
+	0x79, 0x3a, 0x01, 0x2a, 0x12, 0x65, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x42,
+	0x6c, 0x61, 0x63, 0x6b, 0x43, 0x68, 0x61, 0x74, 0x12, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x44, 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, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73,
+	0x65, 0x74, 0x2f, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x3a, 0x01, 0x2a, 0x12, 0x65, 0x0a, 0x0e, 0x55,
+	0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x12, 0x19, 0x2e,
 	0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x49,
 	0x44, 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, 0x75,
-	0x73, 0x65, 0x72, 0x2f, 0x73, 0x65, 0x74, 0x2f, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x3a, 0x01, 0x2a,
-	0x12, 0x65, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x68,
-	0x61, 0x74, 0x12, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
-	0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x44, 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, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f,
-	0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x2f, 0x64, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x63, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65,
-	0x72, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x49, 0x44, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x1b, 0x22, 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x66, 0x0a, 0x0b,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1c, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x63, 0x72,
-	0x69, 0x70, 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, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x22, 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x64, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x3a, 0x01, 0x2a, 0x12, 0x6b, 0x0a, 0x0b, 0x46, 0x69, 0x6e, 0x64, 0x4d, 0x79, 0x53, 0x63,
-	0x72, 0x69, 0x70, 0x12, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55,
-	0x73, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x24, 0x82, 0xd3, 0xe4,
-	0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x73, 0x65, 0x6c, 0x66, 0x3a, 0x01,
-	0x2a, 0x12, 0x6d, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x53, 0x63,
-	0x72, 0x69, 0x70, 0x12, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x2e, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53,
-	0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x1f, 0x22, 0x1a, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x3a, 0x01, 0x2a,
-	0x12, 0x77, 0x0a, 0x12, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
-	0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65,
-	0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x29,
-	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65,
-	0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x72, 0x65, 0x63,
-	0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x3a, 0x01, 0x2a, 0x12, 0x6c, 0x0a, 0x0f, 0x50, 0x65, 0x72,
-	0x73, 0x6f, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x20, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x6f,
-	0x6f, 0x6b, 0x53, 0x63, 0x72, 0x69, 0x70, 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, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x22, 0x14,
-	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f,
-	0x6c, 0x6f, 0x6f, 0x6b, 0x3a, 0x01, 0x2a, 0x12, 0x6a, 0x0a, 0x13, 0x50, 0x65, 0x72, 0x73, 0x6f,
-	0x6e, 0x43, 0x6c, 0x69, 0x63, 0x6b, 0x4c, 0x6f, 0x6f, 0x6b, 0x42, 0x61, 0x63, 0x6b, 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, 0x15, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x24, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72,
-	0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x6c, 0x6f, 0x6f, 0x6b, 0x2f, 0x62, 0x61, 0x63, 0x6b,
-	0x3a, 0x01, 0x2a, 0x12, 0x6d, 0x0a, 0x10, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x52, 0x65, 0x70,
-	0x6c, 0x79, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73,
-	0x65, 0x72, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f,
 	0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75,
-	0x73, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x72, 0x65, 0x70, 0x6c, 0x79, 0x3a,
+	0x73, 0x65, 0x72, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x2f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x3a,
 	0x01, 0x2a, 0x12, 0x94, 0x01, 0x0a, 0x1e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72,
 	0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
@@ -2261,8 +2261,8 @@ var file_user_proto_goTypes = []interface{}{
 	(*common.RandomNumAndSex)(nil),                   // 40: api.common.RandomNumAndSex
 	(*common.ReportChatRequest)(nil),                 // 41: api.common.ReportChatRequest
 	(*common.UpdateLastScripIDRequest)(nil),          // 42: api.common.UpdateLastScripIDRequest
-	(*common.RoomIDRequest)(nil),                     // 43: api.common.RoomIDRequest
-	(*common.FindScripRequest)(nil),                  // 44: api.common.FindScripRequest
+	(*common.FindScripRequest)(nil),                  // 43: api.common.FindScripRequest
+	(*common.RoomIDRequest)(nil),                     // 44: api.common.RoomIDRequest
 	(*common.PartnerIDParam)(nil),                    // 45: api.common.PartnerIDParam
 	(*common.PersonIDParam)(nil),                     // 46: api.common.PersonIDParam
 	(*common.PersonIDList)(nil),                      // 47: api.common.PersonIDList
@@ -2332,16 +2332,16 @@ var file_user_proto_depIdxs = []int32{
 	41, // 31: api.user.User.Report:input_type -> api.common.ReportChatRequest
 	25, // 32: api.user.User.FindOverSevenDayAvatar:input_type -> google.protobuf.Empty
 	42, // 33: api.user.User.UpdateLastScripID:input_type -> api.common.UpdateLastScripIDRequest
-	43, // 34: api.user.User.UserSetBlackChat:input_type -> api.common.RoomIDRequest
-	43, // 35: api.user.User.UserDeleteChat:input_type -> api.common.RoomIDRequest
-	5,  // 36: api.user.User.CreateScrip:input_type -> api.user.CreateScripRequest
-	4,  // 37: api.user.User.DeleteScrip:input_type -> api.user.DeleteScripRequest
-	3,  // 38: api.user.User.FindMyScrip:input_type -> api.user.UserFindScripRequest
-	44, // 39: api.user.User.FindOtherScrip:input_type -> api.common.FindScripRequest
-	3,  // 40: api.user.User.FindRecommendScrip:input_type -> api.user.UserFindScripRequest
-	2,  // 41: api.user.User.PersonLookScrip:input_type -> api.user.PersonLookScripRequest
-	25, // 42: api.user.User.PersonClickLookBack:input_type -> google.protobuf.Empty
-	1,  // 43: api.user.User.PersonReplyScrip:input_type -> api.user.ReplyScripRequest
+	5,  // 34: api.user.User.CreateScrip:input_type -> api.user.CreateScripRequest
+	4,  // 35: api.user.User.DeleteScrip:input_type -> api.user.DeleteScripRequest
+	3,  // 36: api.user.User.FindMyScrip:input_type -> api.user.UserFindScripRequest
+	43, // 37: api.user.User.FindOtherScrip:input_type -> api.common.FindScripRequest
+	3,  // 38: api.user.User.FindRecommendScrip:input_type -> api.user.UserFindScripRequest
+	2,  // 39: api.user.User.PersonLookScrip:input_type -> api.user.PersonLookScripRequest
+	25, // 40: api.user.User.PersonClickLookBack:input_type -> google.protobuf.Empty
+	1,  // 41: api.user.User.PersonReplyScrip:input_type -> api.user.ReplyScripRequest
+	44, // 42: api.user.User.UserSetBlackChat:input_type -> api.common.RoomIDRequest
+	44, // 43: api.user.User.UserDeleteChat:input_type -> api.common.RoomIDRequest
 	45, // 44: api.user.User.CheckUserPartnerIsRelationship:input_type -> api.common.PartnerIDParam
 	16, // 45: api.user.User.GetPartnerCircleInfo:input_type -> api.user.KeyRequest
 	31, // 46: api.user.User.FindLikeList:input_type -> api.common.ListPageRequest
@@ -2401,16 +2401,16 @@ var file_user_proto_depIdxs = []int32{
 	25, // 100: api.user.User.Report:output_type -> google.protobuf.Empty
 	65, // 101: api.user.User.FindOverSevenDayAvatar:output_type -> api.common.FindOverSevenDayAvatarReply
 	25, // 102: api.user.User.UpdateLastScripID:output_type -> google.protobuf.Empty
-	25, // 103: api.user.User.UserSetBlackChat:output_type -> google.protobuf.Empty
-	25, // 104: api.user.User.UserDeleteChat:output_type -> google.protobuf.Empty
-	66, // 105: api.user.User.CreateScrip:output_type -> api.common.ScripID
-	25, // 106: api.user.User.DeleteScrip:output_type -> google.protobuf.Empty
-	67, // 107: api.user.User.FindMyScrip:output_type -> api.common.ScripReply
-	67, // 108: api.user.User.FindOtherScrip:output_type -> api.common.ScripReply
-	67, // 109: api.user.User.FindRecommendScrip:output_type -> api.common.ScripReply
-	25, // 110: api.user.User.PersonLookScrip:output_type -> google.protobuf.Empty
-	68, // 111: api.user.User.PersonClickLookBack:output_type -> api.common.ScripInfo
-	69, // 112: api.user.User.PersonReplyScrip:output_type -> api.common.ChatRecordInfo
+	66, // 103: api.user.User.CreateScrip:output_type -> api.common.ScripID
+	25, // 104: api.user.User.DeleteScrip:output_type -> google.protobuf.Empty
+	67, // 105: api.user.User.FindMyScrip:output_type -> api.common.ScripReply
+	67, // 106: api.user.User.FindOtherScrip:output_type -> api.common.ScripReply
+	67, // 107: api.user.User.FindRecommendScrip:output_type -> api.common.ScripReply
+	25, // 108: api.user.User.PersonLookScrip:output_type -> google.protobuf.Empty
+	68, // 109: api.user.User.PersonClickLookBack:output_type -> api.common.ScripInfo
+	69, // 110: api.user.User.PersonReplyScrip:output_type -> api.common.ChatRecordInfo
+	25, // 111: api.user.User.UserSetBlackChat:output_type -> google.protobuf.Empty
+	25, // 112: api.user.User.UserDeleteChat:output_type -> google.protobuf.Empty
 	70, // 113: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
 	71, // 114: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
 	53, // 115: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply

+ 25 - 25
api/user/user.proto

@@ -218,73 +218,56 @@ service User {
       body:"*"
     };
   };
-
-
-  // ---还未共用---
-  // 用户拉黑某人
-  rpc UserSetBlackChat (common.RoomIDRequest) returns (google.protobuf.Empty){
-    option (google.api.http) = {
-      post: "/api/user/set/black",
-      body:"*"
-    };
-  };
-  // 用户删除房间
-  rpc UserDeleteChat (common.RoomIDRequest) returns (google.protobuf.Empty){
-    option (google.api.http) = {
-      post: "/api/user/chat/delete",
-      body:"*"
-    };
-  };
-  // 创建纸条
+  // 30、创建纸条
   rpc CreateScrip (CreateScripRequest) returns (common.ScripID){
     option (google.api.http) = {
       post: "/api/user/scrip/create",
       body:"*"
     };
   };
-  // 删除纸条
+  // 31、删除纸条
   rpc DeleteScrip (DeleteScripRequest) returns (google.protobuf.Empty){
     option (google.api.http) = {
       post: "/api/user/scrip/delete",
       body:"*"
     };
   };
-  // 查询自己的小纸条
+  // 32、查询自己的小纸条
   rpc FindMyScrip (UserFindScripRequest) returns (common.ScripReply){
     option (google.api.http) = {
       post: "/api/user/scrip/find/self",
       body:"*"
     };
   };
-  // 查询别人的小纸条
+  // 33、查询别人的小纸条
   rpc FindOtherScrip (common.FindScripRequest) returns (common.ScripReply){
     option (google.api.http) = {
       post: "/api/user/scrip/find/other",
       body:"*"
     };
   };
-  // 查询随机纸条列表
+  // 34、查询随机纸条列表
   rpc FindRecommendScrip (UserFindScripRequest) returns (common.ScripReply){
     option (google.api.http) = {
       post: "/api/user/scrip/find/recommend",
       body:"*"
     };
   };
-  // 用户查看纸条
+  // 35、用户查看纸条
   rpc PersonLookScrip (PersonLookScripRequest) returns (google.protobuf.Empty){
     option (google.api.http) = {
       post: "/api/user/scrip/look",
       body:"*"
     };
   };
-  // 用户点击回看
+  // 36、用户点击回看
   rpc PersonClickLookBack (google.protobuf.Empty) returns (common.ScripInfo){
     option (google.api.http) = {
       post: "/api/user/scrip/look/back",
       body:"*"
     };
   };
-  // 用户回复小纸条
+  // 37、用户回复小纸条
   rpc PersonReplyScrip (ReplyScripRequest) returns (common.ChatRecordInfo){
     option (google.api.http) = {
       post: "/api/user/scrip/reply",
@@ -292,6 +275,23 @@ service User {
     };
   };
 
+  // ---还未共用---
+  // 用户拉黑某人
+  rpc UserSetBlackChat (common.RoomIDRequest) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/user/set/black",
+      body:"*"
+    };
+  };
+  // 用户删除房间
+  rpc UserDeleteChat (common.RoomIDRequest) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/user/chat/delete",
+      body:"*"
+    };
+  };
+
+
   // ---用户专用---
   // 检查用户是否与接待员关联
   rpc CheckUserPartnerIsRelationship (common.PartnerIDParam) returns (chat.CheckUserPartnerIsRelationshipReply){

+ 94 - 94
api/user/user_grpc.pb.go

@@ -80,27 +80,27 @@ type UserClient interface {
 	FindOverSevenDayAvatar(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.FindOverSevenDayAvatarReply, error)
 	// 29、更新上次访问的小纸条
 	UpdateLastScripID(ctx context.Context, in *common.UpdateLastScripIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// ---还未共用---
-	// 用户拉黑某人
-	UserSetBlackChat(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// 用户删除房间
-	UserDeleteChat(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// 创建纸条
+	// 30、创建纸条
 	CreateScrip(ctx context.Context, in *CreateScripRequest, opts ...grpc.CallOption) (*common.ScripID, error)
-	// 删除纸条
+	// 31、删除纸条
 	DeleteScrip(ctx context.Context, in *DeleteScripRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// 查询自己的小纸条
+	// 32、查询自己的小纸条
 	FindMyScrip(ctx context.Context, in *UserFindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
-	// 查询别人的小纸条
+	// 33、查询别人的小纸条
 	FindOtherScrip(ctx context.Context, in *common.FindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
-	// 查询随机纸条列表
+	// 34、查询随机纸条列表
 	FindRecommendScrip(ctx context.Context, in *UserFindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
-	// 用户查看纸条
+	// 35、用户查看纸条
 	PersonLookScrip(ctx context.Context, in *PersonLookScripRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// 用户点击回看
+	// 36、用户点击回看
 	PersonClickLookBack(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.ScripInfo, error)
-	// 用户回复小纸条
+	// 37、用户回复小纸条
 	PersonReplyScrip(ctx context.Context, in *ReplyScripRequest, opts ...grpc.CallOption) (*common.ChatRecordInfo, error)
+	// ---还未共用---
+	// 用户拉黑某人
+	UserSetBlackChat(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 用户删除房间
+	UserDeleteChat(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// ---用户专用---
 	// 检查用户是否与接待员关联
 	CheckUserPartnerIsRelationship(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*chat.CheckUserPartnerIsRelationshipReply, error)
@@ -434,24 +434,6 @@ func (c *userClient) UpdateLastScripID(ctx context.Context, in *common.UpdateLas
 	return out, nil
 }
 
-func (c *userClient) UserSetBlackChat(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
-	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/api.user.User/UserSetBlackChat", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *userClient) UserDeleteChat(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
-	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/api.user.User/UserDeleteChat", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *userClient) CreateScrip(ctx context.Context, in *CreateScripRequest, opts ...grpc.CallOption) (*common.ScripID, error) {
 	out := new(common.ScripID)
 	err := c.cc.Invoke(ctx, "/api.user.User/CreateScrip", in, out, opts...)
@@ -524,6 +506,24 @@ func (c *userClient) PersonReplyScrip(ctx context.Context, in *ReplyScripRequest
 	return out, nil
 }
 
+func (c *userClient) UserSetBlackChat(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.user.User/UserSetBlackChat", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userClient) UserDeleteChat(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.user.User/UserDeleteChat", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *userClient) CheckUserPartnerIsRelationship(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*chat.CheckUserPartnerIsRelationshipReply, error) {
 	out := new(chat.CheckUserPartnerIsRelationshipReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/CheckUserPartnerIsRelationship", in, out, opts...)
@@ -856,27 +856,27 @@ type UserServer interface {
 	FindOverSevenDayAvatar(context.Context, *emptypb.Empty) (*common.FindOverSevenDayAvatarReply, error)
 	// 29、更新上次访问的小纸条
 	UpdateLastScripID(context.Context, *common.UpdateLastScripIDRequest) (*emptypb.Empty, error)
-	// ---还未共用---
-	// 用户拉黑某人
-	UserSetBlackChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
-	// 用户删除房间
-	UserDeleteChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
-	// 创建纸条
+	// 30、创建纸条
 	CreateScrip(context.Context, *CreateScripRequest) (*common.ScripID, error)
-	// 删除纸条
+	// 31、删除纸条
 	DeleteScrip(context.Context, *DeleteScripRequest) (*emptypb.Empty, error)
-	// 查询自己的小纸条
+	// 32、查询自己的小纸条
 	FindMyScrip(context.Context, *UserFindScripRequest) (*common.ScripReply, error)
-	// 查询别人的小纸条
+	// 33、查询别人的小纸条
 	FindOtherScrip(context.Context, *common.FindScripRequest) (*common.ScripReply, error)
-	// 查询随机纸条列表
+	// 34、查询随机纸条列表
 	FindRecommendScrip(context.Context, *UserFindScripRequest) (*common.ScripReply, error)
-	// 用户查看纸条
+	// 35、用户查看纸条
 	PersonLookScrip(context.Context, *PersonLookScripRequest) (*emptypb.Empty, error)
-	// 用户点击回看
+	// 36、用户点击回看
 	PersonClickLookBack(context.Context, *emptypb.Empty) (*common.ScripInfo, error)
-	// 用户回复小纸条
+	// 37、用户回复小纸条
 	PersonReplyScrip(context.Context, *ReplyScripRequest) (*common.ChatRecordInfo, error)
+	// ---还未共用---
+	// 用户拉黑某人
+	UserSetBlackChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
+	// 用户删除房间
+	UserDeleteChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
 	// ---用户专用---
 	// 检查用户是否与接待员关联
 	CheckUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error)
@@ -1033,12 +1033,6 @@ func (UnimplementedUserServer) FindOverSevenDayAvatar(context.Context, *emptypb.
 func (UnimplementedUserServer) UpdateLastScripID(context.Context, *common.UpdateLastScripIDRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateLastScripID not implemented")
 }
-func (UnimplementedUserServer) UserSetBlackChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UserSetBlackChat not implemented")
-}
-func (UnimplementedUserServer) UserDeleteChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UserDeleteChat not implemented")
-}
 func (UnimplementedUserServer) CreateScrip(context.Context, *CreateScripRequest) (*common.ScripID, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateScrip not implemented")
 }
@@ -1063,6 +1057,12 @@ func (UnimplementedUserServer) PersonClickLookBack(context.Context, *emptypb.Emp
 func (UnimplementedUserServer) PersonReplyScrip(context.Context, *ReplyScripRequest) (*common.ChatRecordInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PersonReplyScrip not implemented")
 }
+func (UnimplementedUserServer) UserSetBlackChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserSetBlackChat not implemented")
+}
+func (UnimplementedUserServer) UserDeleteChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserDeleteChat not implemented")
+}
 func (UnimplementedUserServer) CheckUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CheckUserPartnerIsRelationship not implemented")
 }
@@ -1688,42 +1688,6 @@ func _User_UpdateLastScripID_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
-func _User_UserSetBlackChat_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.RoomIDRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(UserServer).UserSetBlackChat(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.user.User/UserSetBlackChat",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).UserSetBlackChat(ctx, req.(*common.RoomIDRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _User_UserDeleteChat_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.RoomIDRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(UserServer).UserDeleteChat(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.user.User/UserDeleteChat",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).UserDeleteChat(ctx, req.(*common.RoomIDRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _User_CreateScrip_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(CreateScripRequest)
 	if err := dec(in); err != nil {
@@ -1868,6 +1832,42 @@ func _User_PersonReplyScrip_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_UserSetBlackChat_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.RoomIDRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).UserSetBlackChat(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/UserSetBlackChat",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).UserSetBlackChat(ctx, req.(*common.RoomIDRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _User_UserDeleteChat_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.RoomIDRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).UserDeleteChat(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/UserDeleteChat",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).UserDeleteChat(ctx, req.(*common.RoomIDRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _User_CheckUserPartnerIsRelationship_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(common.PartnerIDParam)
 	if err := dec(in); err != nil {
@@ -2531,14 +2531,6 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UpdateLastScripID",
 			Handler:    _User_UpdateLastScripID_Handler,
 		},
-		{
-			MethodName: "UserSetBlackChat",
-			Handler:    _User_UserSetBlackChat_Handler,
-		},
-		{
-			MethodName: "UserDeleteChat",
-			Handler:    _User_UserDeleteChat_Handler,
-		},
 		{
 			MethodName: "CreateScrip",
 			Handler:    _User_CreateScrip_Handler,
@@ -2571,6 +2563,14 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "PersonReplyScrip",
 			Handler:    _User_PersonReplyScrip_Handler,
 		},
+		{
+			MethodName: "UserSetBlackChat",
+			Handler:    _User_UserSetBlackChat_Handler,
+		},
+		{
+			MethodName: "UserDeleteChat",
+			Handler:    _User_UserDeleteChat_Handler,
+		},
 		{
 			MethodName: "CheckUserPartnerIsRelationship",
 			Handler:    _User_CheckUserPartnerIsRelationship_Handler,

+ 41 - 41
api/user/user_http.pb.go

@@ -120,8 +120,6 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/report", _User_Report0_HTTP_Handler(srv))
 	r.POST("/api/user/over/avatar/list", _User_FindOverSevenDayAvatar0_HTTP_Handler(srv))
 	r.POST("/api/user/scrip/last/update", _User_UpdateLastScripID0_HTTP_Handler(srv))
-	r.POST("/api/user/set/black", _User_UserSetBlackChat0_HTTP_Handler(srv))
-	r.POST("/api/user/chat/delete", _User_UserDeleteChat0_HTTP_Handler(srv))
 	r.POST("/api/user/scrip/create", _User_CreateScrip0_HTTP_Handler(srv))
 	r.POST("/api/user/scrip/delete", _User_DeleteScrip0_HTTP_Handler(srv))
 	r.POST("/api/user/scrip/find/self", _User_FindMyScrip0_HTTP_Handler(srv))
@@ -130,6 +128,8 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/scrip/look", _User_PersonLookScrip0_HTTP_Handler(srv))
 	r.POST("/api/user/scrip/look/back", _User_PersonClickLookBack0_HTTP_Handler(srv))
 	r.POST("/api/user/scrip/reply", _User_PersonReplyScrip0_HTTP_Handler(srv))
+	r.POST("/api/user/set/black", _User_UserSetBlackChat0_HTTP_Handler(srv))
+	r.POST("/api/user/chat/delete", _User_UserDeleteChat0_HTTP_Handler(srv))
 	r.POST("/api/user/check/relationship", _User_CheckUserPartnerIsRelationship0_HTTP_Handler(srv))
 	r.POST("/api/user/circle/info", _User_GetPartnerCircleInfo0_HTTP_Handler(srv))
 	r.POST("/api/user/list/like", _User_FindLikeList0_HTTP_Handler(srv))
@@ -933,18 +933,18 @@ func _User_UpdateLastScripID0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Con
 	}
 }
 
-func _User_UserSetBlackChat0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_CreateScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in common.RoomIDRequest
+		var in CreateScripRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 		}
-		http.SetOperation(ctx, "/api.user.User/UserSetBlackChat")
+		http.SetOperation(ctx, "/api.user.User/CreateScrip")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.UserSetBlackChat(ctx, req.(*common.RoomIDRequest))
+			return srv.CreateScrip(ctx, req.(*CreateScripRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -960,18 +960,18 @@ func _User_UserSetBlackChat0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Cont
 	}
 }
 
-func _User_UserDeleteChat0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_DeleteScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in common.RoomIDRequest
+		var in DeleteScripRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 		}
-		http.SetOperation(ctx, "/api.user.User/UserDeleteChat")
+		http.SetOperation(ctx, "/api.user.User/DeleteScrip")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.UserDeleteChat(ctx, req.(*common.RoomIDRequest))
+			return srv.DeleteScrip(ctx, req.(*DeleteScripRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -987,18 +987,18 @@ func _User_UserDeleteChat0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Contex
 	}
 }
 
-func _User_CreateScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_FindMyScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in CreateScripRequest
+		var in UserFindScripRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 		}
-		http.SetOperation(ctx, "/api.user.User/CreateScrip")
+		http.SetOperation(ctx, "/api.user.User/FindMyScrip")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.CreateScrip(ctx, req.(*CreateScripRequest))
+			return srv.FindMyScrip(ctx, req.(*UserFindScripRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -1014,18 +1014,18 @@ func _User_CreateScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context)
 	}
 }
 
-func _User_DeleteScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_FindOtherScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in DeleteScripRequest
+		var in common.FindScripRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 		}
-		http.SetOperation(ctx, "/api.user.User/DeleteScrip")
+		http.SetOperation(ctx, "/api.user.User/FindOtherScrip")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.DeleteScrip(ctx, req.(*DeleteScripRequest))
+			return srv.FindOtherScrip(ctx, req.(*common.FindScripRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -1041,7 +1041,7 @@ func _User_DeleteScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context)
 	}
 }
 
-func _User_FindMyScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_FindRecommendScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
 		var in UserFindScripRequest
 		if err := ctx.Bind(&in); err != nil {
@@ -1050,9 +1050,9 @@ func _User_FindMyScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context)
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 		}
-		http.SetOperation(ctx, "/api.user.User/FindMyScrip")
+		http.SetOperation(ctx, "/api.user.User/FindRecommendScrip")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.FindMyScrip(ctx, req.(*UserFindScripRequest))
+			return srv.FindRecommendScrip(ctx, req.(*UserFindScripRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -1068,18 +1068,18 @@ func _User_FindMyScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context)
 	}
 }
 
-func _User_FindOtherScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_PersonLookScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in common.FindScripRequest
+		var in PersonLookScripRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 		}
-		http.SetOperation(ctx, "/api.user.User/FindOtherScrip")
+		http.SetOperation(ctx, "/api.user.User/PersonLookScrip")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.FindOtherScrip(ctx, req.(*common.FindScripRequest))
+			return srv.PersonLookScrip(ctx, req.(*PersonLookScripRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -1095,18 +1095,18 @@ func _User_FindOtherScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Contex
 	}
 }
 
-func _User_FindRecommendScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_PersonClickLookBack0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in UserFindScripRequest
+		var in emptypb.Empty
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 		}
-		http.SetOperation(ctx, "/api.user.User/FindRecommendScrip")
+		http.SetOperation(ctx, "/api.user.User/PersonClickLookBack")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.FindRecommendScrip(ctx, req.(*UserFindScripRequest))
+			return srv.PersonClickLookBack(ctx, req.(*emptypb.Empty))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -1122,18 +1122,18 @@ func _User_FindRecommendScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Co
 	}
 }
 
-func _User_PersonLookScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_PersonReplyScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in PersonLookScripRequest
+		var in ReplyScripRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 		}
-		http.SetOperation(ctx, "/api.user.User/PersonLookScrip")
+		http.SetOperation(ctx, "/api.user.User/PersonReplyScrip")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.PersonLookScrip(ctx, req.(*PersonLookScripRequest))
+			return srv.PersonReplyScrip(ctx, req.(*ReplyScripRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -1149,18 +1149,18 @@ func _User_PersonLookScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Conte
 	}
 }
 
-func _User_PersonClickLookBack0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_UserSetBlackChat0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in emptypb.Empty
+		var in common.RoomIDRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 		}
-		http.SetOperation(ctx, "/api.user.User/PersonClickLookBack")
+		http.SetOperation(ctx, "/api.user.User/UserSetBlackChat")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.PersonClickLookBack(ctx, req.(*emptypb.Empty))
+			return srv.UserSetBlackChat(ctx, req.(*common.RoomIDRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -1176,18 +1176,18 @@ func _User_PersonClickLookBack0_HTTP_Handler(srv UserHTTPServer) func(ctx http.C
 	}
 }
 
-func _User_PersonReplyScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_UserDeleteChat0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in ReplyScripRequest
+		var in common.RoomIDRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 		}
-		http.SetOperation(ctx, "/api.user.User/PersonReplyScrip")
+		http.SetOperation(ctx, "/api.user.User/UserDeleteChat")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.PersonReplyScrip(ctx, req.(*ReplyScripRequest))
+			return srv.UserDeleteChat(ctx, req.(*common.RoomIDRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {

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

@@ -258,6 +258,10 @@ export interface PersonDB{
     /**  标签列表 */
     tagList?:Array<number>;
 }
+export interface ScripIdRequest{
+    /**  纸条id */
+    scripId?:number;
+}
 export interface ListPageRequest{
     nextId?:number;
     offset?:number;

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

@@ -1,7 +1,7 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {PartnerInfo,PartnerBalance,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,PersonIDParam,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,PartnerIDParam,AddFriendMessageInfo} from "../common/common_pb";
+import {PartnerInfo,PartnerBalance,CreateScripRequest,ReplyScripRequest,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,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";
 
@@ -151,6 +151,46 @@ const PartnerService = {
 	const res = await request.post('/api/partner/scrip/last/update', req);
     return res.data.data;
   },
+  /**  30、创建纸条 */
+  CreateScrip: async (req?: CreateScripRequest) => {
+	const res = await request.post<{ data: ScripID, code: string, message: string }>('/api/partner/scrip/create', req);
+    return res.data.data;
+  },
+  /**  31、删除纸条 */
+  DeleteScrip: async (req?: ScripIdRequest) => {
+	const res = await request.post('/api/partner/scrip/delete', req);
+    return res.data.data;
+  },
+  /**  32、查询自己的小纸条 */
+  FindMyScrip: async (req?: ListPageRequest) => {
+	const res = await request.post<{ data: ScripReply, code: string, message: string }>('/api/partner/scrip/find/self', req);
+    return res.data.data;
+  },
+  /**  33、查询别人的小纸条 */
+  FindOtherScrip: async (req?: FindScripRequest) => {
+	const res = await request.post<{ data: ScripReply, code: string, message: string }>('/api/partner/scrip/find/other', req);
+    return res.data.data;
+  },
+  /**  34、查询随机纸条列表 */
+  FindRecommendScrip: async (req?: ListPageRequest) => {
+	const res = await request.post<{ data: ScripReply, code: string, message: string }>('/api/partner/scrip/find/recommend', req);
+    return res.data.data;
+  },
+  /**  35、用户查看纸条 */
+  PersonLookScrip: async (req?: ScripIdRequest) => {
+	const res = await request.post('/api/partner/scrip/look', req);
+    return res.data.data;
+  },
+  /**  36、用户点击回看 */
+  PersonClickLookBack: async (req?: undefined) => {
+	const res = await request.post<{ data: ScripInfo, code: string, message: string }>('/api/partner/scrip/look/back', req);
+    return res.data.data;
+  },
+  /**  37、用户回复小纸条 */
+  PersonReplyScrip: async (req?: ReplyScripRequest) => {
+	const res = await request.post<{ data: ChatRecordInfo, code: string, message: string }>('/api/partner/scrip/reply', req);
+    return res.data.data;
+  },
   /**  ---接待员专用---
 // 获取接待员的部分信息 */
   GetPartnerMessage: async (req?: undefined) => {

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

@@ -1,3 +1,18 @@
+import {Message} from "../common/common_pb";
+
+export interface CreateScripRequest{
+    /**  纸条内容 */
+    text?:string;
+    /**  纸条背景图 */
+    pictureUrl?:string;
+}
+export interface ReplyScripRequest{
+    /**  小纸条ID */
+    scripId?:number;
+    /**  回复内容 只需要提供 回复小纸条的内容 或 回复小纸条的素材链接 */
+    message?:Message;
+    msgType?:string;
+}
 export interface PartnerWithdrawRecordListReply{
     nextId?:number;
     list?:Array<WithdrawInfo>;

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

@@ -1,7 +1,7 @@
 // @ts-ignore
 import request from '@/libs/request';
 import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindRecommendPersonListRequest,FindMatchingAvatarAndNumReply,UserFreeNum} 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,RoomIDRequest,ScripID,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,PartnerIDParam,AddFriendMessageInfo,PersonIDParam,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest} from "../common/common_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,PersonIDParam,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest} from "../common/common_pb";
 import {RoomReply,CheckUserPartnerIsRelationshipReply,WindowInfo,GetRandomMatchingReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";
 
@@ -151,57 +151,57 @@ const UserService = {
 	const res = await request.post('/api/user/scrip/last/update', req);
     return res.data.data;
   },
-  /**  ---还未共用---
-// 用户拉黑某人 */
-  UserSetBlackChat: async (req?: RoomIDRequest) => {
-	const res = await request.post('/api/user/set/black', req);
-    return res.data.data;
-  },
-  /**  用户删除房间 */
-  UserDeleteChat: async (req?: RoomIDRequest) => {
-	const res = await request.post('/api/user/chat/delete', req);
-    return res.data.data;
-  },
-  /**  创建纸条 */
+  /**  30、创建纸条 */
   CreateScrip: async (req?: CreateScripRequest) => {
 	const res = await request.post<{ data: ScripID, code: string, message: string }>('/api/user/scrip/create', req);
     return res.data.data;
   },
-  /**  删除纸条 */
+  /**  31、删除纸条 */
   DeleteScrip: async (req?: DeleteScripRequest) => {
 	const res = await request.post('/api/user/scrip/delete', req);
     return res.data.data;
   },
-  /**  查询自己的小纸条 */
+  /**  32、查询自己的小纸条 */
   FindMyScrip: async (req?: UserFindScripRequest) => {
 	const res = await request.post<{ data: ScripReply, code: string, message: string }>('/api/user/scrip/find/self', req);
     return res.data.data;
   },
-  /**  查询别人的小纸条 */
+  /**  33、查询别人的小纸条 */
   FindOtherScrip: async (req?: FindScripRequest) => {
 	const res = await request.post<{ data: ScripReply, code: string, message: string }>('/api/user/scrip/find/other', req);
     return res.data.data;
   },
-  /**  查询随机纸条列表 */
+  /**  34、查询随机纸条列表 */
   FindRecommendScrip: async (req?: UserFindScripRequest) => {
 	const res = await request.post<{ data: ScripReply, code: string, message: string }>('/api/user/scrip/find/recommend', req);
     return res.data.data;
   },
-  /**  用户查看纸条 */
+  /**  35、用户查看纸条 */
   PersonLookScrip: async (req?: PersonLookScripRequest) => {
 	const res = await request.post('/api/user/scrip/look', req);
     return res.data.data;
   },
-  /**  用户点击回看 */
+  /**  36、用户点击回看 */
   PersonClickLookBack: async (req?: undefined) => {
 	const res = await request.post<{ data: ScripInfo, code: string, message: string }>('/api/user/scrip/look/back', req);
     return res.data.data;
   },
-  /**  用户回复小纸条 */
+  /**  37、用户回复小纸条 */
   PersonReplyScrip: async (req?: ReplyScripRequest) => {
 	const res = await request.post<{ data: ChatRecordInfo, code: string, message: string }>('/api/user/scrip/reply', req);
     return res.data.data;
   },
+  /**  ---还未共用---
+// 用户拉黑某人 */
+  UserSetBlackChat: async (req?: RoomIDRequest) => {
+	const res = await request.post('/api/user/set/black', req);
+    return res.data.data;
+  },
+  /**  用户删除房间 */
+  UserDeleteChat: async (req?: RoomIDRequest) => {
+	const res = await request.post('/api/user/chat/delete', req);
+    return res.data.data;
+  },
   /**  ---用户专用---
 // 检查用户是否与接待员关联 */
   CheckUserPartnerIsRelationship: async (req?: PartnerIDParam) => {

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно