wfz 2 年 前
コミット
e15de1cbab

+ 70 - 61
api/manager/manager.pb.go

@@ -677,7 +677,7 @@ var file_manager_proto_rawDesc = []byte{
 	0x75, 0x73, 0x65, 0x72, 0x57, 0x6f, 0x6d, 0x61, 0x6e, 0x4e, 0x75, 0x6d, 0x12, 0x22, 0x0a, 0x0c,
 	0x75, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01,
 	0x28, 0x03, 0x52, 0x0c, 0x75, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x4e, 0x75, 0x6d,
-	0x32, 0xe4, 0x2a, 0x0a, 0x07, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x8a, 0x01, 0x0a,
+	0x32, 0xc5, 0x2b, 0x0a, 0x07, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x8a, 0x01, 0x0a,
 	0x13, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72,
 	0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
 	0x6e, 0x2e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x50, 0x65, 0x72,
@@ -1019,12 +1019,18 @@ var file_manager_proto_rawDesc = []byte{
 	0x6e, 0x61, 0x67, 0x65, 0x72, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22,
 	0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x22, 0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61,
 	0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x2f, 0x61, 0x6c, 0x6c, 0x2f,
-	0x6c, 0x69, 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69, 0x2e, 0x6d,
-	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b,
-	0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f,
-	0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6c, 0x69, 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0x5f, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x53, 0x63,
+	0x72, 0x69, 0x70, 0x50, 0x61, 0x73, 0x73, 0x12, 0x13, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x49, 0x44, 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, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x22, 0x17, 0x2f, 0x61,
+	0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x2f, 0x70, 0x61, 0x73, 0x73, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69, 0x2e,
+	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x2e, 0x69,
+	0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69,
+	0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1076,19 +1082,20 @@ var file_manager_proto_goTypes = []interface{}{
 	(*common.Ids)(nil),                                   // 32: api.common.Ids
 	(*common.ManagerFindReportListRequest)(nil),          // 33: api.common.ManagerFindReportListRequest
 	(*common.ManagerFindReportDetailsListRequest)(nil),   // 34: api.common.ManagerFindReportDetailsListRequest
-	(*common.ManagerFindPersonListReply)(nil),            // 35: api.common.ManagerFindPersonListReply
-	(*common.ManagerFindPersonListReply2)(nil),           // 36: api.common.ManagerFindPersonListReply2
-	(*common.ManagerFindCanHandpickUserListReply)(nil),   // 37: api.common.ManagerFindCanHandpickUserListReply
-	(*common.LoginToken)(nil),                            // 38: api.common.LoginToken
-	(*common.ManagerFindRoomListReply)(nil),              // 39: api.common.ManagerFindRoomListReply
-	(*common.ChatRecordListReply)(nil),                   // 40: api.common.ChatRecordListReply
-	(*common.ManagerScripReply)(nil),                     // 41: api.common.ManagerScripReply
-	(*common.ManagerScripV2Reply)(nil),                   // 42: api.common.ManagerScripV2Reply
-	(*common.ManagerFindReportListReply)(nil),            // 43: api.common.ManagerFindReportListReply
-	(*common.ManagerFindReportDetailsListReply)(nil),     // 44: api.common.ManagerFindReportDetailsListReply
-	(*websocket.FindOnlinePersonReply)(nil),              // 45: api.websocket.FindOnlinePersonReply
-	(*websocket.FindOnlineCanMatchingPersonReply)(nil),   // 46: api.websocket.FindOnlineCanMatchingPersonReply
-	(*websocket.SendMsgReply)(nil),                       // 47: api.websocket.SendMsgReply
+	(*common.ScripID)(nil),                               // 35: api.common.ScripID
+	(*common.ManagerFindPersonListReply)(nil),            // 36: api.common.ManagerFindPersonListReply
+	(*common.ManagerFindPersonListReply2)(nil),           // 37: api.common.ManagerFindPersonListReply2
+	(*common.ManagerFindCanHandpickUserListReply)(nil),   // 38: api.common.ManagerFindCanHandpickUserListReply
+	(*common.LoginToken)(nil),                            // 39: api.common.LoginToken
+	(*common.ManagerFindRoomListReply)(nil),              // 40: api.common.ManagerFindRoomListReply
+	(*common.ChatRecordListReply)(nil),                   // 41: api.common.ChatRecordListReply
+	(*common.ManagerScripReply)(nil),                     // 42: api.common.ManagerScripReply
+	(*common.ManagerScripV2Reply)(nil),                   // 43: api.common.ManagerScripV2Reply
+	(*common.ManagerFindReportListReply)(nil),            // 44: api.common.ManagerFindReportListReply
+	(*common.ManagerFindReportDetailsListReply)(nil),     // 45: api.common.ManagerFindReportDetailsListReply
+	(*websocket.FindOnlinePersonReply)(nil),              // 46: api.websocket.FindOnlinePersonReply
+	(*websocket.FindOnlineCanMatchingPersonReply)(nil),   // 47: api.websocket.FindOnlineCanMatchingPersonReply
+	(*websocket.SendMsgReply)(nil),                       // 48: api.websocket.SendMsgReply
 }
 var file_manager_proto_depIdxs = []int32{
 	10, // 0: api.manager.Manager.ManagerFindUserList:input_type -> api.common.ManagerFindPersonListRequest
@@ -1130,47 +1137,49 @@ var file_manager_proto_depIdxs = []int32{
 	1,  // 36: api.manager.Manager.ManagerAddBlackPicture:input_type -> api.manager.ManagerAddBlackPictureRequest
 	14, // 37: api.manager.Manager.SendWebsocketMsg:input_type -> api.common.PersonIDParam
 	0,  // 38: api.manager.Manager.ManagerFindScripAllList:input_type -> api.manager.ManagerFindScripAllListRequest
-	35, // 39: api.manager.Manager.ManagerFindUserList:output_type -> api.common.ManagerFindPersonListReply
-	35, // 40: api.manager.Manager.ManagerFindInformationUserList:output_type -> api.common.ManagerFindPersonListReply
-	36, // 41: api.manager.Manager.ManagerFindIsCheckQualityUserList:output_type -> api.common.ManagerFindPersonListReply2
-	35, // 42: api.manager.Manager.ManagerFindHighQualityUserList:output_type -> api.common.ManagerFindPersonListReply
-	37, // 43: api.manager.Manager.ManagerFindCanHandpickUserList:output_type -> api.common.ManagerFindCanHandpickUserListReply
-	24, // 44: api.manager.Manager.ManagerSetHandpickUser:output_type -> google.protobuf.Empty
-	24, // 45: api.manager.Manager.ManagerSetHandpickUserOne:output_type -> google.protobuf.Empty
-	24, // 46: api.manager.Manager.ManagerMarkHighQualityUser:output_type -> google.protobuf.Empty
-	24, // 47: api.manager.Manager.ManagerReMarkHighQualityUser:output_type -> google.protobuf.Empty
-	24, // 48: api.manager.Manager.ManagerMarkHighQualityUserOne:output_type -> google.protobuf.Empty
-	24, // 49: api.manager.Manager.ManagerSetUserBlack:output_type -> google.protobuf.Empty
-	24, // 50: api.manager.Manager.ManagerDeleteHighQualityUser:output_type -> google.protobuf.Empty
-	24, // 51: api.manager.Manager.ManagerUpdateUserSex:output_type -> google.protobuf.Empty
-	24, // 52: api.manager.Manager.ManagerUpdateUserVoice:output_type -> google.protobuf.Empty
-	24, // 53: api.manager.Manager.ManagerUpdateUserPictures:output_type -> google.protobuf.Empty
-	24, // 54: api.manager.Manager.ManagerUpdateUserSignature:output_type -> google.protobuf.Empty
-	24, // 55: api.manager.Manager.ManagerUpdateUserAvatar:output_type -> google.protobuf.Empty
-	24, // 56: api.manager.Manager.ManagerUpdateUserName:output_type -> google.protobuf.Empty
-	24, // 57: api.manager.Manager.ManagerUpdateUserWeight:output_type -> google.protobuf.Empty
-	24, // 58: api.manager.Manager.ManagerUpdateUserIsBlack:output_type -> google.protobuf.Empty
-	24, // 59: api.manager.Manager.ManagerUpdateUserCredit:output_type -> google.protobuf.Empty
-	38, // 60: api.manager.Manager.ManagerLogin:output_type -> api.common.LoginToken
-	9,  // 61: api.manager.Manager.OnlinePerson:output_type -> api.manager.OnlinePersonReply
-	39, // 62: api.manager.Manager.ManagerFindRoomList:output_type -> api.common.ManagerFindRoomListReply
-	40, // 63: api.manager.Manager.ManagerFindChatRecordList:output_type -> api.common.ChatRecordListReply
-	41, // 64: api.manager.Manager.ManagerFindScripList:output_type -> api.common.ManagerScripReply
-	42, // 65: api.manager.Manager.ManagerFindScripListV2:output_type -> api.common.ManagerScripV2Reply
-	24, // 66: api.manager.Manager.ManagerUpdateScripText:output_type -> google.protobuf.Empty
-	24, // 67: api.manager.Manager.ManagerUpdateScripPicture:output_type -> google.protobuf.Empty
-	24, // 68: api.manager.Manager.ManagerDeleteScrip:output_type -> google.protobuf.Empty
-	24, // 69: api.manager.Manager.ManagerDeleteScripMore:output_type -> google.protobuf.Empty
-	43, // 70: api.manager.Manager.ManagerFindReportList:output_type -> api.common.ManagerFindReportListReply
-	44, // 71: api.manager.Manager.ManagerFindReportDetailsList:output_type -> api.common.ManagerFindReportDetailsListReply
-	45, // 72: api.manager.Manager.FindOnlinePerson:output_type -> api.websocket.FindOnlinePersonReply
-	24, // 73: api.manager.Manager.ManagerUserUnsubscribe:output_type -> google.protobuf.Empty
-	46, // 74: api.manager.Manager.FindOnlineCanMatchingPerson:output_type -> api.websocket.FindOnlineCanMatchingPersonReply
-	24, // 75: api.manager.Manager.ManagerAddBlackPicture:output_type -> google.protobuf.Empty
-	47, // 76: api.manager.Manager.SendWebsocketMsg:output_type -> api.websocket.SendMsgReply
-	41, // 77: api.manager.Manager.ManagerFindScripAllList:output_type -> api.common.ManagerScripReply
-	39, // [39:78] is the sub-list for method output_type
-	0,  // [0:39] is the sub-list for method input_type
+	35, // 39: api.manager.Manager.SetScripPass:input_type -> api.common.ScripID
+	36, // 40: api.manager.Manager.ManagerFindUserList:output_type -> api.common.ManagerFindPersonListReply
+	36, // 41: api.manager.Manager.ManagerFindInformationUserList:output_type -> api.common.ManagerFindPersonListReply
+	37, // 42: api.manager.Manager.ManagerFindIsCheckQualityUserList:output_type -> api.common.ManagerFindPersonListReply2
+	36, // 43: api.manager.Manager.ManagerFindHighQualityUserList:output_type -> api.common.ManagerFindPersonListReply
+	38, // 44: api.manager.Manager.ManagerFindCanHandpickUserList:output_type -> api.common.ManagerFindCanHandpickUserListReply
+	24, // 45: api.manager.Manager.ManagerSetHandpickUser:output_type -> google.protobuf.Empty
+	24, // 46: api.manager.Manager.ManagerSetHandpickUserOne:output_type -> google.protobuf.Empty
+	24, // 47: api.manager.Manager.ManagerMarkHighQualityUser:output_type -> google.protobuf.Empty
+	24, // 48: api.manager.Manager.ManagerReMarkHighQualityUser:output_type -> google.protobuf.Empty
+	24, // 49: api.manager.Manager.ManagerMarkHighQualityUserOne:output_type -> google.protobuf.Empty
+	24, // 50: api.manager.Manager.ManagerSetUserBlack:output_type -> google.protobuf.Empty
+	24, // 51: api.manager.Manager.ManagerDeleteHighQualityUser:output_type -> google.protobuf.Empty
+	24, // 52: api.manager.Manager.ManagerUpdateUserSex:output_type -> google.protobuf.Empty
+	24, // 53: api.manager.Manager.ManagerUpdateUserVoice:output_type -> google.protobuf.Empty
+	24, // 54: api.manager.Manager.ManagerUpdateUserPictures:output_type -> google.protobuf.Empty
+	24, // 55: api.manager.Manager.ManagerUpdateUserSignature:output_type -> google.protobuf.Empty
+	24, // 56: api.manager.Manager.ManagerUpdateUserAvatar:output_type -> google.protobuf.Empty
+	24, // 57: api.manager.Manager.ManagerUpdateUserName:output_type -> google.protobuf.Empty
+	24, // 58: api.manager.Manager.ManagerUpdateUserWeight:output_type -> google.protobuf.Empty
+	24, // 59: api.manager.Manager.ManagerUpdateUserIsBlack:output_type -> google.protobuf.Empty
+	24, // 60: api.manager.Manager.ManagerUpdateUserCredit:output_type -> google.protobuf.Empty
+	39, // 61: api.manager.Manager.ManagerLogin:output_type -> api.common.LoginToken
+	9,  // 62: api.manager.Manager.OnlinePerson:output_type -> api.manager.OnlinePersonReply
+	40, // 63: api.manager.Manager.ManagerFindRoomList:output_type -> api.common.ManagerFindRoomListReply
+	41, // 64: api.manager.Manager.ManagerFindChatRecordList:output_type -> api.common.ChatRecordListReply
+	42, // 65: api.manager.Manager.ManagerFindScripList:output_type -> api.common.ManagerScripReply
+	43, // 66: api.manager.Manager.ManagerFindScripListV2:output_type -> api.common.ManagerScripV2Reply
+	24, // 67: api.manager.Manager.ManagerUpdateScripText:output_type -> google.protobuf.Empty
+	24, // 68: api.manager.Manager.ManagerUpdateScripPicture:output_type -> google.protobuf.Empty
+	24, // 69: api.manager.Manager.ManagerDeleteScrip:output_type -> google.protobuf.Empty
+	24, // 70: api.manager.Manager.ManagerDeleteScripMore:output_type -> google.protobuf.Empty
+	44, // 71: api.manager.Manager.ManagerFindReportList:output_type -> api.common.ManagerFindReportListReply
+	45, // 72: api.manager.Manager.ManagerFindReportDetailsList:output_type -> api.common.ManagerFindReportDetailsListReply
+	46, // 73: api.manager.Manager.FindOnlinePerson:output_type -> api.websocket.FindOnlinePersonReply
+	24, // 74: api.manager.Manager.ManagerUserUnsubscribe:output_type -> google.protobuf.Empty
+	47, // 75: api.manager.Manager.FindOnlineCanMatchingPerson:output_type -> api.websocket.FindOnlineCanMatchingPersonReply
+	24, // 76: api.manager.Manager.ManagerAddBlackPicture:output_type -> google.protobuf.Empty
+	48, // 77: api.manager.Manager.SendWebsocketMsg:output_type -> api.websocket.SendMsgReply
+	42, // 78: api.manager.Manager.ManagerFindScripAllList:output_type -> api.common.ManagerScripReply
+	24, // 79: api.manager.Manager.SetScripPass:output_type -> google.protobuf.Empty
+	40, // [40:80] is the sub-list for method output_type
+	0,  // [0:40] is the sub-list for method input_type
 	0,  // [0:0] is the sub-list for extension type_name
 	0,  // [0:0] is the sub-list for extension extendee
 	0,  // [0:0] is the sub-list for field type_name

+ 7 - 0
api/manager/manager.proto

@@ -286,6 +286,13 @@ service Manager {
       body:"*"
     };
   };
+  // 通过小纸条
+  rpc SetScripPass (common.ScripID) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/manager/scrip/pass",
+      body:"*"
+    };
+  };
 }
 
 message ManagerFindScripAllListRequest{

+ 38 - 0
api/manager/manager_grpc.pb.go

@@ -99,6 +99,8 @@ type ManagerClient interface {
 	SendWebsocketMsg(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*websocket.SendMsgReply, error)
 	// 管理员查询纸条列表
 	ManagerFindScripAllList(ctx context.Context, in *ManagerFindScripAllListRequest, opts ...grpc.CallOption) (*common.ManagerScripReply, error)
+	// 通过小纸条
+	SetScripPass(ctx context.Context, in *common.ScripID, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type managerClient struct {
@@ -460,6 +462,15 @@ func (c *managerClient) ManagerFindScripAllList(ctx context.Context, in *Manager
 	return out, nil
 }
 
+func (c *managerClient) SetScripPass(ctx context.Context, in *common.ScripID, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.manager.Manager/SetScripPass", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // ManagerServer is the server API for Manager service.
 // All implementations must embed UnimplementedManagerServer
 // for forward compatibility
@@ -542,6 +553,8 @@ type ManagerServer interface {
 	SendWebsocketMsg(context.Context, *common.PersonIDParam) (*websocket.SendMsgReply, error)
 	// 管理员查询纸条列表
 	ManagerFindScripAllList(context.Context, *ManagerFindScripAllListRequest) (*common.ManagerScripReply, error)
+	// 通过小纸条
+	SetScripPass(context.Context, *common.ScripID) (*emptypb.Empty, error)
 	mustEmbedUnimplementedManagerServer()
 }
 
@@ -666,6 +679,9 @@ func (UnimplementedManagerServer) SendWebsocketMsg(context.Context, *common.Pers
 func (UnimplementedManagerServer) ManagerFindScripAllList(context.Context, *ManagerFindScripAllListRequest) (*common.ManagerScripReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ManagerFindScripAllList not implemented")
 }
+func (UnimplementedManagerServer) SetScripPass(context.Context, *common.ScripID) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SetScripPass not implemented")
+}
 func (UnimplementedManagerServer) mustEmbedUnimplementedManagerServer() {}
 
 // UnsafeManagerServer may be embedded to opt out of forward compatibility for this service.
@@ -1381,6 +1397,24 @@ func _Manager_ManagerFindScripAllList_Handler(srv interface{}, ctx context.Conte
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Manager_SetScripPass_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ScripID)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ManagerServer).SetScripPass(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.manager.Manager/SetScripPass",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ManagerServer).SetScripPass(ctx, req.(*common.ScripID))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Manager_ServiceDesc is the grpc.ServiceDesc for Manager service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1544,6 +1578,10 @@ var Manager_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ManagerFindScripAllList",
 			Handler:    _Manager_ManagerFindScripAllList_Handler,
 		},
+		{
+			MethodName: "SetScripPass",
+			Handler:    _Manager_SetScripPass_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "manager.proto",

+ 43 - 0
api/manager/manager_http.pb.go

@@ -68,6 +68,7 @@ type ManagerHTTPServer interface {
 	ManagerUserUnsubscribe(context.Context, *ManagerUserUnsubscribeRequest) (*emptypb.Empty, error)
 	OnlinePerson(context.Context, *emptypb.Empty) (*OnlinePersonReply, error)
 	SendWebsocketMsg(context.Context, *common.PersonIDParam) (*websocket.SendMsgReply, error)
+	SetScripPass(context.Context, *common.ScripID) (*emptypb.Empty, error)
 }
 
 func RegisterManagerHTTPServer(s *http.Server, srv ManagerHTTPServer) {
@@ -111,6 +112,7 @@ func RegisterManagerHTTPServer(s *http.Server, srv ManagerHTTPServer) {
 	r.POST("/api/manager/black/picture/add", _Manager_ManagerAddBlackPicture0_HTTP_Handler(srv))
 	r.POST("/api/manager/websocket/send", _Manager_SendWebsocketMsg0_HTTP_Handler(srv))
 	r.POST("/api/manager/scrip/all/list", _Manager_ManagerFindScripAllList0_HTTP_Handler(srv))
+	r.POST("/api/manager/scrip/pass", _Manager_SetScripPass0_HTTP_Handler(srv))
 }
 
 func _Manager_ManagerFindUserList0_HTTP_Handler(srv ManagerHTTPServer) func(ctx http.Context) error {
@@ -1166,6 +1168,33 @@ func _Manager_ManagerFindScripAllList0_HTTP_Handler(srv ManagerHTTPServer) func(
 	}
 }
 
+func _Manager_SetScripPass0_HTTP_Handler(srv ManagerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.ScripID
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.manager.Manager/SetScripPass")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.SetScripPass(ctx, req.(*common.ScripID))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
 type ManagerHTTPClient interface {
 	FindOnlineCanMatchingPerson(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *websocket.FindOnlineCanMatchingPersonReply, err error)
 	FindOnlinePerson(ctx context.Context, req *FindOnlinePersonRequest, opts ...http.CallOption) (rsp *websocket.FindOnlinePersonReply, err error)
@@ -1206,6 +1235,7 @@ type ManagerHTTPClient interface {
 	ManagerUserUnsubscribe(ctx context.Context, req *ManagerUserUnsubscribeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	OnlinePerson(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *OnlinePersonReply, err error)
 	SendWebsocketMsg(ctx context.Context, req *common.PersonIDParam, opts ...http.CallOption) (rsp *websocket.SendMsgReply, err error)
+	SetScripPass(ctx context.Context, req *common.ScripID, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 }
 
 type ManagerHTTPClientImpl struct {
@@ -1722,3 +1752,16 @@ func (c *ManagerHTTPClientImpl) SendWebsocketMsg(ctx context.Context, in *common
 	}
 	return &out, err
 }
+
+func (c *ManagerHTTPClientImpl) SetScripPass(ctx context.Context, in *common.ScripID, opts ...http.CallOption) (*emptypb.Empty, error) {
+	var out emptypb.Empty
+	pattern := "/api/manager/scrip/pass"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.manager.Manager/SetScripPass"))
+	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
+}

+ 27 - 21
api/scrip/scrip.pb.go

@@ -28,7 +28,7 @@ var file_scrip_proto_rawDesc = []byte{
 	0x70, 0x69, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x8e,
+	0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xcd,
 	0x07, 0x0a, 0x05, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x44, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61,
 	0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x12, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
 	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70,
@@ -85,12 +85,16 @@ var file_scrip_proto_rawDesc = []byte{
 	0x72, 0x69, 0x70, 0x12, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
 	0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x74, 0x61, 0x72, 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, 0x00, 0x42,
-	0x40, 0x0a, 0x09, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x50, 0x01, 0x5a, 0x31,
-	0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x3b, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x00, 0x12,
+	0x3d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x53, 0x63, 0x72, 0x69, 0x70, 0x50, 0x61, 0x73, 0x73, 0x12,
+	0x13, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x63, 0x72,
+	0x69, 0x70, 0x49, 0x44, 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, 0x00, 0x42, 0x40,
+	0x0a, 0x09, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x50, 0x01, 0x5a, 0x31, 0x67,
+	0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x3b, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var file_scrip_proto_goTypes = []interface{}{
@@ -123,20 +127,22 @@ var file_scrip_proto_depIdxs = []int32{
 	8,  // 9: api.scrip.Scrip.ReportScrip:input_type -> api.common.ReportRequest
 	9,  // 10: api.scrip.Scrip.CronDeleteOldScrip:input_type -> google.protobuf.Empty
 	10, // 11: api.scrip.Scrip.PersonStarScrip:input_type -> api.common.ReplyStarRequest
-	11, // 12: api.scrip.Scrip.CreateScrip:output_type -> api.common.ScripID
-	9,  // 13: api.scrip.Scrip.DeleteScrip:output_type -> google.protobuf.Empty
-	12, // 14: api.scrip.Scrip.FindMyScrip:output_type -> api.common.ScripReply
-	12, // 15: api.scrip.Scrip.FindOtherScrip:output_type -> api.common.ScripReply
-	12, // 16: api.scrip.Scrip.FindRecommendScrip:output_type -> api.common.ScripReply
-	9,  // 17: api.scrip.Scrip.PersonLookScrip:output_type -> google.protobuf.Empty
-	13, // 18: api.scrip.Scrip.PersonClickLookBack:output_type -> api.common.ScripInfo
-	14, // 19: api.scrip.Scrip.PersonReplyScrip:output_type -> api.common.ChatRecordInfo
-	9,  // 20: api.scrip.Scrip.DeleteScripByPersonID:output_type -> google.protobuf.Empty
-	9,  // 21: api.scrip.Scrip.ReportScrip:output_type -> google.protobuf.Empty
-	9,  // 22: api.scrip.Scrip.CronDeleteOldScrip:output_type -> google.protobuf.Empty
-	14, // 23: api.scrip.Scrip.PersonStarScrip:output_type -> api.common.ChatRecordInfo
-	12, // [12:24] is the sub-list for method output_type
-	0,  // [0:12] is the sub-list for method input_type
+	11, // 12: api.scrip.Scrip.SetScripPass:input_type -> api.common.ScripID
+	11, // 13: api.scrip.Scrip.CreateScrip:output_type -> api.common.ScripID
+	9,  // 14: api.scrip.Scrip.DeleteScrip:output_type -> google.protobuf.Empty
+	12, // 15: api.scrip.Scrip.FindMyScrip:output_type -> api.common.ScripReply
+	12, // 16: api.scrip.Scrip.FindOtherScrip:output_type -> api.common.ScripReply
+	12, // 17: api.scrip.Scrip.FindRecommendScrip:output_type -> api.common.ScripReply
+	9,  // 18: api.scrip.Scrip.PersonLookScrip:output_type -> google.protobuf.Empty
+	13, // 19: api.scrip.Scrip.PersonClickLookBack:output_type -> api.common.ScripInfo
+	14, // 20: api.scrip.Scrip.PersonReplyScrip:output_type -> api.common.ChatRecordInfo
+	9,  // 21: api.scrip.Scrip.DeleteScripByPersonID:output_type -> google.protobuf.Empty
+	9,  // 22: api.scrip.Scrip.ReportScrip:output_type -> google.protobuf.Empty
+	9,  // 23: api.scrip.Scrip.CronDeleteOldScrip:output_type -> google.protobuf.Empty
+	14, // 24: api.scrip.Scrip.PersonStarScrip:output_type -> api.common.ChatRecordInfo
+	9,  // 25: api.scrip.Scrip.SetScripPass:output_type -> google.protobuf.Empty
+	13, // [13:26] is the sub-list for method output_type
+	0,  // [0:13] is the sub-list for method input_type
 	0,  // [0:0] is the sub-list for extension type_name
 	0,  // [0:0] is the sub-list for extension extendee
 	0,  // [0:0] is the sub-list for field type_name

+ 2 - 0
api/scrip/scrip.proto

@@ -36,4 +36,6 @@ service Scrip {
   rpc CronDeleteOldScrip (google.protobuf.Empty) returns (google.protobuf.Empty){};
   // 小纸条点赞
   rpc PersonStarScrip (common.ReplyStarRequest) returns (common.ChatRecordInfo){};
+  // 通过小纸条
+  rpc SetScripPass (common.ScripID) returns (google.protobuf.Empty){};
 }

+ 38 - 0
api/scrip/scrip_grpc.pb.go

@@ -44,6 +44,8 @@ type ScripClient interface {
 	CronDeleteOldScrip(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 小纸条点赞
 	PersonStarScrip(ctx context.Context, in *common.ReplyStarRequest, opts ...grpc.CallOption) (*common.ChatRecordInfo, error)
+	// 通过小纸条
+	SetScripPass(ctx context.Context, in *common.ScripID, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type scripClient struct {
@@ -162,6 +164,15 @@ func (c *scripClient) PersonStarScrip(ctx context.Context, in *common.ReplyStarR
 	return out, nil
 }
 
+func (c *scripClient) SetScripPass(ctx context.Context, in *common.ScripID, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.scrip.Scrip/SetScripPass", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // ScripServer is the server API for Scrip service.
 // All implementations must embed UnimplementedScripServer
 // for forward compatibility
@@ -190,6 +201,8 @@ type ScripServer interface {
 	CronDeleteOldScrip(context.Context, *emptypb.Empty) (*emptypb.Empty, error)
 	// 小纸条点赞
 	PersonStarScrip(context.Context, *common.ReplyStarRequest) (*common.ChatRecordInfo, error)
+	// 通过小纸条
+	SetScripPass(context.Context, *common.ScripID) (*emptypb.Empty, error)
 	mustEmbedUnimplementedScripServer()
 }
 
@@ -233,6 +246,9 @@ func (UnimplementedScripServer) CronDeleteOldScrip(context.Context, *emptypb.Emp
 func (UnimplementedScripServer) PersonStarScrip(context.Context, *common.ReplyStarRequest) (*common.ChatRecordInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PersonStarScrip not implemented")
 }
+func (UnimplementedScripServer) SetScripPass(context.Context, *common.ScripID) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SetScripPass not implemented")
+}
 func (UnimplementedScripServer) mustEmbedUnimplementedScripServer() {}
 
 // UnsafeScripServer may be embedded to opt out of forward compatibility for this service.
@@ -462,6 +478,24 @@ func _Scrip_PersonStarScrip_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Scrip_SetScripPass_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ScripID)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ScripServer).SetScripPass(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.scrip.Scrip/SetScripPass",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ScripServer).SetScripPass(ctx, req.(*common.ScripID))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Scrip_ServiceDesc is the grpc.ServiceDesc for Scrip service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -517,6 +551,10 @@ var Scrip_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "PersonStarScrip",
 			Handler:    _Scrip_PersonStarScrip_Handler,
 		},
+		{
+			MethodName: "SetScripPass",
+			Handler:    _Scrip_SetScripPass_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "scrip.proto",

+ 6 - 1
js/api/manager/manager_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,ManagerFindCanHandpickUserListRequest,ManagerFindCanHandpickUserListReply,ManagerSetHandpickUserRequest,ManagerSetHandpickUserOneRequest,PersonIDParam,PersonIDList,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,ManagerLoginRequest,LoginToken,ManagerFindRoomListRequest,ManagerFindRoomListReply,ManagerFindChatRecordListRequest,ChatRecordListReply,ManagerFindScripListRequest,ManagerScripReply,ManagerFindScripListV2Request,ManagerScripV2Reply,ManagerUpdateScripTextRequest,ManagerUpdateScripPictureRequest,IDParam,Ids,ManagerFindReportListRequest,ManagerFindReportListReply,ManagerFindReportDetailsListRequest,ManagerFindReportDetailsListReply} from "../common/common_pb";
+import {ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,ManagerFindCanHandpickUserListRequest,ManagerFindCanHandpickUserListReply,ManagerSetHandpickUserRequest,ManagerSetHandpickUserOneRequest,PersonIDParam,PersonIDList,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,ManagerLoginRequest,LoginToken,ManagerFindRoomListRequest,ManagerFindRoomListReply,ManagerFindChatRecordListRequest,ChatRecordListReply,ManagerFindScripListRequest,ManagerScripReply,ManagerFindScripListV2Request,ManagerScripV2Reply,ManagerUpdateScripTextRequest,ManagerUpdateScripPictureRequest,IDParam,Ids,ManagerFindReportListRequest,ManagerFindReportListReply,ManagerFindReportDetailsListRequest,ManagerFindReportDetailsListReply,ScripID} from "../common/common_pb";
 import {ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerReMarkHighQualityUserRequest,ManagerUpdateUserSexRequest,ManagerUpdateUserCreditRequest,OnlinePersonReply,FindOnlinePersonRequest,ManagerUserUnsubscribeRequest,ManagerAddBlackPictureRequest,ManagerFindScripAllListRequest} from "./manager_pb";
 import {FindOnlinePersonReply,FindOnlineCanMatchingPersonReply,SendMsgReply} from "../websocket/websocket_pb";
 
@@ -200,6 +200,11 @@ const ManagerService = {
 	const res = await request.post<{ data: ManagerScripReply, code: string, message: string }>('/api/manager/scrip/all/list', req);
     return res.data.data;
   },
+  /**  通过小纸条 */
+  SetScripPass: async (req?: ScripID) => {
+	const res = await request.post('/api/manager/scrip/pass', req);
+    return res.data.data;
+  },
 
 };