http发消息

api/chat/chat.proto

@@ -101,6 +101,15 @@ service Chat {
   rpc ManagerFindReportDetailsList (common.ManagerFindReportDetailsListRequest) returns (common.ManagerFindReportDetailsListReply){};
   // 用户被拉黑后删除精选中的小纸条
   rpc DeleteScripByPersonID (common.PersonIDParam) returns (google.protobuf.Empty){};
+  // 发送消息
+  rpc SendMessage (SendMessageRequest) returns (google.protobuf.Empty){};
+}
+
+message SendMessageRequest{
+  int64 roomId = 1;// 房间ID
+  common.Message message = 2;// 消息
+  string msgType = 3;// 消息类型
+  string personId = 4;// 发送人的ID
 }
 
 message GetOnlinePersonNumReply{

api/chat/chat_grpc.pb.go

@@ -109,6 +109,8 @@ type ChatClient interface {
 	ManagerFindReportDetailsList(ctx context.Context, in *common.ManagerFindReportDetailsListRequest, opts ...grpc.CallOption) (*common.ManagerFindReportDetailsListReply, error)
 	// 用户被拉黑后删除精选中的小纸条
 	DeleteScripByPersonID(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 发送消息
+	SendMessage(ctx context.Context, in *SendMessageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type chatClient struct {
@@ -497,6 +499,15 @@ func (c *chatClient) DeleteScripByPersonID(ctx context.Context, in *common.Perso
 	return out, nil
 }
 
+func (c *chatClient) SendMessage(ctx context.Context, in *SendMessageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.chat.Chat/SendMessage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // ChatServer is the server API for Chat service.
 // All implementations must embed UnimplementedChatServer
 // for forward compatibility
@@ -590,6 +601,8 @@ type ChatServer interface {
 	ManagerFindReportDetailsList(context.Context, *common.ManagerFindReportDetailsListRequest) (*common.ManagerFindReportDetailsListReply, error)
 	// 用户被拉黑后删除精选中的小纸条
 	DeleteScripByPersonID(context.Context, *common.PersonIDParam) (*emptypb.Empty, error)
+	// 发送消息
+	SendMessage(context.Context, *SendMessageRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedChatServer()
 }
 
@@ -723,6 +736,9 @@ func (UnimplementedChatServer) ManagerFindReportDetailsList(context.Context, *co
 func (UnimplementedChatServer) DeleteScripByPersonID(context.Context, *common.PersonIDParam) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteScripByPersonID not implemented")
 }
+func (UnimplementedChatServer) SendMessage(context.Context, *SendMessageRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SendMessage not implemented")
+}
 func (UnimplementedChatServer) mustEmbedUnimplementedChatServer() {}
 
 // UnsafeChatServer may be embedded to opt out of forward compatibility for this service.
@@ -1492,6 +1508,24 @@ func _Chat_DeleteScripByPersonID_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Chat_SendMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SendMessageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ChatServer).SendMessage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.chat.Chat/SendMessage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ChatServer).SendMessage(ctx, req.(*SendMessageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Chat_ServiceDesc is the grpc.ServiceDesc for Chat service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1667,6 +1701,10 @@ var Chat_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "DeleteScripByPersonID",
 			Handler:    _Chat_DeleteScripByPersonID_Handler,
 		},
+		{
+			MethodName: "SendMessage",
+			Handler:    _Chat_SendMessage_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "chat.proto",

api/user/user.proto

@@ -461,6 +461,14 @@ service User {
       body:"*"
     };
   };
+  // 用户发送消息
+  // 发送消息
+  rpc SendMessage (SendMessageRequest) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/user/message/send",
+      body:"*"
+    };
+  };
 
   // ---manager---
   // 管理员查询用户列表
@@ -613,6 +621,12 @@ service User {
   rpc GetRecommendUserDB(GetRecommendUserDBRequest) returns(common.PersonDB){}
 }
 
+message SendMessageRequest{
+  int64 roomId = 1;// 房间ID
+  common.Message message = 2;// 消息
+  string msgType = 3;// 消息类型
+}
+
 message ManagerFindIsCheckQualityUserListRequest{
   int64 page = 1;
   int64 pageSize = 2;

api/user/user_grpc.pb.go

@@ -150,6 +150,9 @@ type UserClient interface {
 	UpdateUserIsRegister(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 创建用户与接待员的关联
 	CreateUserPartnerRoom(ctx context.Context, in *common.CreateChatRoomParam, opts ...grpc.CallOption) (*chat.RoomReply, error)
+	// 用户发送消息
+	// 发送消息
+	SendMessage(ctx context.Context, in *SendMessageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// ---manager---
 	// 管理员查询用户列表
 	ManagerFindUserList(ctx context.Context, in *common.ManagerFindPersonListRequest, opts ...grpc.CallOption) (*common.ManagerFindPersonListReply, error)
@@ -795,6 +798,15 @@ func (c *userClient) CreateUserPartnerRoom(ctx context.Context, in *common.Creat
 	return out, nil
 }
 
+func (c *userClient) SendMessage(ctx context.Context, in *SendMessageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.user.User/SendMessage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *userClient) ManagerFindUserList(ctx context.Context, in *common.ManagerFindPersonListRequest, opts ...grpc.CallOption) (*common.ManagerFindPersonListReply, error) {
 	out := new(common.ManagerFindPersonListReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/ManagerFindUserList", in, out, opts...)
@@ -1224,6 +1236,9 @@ type UserServer interface {
 	UpdateUserIsRegister(context.Context, *emptypb.Empty) (*emptypb.Empty, error)
 	// 创建用户与接待员的关联
 	CreateUserPartnerRoom(context.Context, *common.CreateChatRoomParam) (*chat.RoomReply, error)
+	// 用户发送消息
+	// 发送消息
+	SendMessage(context.Context, *SendMessageRequest) (*emptypb.Empty, error)
 	// ---manager---
 	// 管理员查询用户列表
 	ManagerFindUserList(context.Context, *common.ManagerFindPersonListRequest) (*common.ManagerFindPersonListReply, error)
@@ -1488,6 +1503,9 @@ func (UnimplementedUserServer) UpdateUserIsRegister(context.Context, *emptypb.Em
 func (UnimplementedUserServer) CreateUserPartnerRoom(context.Context, *common.CreateChatRoomParam) (*chat.RoomReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateUserPartnerRoom not implemented")
 }
+func (UnimplementedUserServer) SendMessage(context.Context, *SendMessageRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SendMessage not implemented")
+}
 func (UnimplementedUserServer) ManagerFindUserList(context.Context, *common.ManagerFindPersonListRequest) (*common.ManagerFindPersonListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ManagerFindUserList not implemented")
 }
@@ -2734,6 +2752,24 @@ func _User_CreateUserPartnerRoom_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_SendMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SendMessageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).SendMessage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/SendMessage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).SendMessage(ctx, req.(*SendMessageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _User_ManagerFindUserList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(common.ManagerFindPersonListRequest)
 	if err := dec(in); err != nil {
@@ -3587,6 +3623,10 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "CreateUserPartnerRoom",
 			Handler:    _User_CreateUserPartnerRoom_Handler,
 		},
+		{
+			MethodName: "SendMessage",
+			Handler:    _User_SendMessage_Handler,
+		},
 		{
 			MethodName: "ManagerFindUserList",
 			Handler:    _User_ManagerFindUserList_Handler,

api/user/user_http.pb.go

@@ -90,6 +90,7 @@ type UserHTTPServer interface {
 	RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error)
 	RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error)
 	Report(context.Context, *common.ReportChatRequest) (*emptypb.Empty, error)
+	SendMessage(context.Context, *SendMessageRequest) (*emptypb.Empty, error)
 	SendPhoneCode(context.Context, *common.SendPhoneCodeRequest) (*emptypb.Empty, error)
 	UnlockLookRecord(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	UnlockPicture(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
@@ -176,6 +177,7 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/unlock/picture", _User_UnlockPicture0_HTTP_Handler(srv))
 	r.POST("/api/user/update/register", _User_UpdateUserIsRegister0_HTTP_Handler(srv))
 	r.POST("/api/user/create/room/partner", _User_CreateUserPartnerRoom0_HTTP_Handler(srv))
+	r.POST("/api/user/message/send", _User_SendMessage0_HTTP_Handler(srv))
 	r.POST("/api/manager/user/list", _User_ManagerFindUserList0_HTTP_Handler(srv))
 	r.POST("/api/manager/user/list/information", _User_ManagerFindInformationUserList0_HTTP_Handler(srv))
 	r.POST("/api/manager/user/list/ischeckquality", _User_ManagerFindIsCheckQualityUserList0_HTTP_Handler(srv))
@@ -1895,6 +1897,33 @@ func _User_CreateUserPartnerRoom0_HTTP_Handler(srv UserHTTPServer) func(ctx http
 	}
 }
 
+func _User_SendMessage0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in SendMessageRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/SendMessage")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.SendMessage(ctx, req.(*SendMessageRequest))
+		})
+		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 _User_ManagerFindUserList0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
 		var in common.ManagerFindPersonListRequest
@@ -2388,6 +2417,7 @@ type UserHTTPClient interface {
 	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)
+	SendMessage(ctx context.Context, req *SendMessageRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	SendPhoneCode(ctx context.Context, req *common.SendPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UnlockLookRecord(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UnlockPicture(ctx context.Context, req *common.RoomIDRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
@@ -3197,6 +3227,19 @@ func (c *UserHTTPClientImpl) Report(ctx context.Context, in *common.ReportChatRe
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) SendMessage(ctx context.Context, in *SendMessageRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
+	var out emptypb.Empty
+	pattern := "/api/user/message/send"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/SendMessage"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *UserHTTPClientImpl) SendPhoneCode(ctx context.Context, in *common.SendPhoneCodeRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
 	pattern := "/api/user/code/send"

define/account.go

@@ -18,3 +18,7 @@ var (
 	TypeScripNormal = "normal" // 正常发布 （在精选表中）
 	TypeScripDelete = "delete" // 用户删除
 )
+
+var (
+	ErrorTypeWebsocketConnect = "WebsocketConnect"
+)

js/api/chat/chat_pb.ts

@@ -1,3 +1,15 @@
+import {Message} from "../common/common_pb";
+
+export interface SendMessageRequest{
+    /**  房间ID */
+    roomId?:number;
+    /**  消息 */
+    message?:Message;
+    /**  消息类型 */
+    msgType?:string;
+    /**  发送人的ID */
+    personId?:string;
+}
 export interface GetOnlinePersonNumReply{
     num?:number;
 }

js/api/user/user_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest} from "./user_pb";
+import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendMessageRequest,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest} from "./user_pb";
 import {SendPhoneCodeRequest,CheckPhoneCodeRequest,UpdateInformationRequest,CreateChatRoomParam,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,ChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,PartnerIDParam,AddFriendMessageInfo,ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,PersonIDParam,PersonIDList,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,PersonMsg,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,IDParam,PersonDB} from "../common/common_pb";
 import {RoomReply,UnreadNumReply,UserRoomInfo,CheckUserPartnerIsRelationshipReply,WindowInfo,GetRandomMatchingReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";
@@ -323,6 +323,12 @@ const UserService = {
 	const res = await request.post<{ data: RoomReply, code: string, message: string }>('/api/user/create/room/partner', req);
     return res.data.data;
   },
+  /**  用户发送消息
+// 发送消息 */
+  SendMessage: async (req?: SendMessageRequest) => {
+	const res = await request.post('/api/user/message/send', req);
+    return res.data.data;
+  },
   /**  ---manager---
 // 管理员查询用户列表 */
   ManagerFindUserList: async (req?: ManagerFindPersonListRequest) => {

js/api/user/user_pb.ts

@@ -1,5 +1,13 @@
 import {Message} from "../common/common_pb";
 
+export interface SendMessageRequest{
+    /**  房间ID */
+    roomId?:number;
+    /**  消息 */
+    message?:Message;
+    /**  消息类型 */
+    msgType?:string;
+}
 export interface ManagerFindIsCheckQualityUserListRequest{
     page?:number;
     pageSize?:number;