From 0c417d347100fd77a948451d3b9e6c371217bf76 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 28 Feb 2023 15:53:38 +0800 Subject: [PATCH] pb --- internal/api/manage/management_user.go | 14 +- internal/msggateway/logic.go | 2 +- internal/msggateway/relay_rpc_server.go | 62 ++--- internal/msggateway/ws_server.go | 6 +- internal/rpc/auth/auth.go | 6 +- pkg/apistruct/manage.go | 2 +- .../{relay.pb.go => msg_gateway.pb.go} | 250 +++++++++--------- pkg/proto/msggateway/msg_gateway.proto | 2 +- 8 files changed, 173 insertions(+), 171 deletions(-) rename pkg/proto/msggateway/{relay.pb.go => msg_gateway.pb.go} (78%) diff --git a/internal/api/manage/management_user.go b/internal/api/manage/management_user.go index d519056ad..3b53d6430 100644 --- a/internal/api/manage/management_user.go +++ b/internal/api/manage/management_user.go @@ -12,7 +12,7 @@ import ( "OpenIM/pkg/common/constant" "OpenIM/pkg/common/log" "OpenIM/pkg/common/tokenverify" - pbRelay "OpenIM/pkg/proto/relay" + msggateway "OpenIM/pkg/proto/relay" rpc "OpenIM/pkg/proto/user" "OpenIM/pkg/utils" "context" @@ -138,7 +138,7 @@ func GetUsersOnlineStatus(c *gin.Context) { c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) return } - req := &pbRelay.GetUsersOnlineStatusReq{} + req := &msggateway.GetUsersOnlineStatusReq{} utils.CopyStructFields(req, ¶ms) var ok bool @@ -152,12 +152,12 @@ func GetUsersOnlineStatus(c *gin.Context) { } log.NewInfo(params.OperationID, "GetUsersOnlineStatus args ", req.String()) - var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult - var respResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult + var wsResult []*msggateway.GetUsersOnlineStatusResp_SuccessResult + var respResult []*msggateway.GetUsersOnlineStatusResp_SuccessResult flag := false grpcCons := rpc.GetDefaultGatewayConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), params.OperationID) for _, v := range grpcCons { - client := pbRelay.NewRelayClient(v) + client := msggateway.NewRelayClient(v) reply, err := client.GetUsersOnlineStatus(context.Background(), req) if err != nil { log.NewError(params.OperationID, "GetUsersOnlineStatus rpc err", req.String(), err.Error()) @@ -172,7 +172,7 @@ func GetUsersOnlineStatus(c *gin.Context) { //Online data merge of each node for _, v1 := range params.UserIDList { flag = false - temp := new(pbRelay.GetUsersOnlineStatusResp_SuccessResult) + temp := new(msggateway.GetUsersOnlineStatusResp_SuccessResult) for _, v2 := range wsResult { if v2.UserID == v1 { flag = true @@ -190,7 +190,7 @@ func GetUsersOnlineStatus(c *gin.Context) { } resp := api.GetUsersOnlineStatusResp{CommResp: api.CommResp{ErrCode: 0, ErrMsg: ""}, SuccessResult: respResult} if len(respResult) == 0 { - resp.SuccessResult = []*pbRelay.GetUsersOnlineStatusResp_SuccessResult{} + resp.SuccessResult = []*msggateway.GetUsersOnlineStatusResp_SuccessResult{} } log.NewInfo(req.OperationID, "GetUsersOnlineStatus api return", resp) c.JSON(http.StatusOK, resp) diff --git a/internal/msggateway/logic.go b/internal/msggateway/logic.go index 1c22b0af4..483ab9497 100644 --- a/internal/msggateway/logic.go +++ b/internal/msggateway/logic.go @@ -8,7 +8,7 @@ import ( pbChat "OpenIM/pkg/proto/msg" push "OpenIM/pkg/proto/push" pbRtc "OpenIM/pkg/proto/rtc" - sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/proto/sdkws" "OpenIM/pkg/utils" "bytes" "context" diff --git a/internal/msggateway/relay_rpc_server.go b/internal/msggateway/relay_rpc_server.go index 290453873..e7b880e1b 100644 --- a/internal/msggateway/relay_rpc_server.go +++ b/internal/msggateway/relay_rpc_server.go @@ -6,7 +6,7 @@ import ( "OpenIM/pkg/common/log" prome "OpenIM/pkg/common/prome" "OpenIM/pkg/common/tokenverify" - pbRelay "OpenIM/pkg/proto/relay" + "OpenIM/pkg/proto/msggateway" sdkws "OpenIM/pkg/proto/sdkws" "OpenIM/pkg/utils" "bytes" @@ -76,7 +76,7 @@ func (r *RPCServer) run() { } srv := grpc.NewServer(grpcOpts...) defer srv.GracefulStop() - pbRelay.RegisterRelayServer(srv, r) + msggateway.RegisterRelayServer(srv, r) rpcRegisterIP := config.Config.RpcRegisterIP if config.Config.RpcRegisterIP == "" { @@ -97,9 +97,9 @@ func (r *RPCServer) run() { return } } -func (r *RPCServer) OnlinePushMsg(_ context.Context, in *pbRelay.OnlinePushMsgReq) (*pbRelay.OnlinePushMsgResp, error) { +func (r *RPCServer) OnlinePushMsg(_ context.Context, in *msggateway.OnlinePushMsgReq) (*msggateway.OnlinePushMsgResp, error) { log.NewInfo(in.OperationID, "PushMsgToUser is arriving", in.String()) - var resp []*pbRelay.SingleMsgToUserPlatform + var resp []*msggateway.SingleMsgToUserPlatform msgBytes, _ := proto.Marshal(in.MsgData) mReply := Resp{ ReqIdentifier: constant.WSPushMsg, @@ -118,14 +118,14 @@ func (r *RPCServer) OnlinePushMsg(_ context.Context, in *pbRelay.OnlinePushMsgRe if conn := ws.getUserConn(recvID, v); conn != nil { tag = true resultCode := sendMsgToUser(conn, replyBytes.Bytes(), in, v, recvID) - temp := &pbRelay.SingleMsgToUserPlatform{ + temp := &msggateway.SingleMsgToUserPlatform{ ResultCode: resultCode, RecvID: recvID, RecvPlatFormID: int32(v), } resp = append(resp, temp) } else { - temp := &pbRelay.SingleMsgToUserPlatform{ + temp := &msggateway.SingleMsgToUserPlatform{ ResultCode: -1, RecvID: recvID, RecvPlatFormID: int32(v), @@ -136,24 +136,24 @@ func (r *RPCServer) OnlinePushMsg(_ context.Context, in *pbRelay.OnlinePushMsgRe if !tag { log.NewDebug(in.OperationID, "push err ,no matched ws conn not in map", in.String()) } - return &pbRelay.OnlinePushMsgResp{ + return &msggateway.OnlinePushMsgResp{ Resp: resp, }, nil } -func (r *RPCServer) GetUsersOnlineStatus(_ context.Context, req *pbRelay.GetUsersOnlineStatusReq) (*pbRelay.GetUsersOnlineStatusResp, error) { +func (r *RPCServer) GetUsersOnlineStatus(_ context.Context, req *msggateway.GetUsersOnlineStatusReq) (*msggateway.GetUsersOnlineStatusResp, error) { log.NewInfo(req.OperationID, "rpc GetUsersOnlineStatus arrived server", req.String()) if !tokenverify.IsManagerUserID(req.OpUserID) { log.NewError(req.OperationID, "no permission GetUsersOnlineStatus ", req.OpUserID) - return &pbRelay.GetUsersOnlineStatusResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &msggateway.GetUsersOnlineStatusResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil } - var resp pbRelay.GetUsersOnlineStatusResp + var resp msggateway.GetUsersOnlineStatusResp for _, userID := range req.UserIDList { - temp := new(pbRelay.GetUsersOnlineStatusResp_SuccessResult) + temp := new(msggateway.GetUsersOnlineStatusResp_SuccessResult) temp.UserID = userID userConnMap := ws.getUserAllCons(userID) for platform, userConn := range userConnMap { if userConn != nil { - ps := new(pbRelay.GetUsersOnlineStatusResp_SuccessDetail) + ps := new(msggateway.GetUsersOnlineStatusResp_SuccessDetail) ps.Platform = constant.PlatformIDToName(platform) ps.Status = constant.OnlineStatus ps.ConnID = userConn.connID @@ -171,9 +171,9 @@ func (r *RPCServer) GetUsersOnlineStatus(_ context.Context, req *pbRelay.GetUser return &resp, nil } -func (r *RPCServer) SuperGroupOnlineBatchPushOneMsg(_ context.Context, req *pbRelay.OnlineBatchPushOneMsgReq) (*pbRelay.OnlineBatchPushOneMsgResp, error) { +func (r *RPCServer) SuperGroupOnlineBatchPushOneMsg(_ context.Context, req *msggateway.OnlineBatchPushOneMsgReq) (*msggateway.OnlineBatchPushOneMsgResp, error) { log.NewInfo(req.OperationID, "BatchPushMsgToUser is arriving", req.String()) - var singleUserResult []*pbRelay.SingelMsgToUserResultList + var singleUserResult []*msggateway.SingelMsgToUserResultList //r.GetBatchMsgForPush(req.OperationID,req.MsgData,req.PushToUserIDList,) msgBytes, _ := proto.Marshal(req.MsgData) mReply := Resp{ @@ -188,14 +188,14 @@ func (r *RPCServer) SuperGroupOnlineBatchPushOneMsg(_ context.Context, req *pbRe log.NewError(req.OperationID, "data encode err", err.Error()) } for _, v := range req.PushToUserIDList { - var resp []*pbRelay.SingleMsgToUserPlatform - tempT := &pbRelay.SingelMsgToUserResultList{ + var resp []*msggateway.SingleMsgToUserPlatform + tempT := &msggateway.SingelMsgToUserResultList{ UserID: v, } userConnMap := ws.getUserAllCons(v) for platform, userConn := range userConnMap { if userConn != nil { - temp := &pbRelay.SingleMsgToUserPlatform{ + temp := &msggateway.SingleMsgToUserPlatform{ RecvID: v, RecvPlatFormID: int32(platform), } @@ -218,17 +218,17 @@ func (r *RPCServer) SuperGroupOnlineBatchPushOneMsg(_ context.Context, req *pbRe singleUserResult = append(singleUserResult, tempT) } - return &pbRelay.OnlineBatchPushOneMsgResp{ + return &msggateway.OnlineBatchPushOneMsgResp{ SinglePushResult: singleUserResult, }, nil } -func (r *RPCServer) OnlineBatchPushOneMsg(_ context.Context, req *pbRelay.OnlineBatchPushOneMsgReq) (*pbRelay.OnlineBatchPushOneMsgResp, error) { +func (r *RPCServer) OnlineBatchPushOneMsg(_ context.Context, req *msggateway.OnlineBatchPushOneMsgReq) (*msggateway.OnlineBatchPushOneMsgResp, error) { log.NewInfo(req.OperationID, "BatchPushMsgToUser is arriving", req.String()) - var singleUserResult []*pbRelay.SingelMsgToUserResultList + var singleUserResult []*msggateway.SingelMsgToUserResultList for _, v := range req.PushToUserIDList { - var resp []*pbRelay.SingleMsgToUserPlatform - tempT := &pbRelay.SingelMsgToUserResultList{ + var resp []*msggateway.SingleMsgToUserPlatform + tempT := &msggateway.SingelMsgToUserResultList{ UserID: v, } userConnMap := ws.getUserAllCons(v) @@ -268,7 +268,7 @@ func (r *RPCServer) OnlineBatchPushOneMsg(_ context.Context, req *pbRelay.Online if resultCode == 0 && utils.IsContainInt(platform, r.pushTerminal) { tempT.OnlinePush = true log.Info(req.OperationID, "PushSuperMsgToUser is success By Ws", "args", req.String(), "recv PlatForm", constant.PlatformIDToName(platform), "recvID", v) - temp := &pbRelay.SingleMsgToUserPlatform{ + temp := &msggateway.SingleMsgToUserPlatform{ ResultCode: resultCode, RecvID: v, RecvPlatFormID: int32(platform), @@ -278,7 +278,7 @@ func (r *RPCServer) OnlineBatchPushOneMsg(_ context.Context, req *pbRelay.Online } else { if utils.IsContainInt(platform, r.pushTerminal) { tempT.OnlinePush = true - temp := &pbRelay.SingleMsgToUserPlatform{ + temp := &msggateway.SingleMsgToUserPlatform{ ResultCode: 0, RecvID: v, RecvPlatFormID: int32(platform), @@ -290,7 +290,7 @@ func (r *RPCServer) OnlineBatchPushOneMsg(_ context.Context, req *pbRelay.Online tempT.Resp = resp singleUserResult = append(singleUserResult, tempT) } - return &pbRelay.OnlineBatchPushOneMsgResp{ + return &msggateway.OnlineBatchPushOneMsgResp{ SinglePushResult: singleUserResult, }, nil } @@ -317,7 +317,7 @@ func (r *RPCServer) encodeWsData(wsData *sdkws.MsgData, operationID string) (byt return replyBytes, nil } -func (r *RPCServer) KickUserOffline(_ context.Context, req *pbRelay.KickUserOfflineReq) (*pbRelay.KickUserOfflineResp, error) { +func (r *RPCServer) KickUserOffline(_ context.Context, req *msggateway.KickUserOfflineReq) (*msggateway.KickUserOfflineResp, error) { log.NewInfo(req.OperationID, "KickUserOffline is arriving", req.String()) for _, v := range req.KickUserIDList { log.NewWarn(req.OperationID, "SetTokenKicked ", v, req.PlatformID, req.OperationID) @@ -329,16 +329,16 @@ func (r *RPCServer) KickUserOffline(_ context.Context, req *pbRelay.KickUserOffl conn.Close() } } - return &pbRelay.KickUserOfflineResp{}, nil + return &msggateway.KickUserOfflineResp{}, nil } -func (r *RPCServer) MultiTerminalLoginCheck(ctx context.Context, req *pbRelay.MultiTerminalLoginCheckReq) (*pbRelay.MultiTerminalLoginCheckResp, error) { +func (r *RPCServer) MultiTerminalLoginCheck(ctx context.Context, req *msggateway.MultiTerminalLoginCheckReq) (*msggateway.MultiTerminalLoginCheckResp, error) { ws.MultiTerminalLoginCheckerWithLock(req.UserID, int(req.PlatformID), req.Token, req.OperationID) - return &pbRelay.MultiTerminalLoginCheckResp{}, nil + return &msggateway.MultiTerminalLoginCheckResp{}, nil } -func sendMsgToUser(conn *UserConn, bMsg []byte, in *pbRelay.OnlinePushMsgReq, RecvPlatForm int, RecvID string) (ResultCode int64) { +func sendMsgToUser(conn *UserConn, bMsg []byte, in *msggateway.OnlinePushMsgReq, RecvPlatForm int, RecvID string) (ResultCode int64) { err := ws.writeMsg(conn, websocket.BinaryMessage, bMsg) if err != nil { log.NewError(in.OperationID, "PushMsgToUser is failed By Ws", "Addr", conn.RemoteAddr().String(), @@ -352,7 +352,7 @@ func sendMsgToUser(conn *UserConn, bMsg []byte, in *pbRelay.OnlinePushMsgReq, Re } } -func sendMsgBatchToUser(conn *UserConn, bMsg []byte, in *pbRelay.OnlineBatchPushOneMsgReq, RecvPlatForm int, RecvID string) (ResultCode int64) { +func sendMsgBatchToUser(conn *UserConn, bMsg []byte, in *msggateway.OnlineBatchPushOneMsgReq, RecvPlatForm int, RecvID string) (ResultCode int64) { err := ws.writeMsg(conn, websocket.BinaryMessage, bMsg) if err != nil { log.NewError(in.OperationID, "PushMsgToUser is failed By Ws", "Addr", conn.RemoteAddr().String(), diff --git a/internal/msggateway/ws_server.go b/internal/msggateway/ws_server.go index c8b70be2e..d744dc098 100644 --- a/internal/msggateway/ws_server.go +++ b/internal/msggateway/ws_server.go @@ -6,7 +6,7 @@ import ( "OpenIM/pkg/common/log" prome "OpenIM/pkg/common/prome" "OpenIM/pkg/common/tokenverify" - pbRelay "OpenIM/pkg/proto/relay" + msggateway "OpenIM/pkg/proto/relay" "OpenIM/pkg/utils" "bytes" "compress/gzip" @@ -166,8 +166,8 @@ func (ws *WServer) MultiTerminalLoginRemoteChecker(userID string, platformID int continue } log.Debug(operationID, "call this node ", v.Target(), rpcSvr.target) - client := pbRelay.NewRelayClient(v) - req := &pbRelay.MultiTerminalLoginCheckReq{OperationID: operationID, PlatformID: platformID, UserID: userID, Token: token} + client := msggateway.NewRelayClient(v) + req := &msggateway.MultiTerminalLoginCheckReq{OperationID: operationID, PlatformID: platformID, UserID: userID, Token: token} log.NewInfo(operationID, "MultiTerminalLoginCheckReq ", client, req.String()) resp, err := client.MultiTerminalLoginCheck(context.Background(), req) if err != nil { diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index bf26f3ca1..af94e0d43 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -13,7 +13,7 @@ import ( "OpenIM/pkg/common/tracelog" discoveryRegistry "OpenIM/pkg/discoveryregistry" pbAuth "OpenIM/pkg/proto/auth" - pbRelay "OpenIM/pkg/proto/relay" + msggateway "OpenIM/pkg/proto/relay" "OpenIM/pkg/utils" "context" "github.com/OpenIMSDK/openKeeper" @@ -108,8 +108,8 @@ func (s *authServer) forceKickOff(ctx context.Context, userID string, platformID return err } for _, v := range grpcCons { - client := pbRelay.NewRelayClient(v) - kickReq := &pbRelay.KickUserOfflineReq{OperationID: operationID, KickUserIDList: []string{userID}, PlatformID: platformID} + client := msggateway.NewRelayClient(v) + kickReq := &msggateway.KickUserOfflineReq{OperationID: operationID, KickUserIDList: []string{userID}, PlatformID: platformID} log.NewInfo(operationID, "KickUserOffline ", client, kickReq.String()) _, err := client.KickUserOffline(ctx, kickReq) return utils.Wrap(err, "") diff --git a/pkg/apistruct/manage.go b/pkg/apistruct/manage.go index 3f0cc5998..df781ce3b 100644 --- a/pkg/apistruct/manage.go +++ b/pkg/apistruct/manage.go @@ -25,7 +25,7 @@ type GetUsersOnlineStatusReq struct { } type GetUsersOnlineStatusResp struct { CommResp - //SuccessResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult `json:"data"` + //SuccessResult []*msggateway.GetUsersOnlineStatusResp_SuccessResult `json:"data"` } type AccountCheckReq struct { OperationID string `json:"operationID" binding:"required"` diff --git a/pkg/proto/msggateway/relay.pb.go b/pkg/proto/msggateway/msg_gateway.pb.go similarity index 78% rename from pkg/proto/msggateway/relay.pb.go rename to pkg/proto/msggateway/msg_gateway.pb.go index 2dc38605b..d8485fa2b 100644 --- a/pkg/proto/msggateway/relay.pb.go +++ b/pkg/proto/msggateway/msg_gateway.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: relay/relay.proto +// source: msggateway/msg_gateway.proto -package pbRelay // import "OpenIM/pkg/proto/relay" +package pbMsggateway // import "OpenIM/pkg/proto/msggateway" import proto "github.com/golang/protobuf/proto" import fmt "fmt" @@ -37,7 +37,7 @@ func (m *OnlinePushMsgReq) Reset() { *m = OnlinePushMsgReq{} } func (m *OnlinePushMsgReq) String() string { return proto.CompactTextString(m) } func (*OnlinePushMsgReq) ProtoMessage() {} func (*OnlinePushMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{0} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{0} } func (m *OnlinePushMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OnlinePushMsgReq.Unmarshal(m, b) @@ -89,7 +89,7 @@ func (m *OnlinePushMsgResp) Reset() { *m = OnlinePushMsgResp{} } func (m *OnlinePushMsgResp) String() string { return proto.CompactTextString(m) } func (*OnlinePushMsgResp) ProtoMessage() {} func (*OnlinePushMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{1} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{1} } func (m *OnlinePushMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OnlinePushMsgResp.Unmarshal(m, b) @@ -116,7 +116,7 @@ func (m *OnlinePushMsgResp) GetResp() []*SingleMsgToUserPlatform { return nil } -type SingelMsgToUserResultList struct { +type SingleMsgToUserResultList struct { UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` Resp []*SingleMsgToUserPlatform `protobuf:"bytes,2,rep,name=resp" json:"resp,omitempty"` OnlinePush bool `protobuf:"varint,3,opt,name=onlinePush" json:"onlinePush,omitempty"` @@ -125,45 +125,45 @@ type SingelMsgToUserResultList struct { XXX_sizecache int32 `json:"-"` } -func (m *SingelMsgToUserResultList) Reset() { *m = SingelMsgToUserResultList{} } -func (m *SingelMsgToUserResultList) String() string { return proto.CompactTextString(m) } -func (*SingelMsgToUserResultList) ProtoMessage() {} -func (*SingelMsgToUserResultList) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{2} +func (m *SingleMsgToUserResultList) Reset() { *m = SingleMsgToUserResultList{} } +func (m *SingleMsgToUserResultList) String() string { return proto.CompactTextString(m) } +func (*SingleMsgToUserResultList) ProtoMessage() {} +func (*SingleMsgToUserResultList) Descriptor() ([]byte, []int) { + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{2} } -func (m *SingelMsgToUserResultList) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SingelMsgToUserResultList.Unmarshal(m, b) +func (m *SingleMsgToUserResultList) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SingleMsgToUserResultList.Unmarshal(m, b) } -func (m *SingelMsgToUserResultList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SingelMsgToUserResultList.Marshal(b, m, deterministic) +func (m *SingleMsgToUserResultList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SingleMsgToUserResultList.Marshal(b, m, deterministic) } -func (dst *SingelMsgToUserResultList) XXX_Merge(src proto.Message) { - xxx_messageInfo_SingelMsgToUserResultList.Merge(dst, src) +func (dst *SingleMsgToUserResultList) XXX_Merge(src proto.Message) { + xxx_messageInfo_SingleMsgToUserResultList.Merge(dst, src) } -func (m *SingelMsgToUserResultList) XXX_Size() int { - return xxx_messageInfo_SingelMsgToUserResultList.Size(m) +func (m *SingleMsgToUserResultList) XXX_Size() int { + return xxx_messageInfo_SingleMsgToUserResultList.Size(m) } -func (m *SingelMsgToUserResultList) XXX_DiscardUnknown() { - xxx_messageInfo_SingelMsgToUserResultList.DiscardUnknown(m) +func (m *SingleMsgToUserResultList) XXX_DiscardUnknown() { + xxx_messageInfo_SingleMsgToUserResultList.DiscardUnknown(m) } -var xxx_messageInfo_SingelMsgToUserResultList proto.InternalMessageInfo +var xxx_messageInfo_SingleMsgToUserResultList proto.InternalMessageInfo -func (m *SingelMsgToUserResultList) GetUserID() string { +func (m *SingleMsgToUserResultList) GetUserID() string { if m != nil { return m.UserID } return "" } -func (m *SingelMsgToUserResultList) GetResp() []*SingleMsgToUserPlatform { +func (m *SingleMsgToUserResultList) GetResp() []*SingleMsgToUserPlatform { if m != nil { return m.Resp } return nil } -func (m *SingelMsgToUserResultList) GetOnlinePush() bool { +func (m *SingleMsgToUserResultList) GetOnlinePush() bool { if m != nil { return m.OnlinePush } @@ -183,7 +183,7 @@ func (m *OnlineBatchPushOneMsgReq) Reset() { *m = OnlineBatchPushOneMsgR func (m *OnlineBatchPushOneMsgReq) String() string { return proto.CompactTextString(m) } func (*OnlineBatchPushOneMsgReq) ProtoMessage() {} func (*OnlineBatchPushOneMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{3} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{3} } func (m *OnlineBatchPushOneMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OnlineBatchPushOneMsgReq.Unmarshal(m, b) @@ -225,7 +225,7 @@ func (m *OnlineBatchPushOneMsgReq) GetPushToUserIDList() []string { } type OnlineBatchPushOneMsgResp struct { - SinglePushResult []*SingelMsgToUserResultList `protobuf:"bytes,1,rep,name=singlePushResult" json:"singlePushResult,omitempty"` + SinglePushResult []*SingleMsgToUserResultList `protobuf:"bytes,1,rep,name=singlePushResult" json:"singlePushResult,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -235,7 +235,7 @@ func (m *OnlineBatchPushOneMsgResp) Reset() { *m = OnlineBatchPushOneMsg func (m *OnlineBatchPushOneMsgResp) String() string { return proto.CompactTextString(m) } func (*OnlineBatchPushOneMsgResp) ProtoMessage() {} func (*OnlineBatchPushOneMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{4} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{4} } func (m *OnlineBatchPushOneMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OnlineBatchPushOneMsgResp.Unmarshal(m, b) @@ -255,7 +255,7 @@ func (m *OnlineBatchPushOneMsgResp) XXX_DiscardUnknown() { var xxx_messageInfo_OnlineBatchPushOneMsgResp proto.InternalMessageInfo -func (m *OnlineBatchPushOneMsgResp) GetSinglePushResult() []*SingelMsgToUserResultList { +func (m *OnlineBatchPushOneMsgResp) GetSinglePushResult() []*SingleMsgToUserResultList { if m != nil { return m.SinglePushResult } @@ -275,7 +275,7 @@ func (m *SingleMsgToUserPlatform) Reset() { *m = SingleMsgToUserPlatform func (m *SingleMsgToUserPlatform) String() string { return proto.CompactTextString(m) } func (*SingleMsgToUserPlatform) ProtoMessage() {} func (*SingleMsgToUserPlatform) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{5} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{5} } func (m *SingleMsgToUserPlatform) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SingleMsgToUserPlatform.Unmarshal(m, b) @@ -329,7 +329,7 @@ func (m *GetUsersOnlineStatusReq) Reset() { *m = GetUsersOnlineStatusReq func (m *GetUsersOnlineStatusReq) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusReq) ProtoMessage() {} func (*GetUsersOnlineStatusReq) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{6} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{6} } func (m *GetUsersOnlineStatusReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusReq.Unmarshal(m, b) @@ -384,7 +384,7 @@ func (m *GetUsersOnlineStatusResp) Reset() { *m = GetUsersOnlineStatusRe func (m *GetUsersOnlineStatusResp) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp) ProtoMessage() {} func (*GetUsersOnlineStatusResp) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{7} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{7} } func (m *GetUsersOnlineStatusResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp.Unmarshal(m, b) @@ -448,7 +448,7 @@ func (m *GetUsersOnlineStatusResp_SuccessDetail) Reset() { func (m *GetUsersOnlineStatusResp_SuccessDetail) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp_SuccessDetail) ProtoMessage() {} func (*GetUsersOnlineStatusResp_SuccessDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{7, 0} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{7, 0} } func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Unmarshal(m, b) @@ -509,7 +509,7 @@ func (m *GetUsersOnlineStatusResp_FailedDetail) Reset() { *m = GetUsersO func (m *GetUsersOnlineStatusResp_FailedDetail) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp_FailedDetail) ProtoMessage() {} func (*GetUsersOnlineStatusResp_FailedDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{7, 1} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{7, 1} } func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Unmarshal(m, b) @@ -565,7 +565,7 @@ func (m *GetUsersOnlineStatusResp_SuccessResult) Reset() { func (m *GetUsersOnlineStatusResp_SuccessResult) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp_SuccessResult) ProtoMessage() {} func (*GetUsersOnlineStatusResp_SuccessResult) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{7, 2} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{7, 2} } func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Unmarshal(m, b) @@ -619,7 +619,7 @@ func (m *KickUserOfflineReq) Reset() { *m = KickUserOfflineReq{} } func (m *KickUserOfflineReq) String() string { return proto.CompactTextString(m) } func (*KickUserOfflineReq) ProtoMessage() {} func (*KickUserOfflineReq) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{8} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{8} } func (m *KickUserOfflineReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickUserOfflineReq.Unmarshal(m, b) @@ -670,7 +670,7 @@ func (m *KickUserOfflineResp) Reset() { *m = KickUserOfflineResp{} } func (m *KickUserOfflineResp) String() string { return proto.CompactTextString(m) } func (*KickUserOfflineResp) ProtoMessage() {} func (*KickUserOfflineResp) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{9} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{9} } func (m *KickUserOfflineResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickUserOfflineResp.Unmarshal(m, b) @@ -704,7 +704,7 @@ func (m *MultiTerminalLoginCheckReq) Reset() { *m = MultiTerminalLoginCh func (m *MultiTerminalLoginCheckReq) String() string { return proto.CompactTextString(m) } func (*MultiTerminalLoginCheckReq) ProtoMessage() {} func (*MultiTerminalLoginCheckReq) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{10} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{10} } func (m *MultiTerminalLoginCheckReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MultiTerminalLoginCheckReq.Unmarshal(m, b) @@ -764,7 +764,7 @@ func (m *MultiTerminalLoginCheckResp) Reset() { *m = MultiTerminalLoginC func (m *MultiTerminalLoginCheckResp) String() string { return proto.CompactTextString(m) } func (*MultiTerminalLoginCheckResp) ProtoMessage() {} func (*MultiTerminalLoginCheckResp) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_7fdb1a3cb7bcd264, []int{11} + return fileDescriptor_msg_gateway_318943cf07c76ff1, []int{11} } func (m *MultiTerminalLoginCheckResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MultiTerminalLoginCheckResp.Unmarshal(m, b) @@ -799,21 +799,21 @@ func (m *MultiTerminalLoginCheckResp) GetErrMsg() string { } func init() { - proto.RegisterType((*OnlinePushMsgReq)(nil), "relay.OnlinePushMsgReq") - proto.RegisterType((*OnlinePushMsgResp)(nil), "relay.OnlinePushMsgResp") - proto.RegisterType((*SingelMsgToUserResultList)(nil), "relay.SingelMsgToUserResultList") - proto.RegisterType((*OnlineBatchPushOneMsgReq)(nil), "relay.OnlineBatchPushOneMsgReq") - proto.RegisterType((*OnlineBatchPushOneMsgResp)(nil), "relay.OnlineBatchPushOneMsgResp") - proto.RegisterType((*SingleMsgToUserPlatform)(nil), "relay.SingleMsgToUserPlatform") - proto.RegisterType((*GetUsersOnlineStatusReq)(nil), "relay.GetUsersOnlineStatusReq") - proto.RegisterType((*GetUsersOnlineStatusResp)(nil), "relay.GetUsersOnlineStatusResp") - proto.RegisterType((*GetUsersOnlineStatusResp_SuccessDetail)(nil), "relay.GetUsersOnlineStatusResp.SuccessDetail") - proto.RegisterType((*GetUsersOnlineStatusResp_FailedDetail)(nil), "relay.GetUsersOnlineStatusResp.FailedDetail") - proto.RegisterType((*GetUsersOnlineStatusResp_SuccessResult)(nil), "relay.GetUsersOnlineStatusResp.SuccessResult") - proto.RegisterType((*KickUserOfflineReq)(nil), "relay.KickUserOfflineReq") - proto.RegisterType((*KickUserOfflineResp)(nil), "relay.KickUserOfflineResp") - proto.RegisterType((*MultiTerminalLoginCheckReq)(nil), "relay.MultiTerminalLoginCheckReq") - proto.RegisterType((*MultiTerminalLoginCheckResp)(nil), "relay.MultiTerminalLoginCheckResp") + proto.RegisterType((*OnlinePushMsgReq)(nil), "msggateway.OnlinePushMsgReq") + proto.RegisterType((*OnlinePushMsgResp)(nil), "msggateway.OnlinePushMsgResp") + proto.RegisterType((*SingleMsgToUserResultList)(nil), "msggateway.SingleMsgToUserResultList") + proto.RegisterType((*OnlineBatchPushOneMsgReq)(nil), "msggateway.OnlineBatchPushOneMsgReq") + proto.RegisterType((*OnlineBatchPushOneMsgResp)(nil), "msggateway.OnlineBatchPushOneMsgResp") + proto.RegisterType((*SingleMsgToUserPlatform)(nil), "msggateway.SingleMsgToUserPlatform") + proto.RegisterType((*GetUsersOnlineStatusReq)(nil), "msggateway.GetUsersOnlineStatusReq") + proto.RegisterType((*GetUsersOnlineStatusResp)(nil), "msggateway.GetUsersOnlineStatusResp") + proto.RegisterType((*GetUsersOnlineStatusResp_SuccessDetail)(nil), "msggateway.GetUsersOnlineStatusResp.SuccessDetail") + proto.RegisterType((*GetUsersOnlineStatusResp_FailedDetail)(nil), "msggateway.GetUsersOnlineStatusResp.FailedDetail") + proto.RegisterType((*GetUsersOnlineStatusResp_SuccessResult)(nil), "msggateway.GetUsersOnlineStatusResp.SuccessResult") + proto.RegisterType((*KickUserOfflineReq)(nil), "msggateway.KickUserOfflineReq") + proto.RegisterType((*KickUserOfflineResp)(nil), "msggateway.KickUserOfflineResp") + proto.RegisterType((*MultiTerminalLoginCheckReq)(nil), "msggateway.MultiTerminalLoginCheckReq") + proto.RegisterType((*MultiTerminalLoginCheckResp)(nil), "msggateway.MultiTerminalLoginCheckResp") } // Reference imports to suppress errors if they are not otherwise used. @@ -845,7 +845,7 @@ func NewRelayClient(cc *grpc.ClientConn) RelayClient { func (c *relayClient) OnlinePushMsg(ctx context.Context, in *OnlinePushMsgReq, opts ...grpc.CallOption) (*OnlinePushMsgResp, error) { out := new(OnlinePushMsgResp) - err := grpc.Invoke(ctx, "/relay.relay/OnlinePushMsg", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/msggateway.relay/OnlinePushMsg", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -854,7 +854,7 @@ func (c *relayClient) OnlinePushMsg(ctx context.Context, in *OnlinePushMsgReq, o func (c *relayClient) GetUsersOnlineStatus(ctx context.Context, in *GetUsersOnlineStatusReq, opts ...grpc.CallOption) (*GetUsersOnlineStatusResp, error) { out := new(GetUsersOnlineStatusResp) - err := grpc.Invoke(ctx, "/relay.relay/GetUsersOnlineStatus", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/msggateway.relay/GetUsersOnlineStatus", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -863,7 +863,7 @@ func (c *relayClient) GetUsersOnlineStatus(ctx context.Context, in *GetUsersOnli func (c *relayClient) OnlineBatchPushOneMsg(ctx context.Context, in *OnlineBatchPushOneMsgReq, opts ...grpc.CallOption) (*OnlineBatchPushOneMsgResp, error) { out := new(OnlineBatchPushOneMsgResp) - err := grpc.Invoke(ctx, "/relay.relay/OnlineBatchPushOneMsg", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/msggateway.relay/OnlineBatchPushOneMsg", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -872,7 +872,7 @@ func (c *relayClient) OnlineBatchPushOneMsg(ctx context.Context, in *OnlineBatch func (c *relayClient) SuperGroupOnlineBatchPushOneMsg(ctx context.Context, in *OnlineBatchPushOneMsgReq, opts ...grpc.CallOption) (*OnlineBatchPushOneMsgResp, error) { out := new(OnlineBatchPushOneMsgResp) - err := grpc.Invoke(ctx, "/relay.relay/SuperGroupOnlineBatchPushOneMsg", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/msggateway.relay/SuperGroupOnlineBatchPushOneMsg", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -881,7 +881,7 @@ func (c *relayClient) SuperGroupOnlineBatchPushOneMsg(ctx context.Context, in *O func (c *relayClient) KickUserOffline(ctx context.Context, in *KickUserOfflineReq, opts ...grpc.CallOption) (*KickUserOfflineResp, error) { out := new(KickUserOfflineResp) - err := grpc.Invoke(ctx, "/relay.relay/KickUserOffline", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/msggateway.relay/KickUserOffline", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -890,7 +890,7 @@ func (c *relayClient) KickUserOffline(ctx context.Context, in *KickUserOfflineRe func (c *relayClient) MultiTerminalLoginCheck(ctx context.Context, in *MultiTerminalLoginCheckReq, opts ...grpc.CallOption) (*MultiTerminalLoginCheckResp, error) { out := new(MultiTerminalLoginCheckResp) - err := grpc.Invoke(ctx, "/relay.relay/MultiTerminalLoginCheck", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/msggateway.relay/MultiTerminalLoginCheck", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -922,7 +922,7 @@ func _Relay_OnlinePushMsg_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/relay.relay/OnlinePushMsg", + FullMethod: "/msggateway.relay/OnlinePushMsg", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RelayServer).OnlinePushMsg(ctx, req.(*OnlinePushMsgReq)) @@ -940,7 +940,7 @@ func _Relay_GetUsersOnlineStatus_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/relay.relay/GetUsersOnlineStatus", + FullMethod: "/msggateway.relay/GetUsersOnlineStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RelayServer).GetUsersOnlineStatus(ctx, req.(*GetUsersOnlineStatusReq)) @@ -958,7 +958,7 @@ func _Relay_OnlineBatchPushOneMsg_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/relay.relay/OnlineBatchPushOneMsg", + FullMethod: "/msggateway.relay/OnlineBatchPushOneMsg", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RelayServer).OnlineBatchPushOneMsg(ctx, req.(*OnlineBatchPushOneMsgReq)) @@ -976,7 +976,7 @@ func _Relay_SuperGroupOnlineBatchPushOneMsg_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/relay.relay/SuperGroupOnlineBatchPushOneMsg", + FullMethod: "/msggateway.relay/SuperGroupOnlineBatchPushOneMsg", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RelayServer).SuperGroupOnlineBatchPushOneMsg(ctx, req.(*OnlineBatchPushOneMsgReq)) @@ -994,7 +994,7 @@ func _Relay_KickUserOffline_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/relay.relay/KickUserOffline", + FullMethod: "/msggateway.relay/KickUserOffline", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RelayServer).KickUserOffline(ctx, req.(*KickUserOfflineReq)) @@ -1012,7 +1012,7 @@ func _Relay_MultiTerminalLoginCheck_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/relay.relay/MultiTerminalLoginCheck", + FullMethod: "/msggateway.relay/MultiTerminalLoginCheck", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RelayServer).MultiTerminalLoginCheck(ctx, req.(*MultiTerminalLoginCheckReq)) @@ -1021,7 +1021,7 @@ func _Relay_MultiTerminalLoginCheck_Handler(srv interface{}, ctx context.Context } var _Relay_serviceDesc = grpc.ServiceDesc{ - ServiceName: "relay.relay", + ServiceName: "msggateway.relay", HandlerType: (*RelayServer)(nil), Methods: []grpc.MethodDesc{ { @@ -1050,64 +1050,66 @@ var _Relay_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "relay/relay.proto", + Metadata: "msggateway/msg_gateway.proto", } -func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_7fdb1a3cb7bcd264) } - -var fileDescriptor_relay_7fdb1a3cb7bcd264 = []byte{ - // 834 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x6f, 0xe3, 0x44, - 0x14, 0x97, 0x37, 0xc9, 0xee, 0xf6, 0xb5, 0x5d, 0xba, 0x43, 0x97, 0xb8, 0x46, 0x4a, 0xb2, 0x3e, - 0x40, 0x84, 0x68, 0x22, 0x85, 0x23, 0xb7, 0x6c, 0xb4, 0x25, 0xa2, 0x51, 0xaa, 0x49, 0x11, 0xa8, - 0x17, 0x70, 0x9d, 0x89, 0x63, 0xc5, 0xf1, 0x4c, 0x67, 0xec, 0x56, 0xbd, 0x80, 0xc4, 0x85, 0x0b, - 0xa7, 0x7e, 0x04, 0xbe, 0x22, 0x5f, 0x00, 0xcd, 0x9f, 0x18, 0x3b, 0x89, 0x1b, 0x8a, 0xd4, 0x4b, - 0x9b, 0xf7, 0x9b, 0x37, 0xef, 0xbd, 0xdf, 0xef, 0xbd, 0x99, 0x31, 0xbc, 0xe5, 0x24, 0xf2, 0xee, - 0xbb, 0xea, 0x6f, 0x87, 0x71, 0x9a, 0x50, 0x54, 0x53, 0x86, 0xf3, 0xe5, 0x98, 0x91, 0xf8, 0x74, - 0x38, 0x3a, 0x9d, 0x10, 0x7e, 0x4b, 0x78, 0x97, 0x2d, 0x82, 0xae, 0x72, 0xe8, 0x8a, 0xe9, 0xe2, - 0x4e, 0x74, 0xef, 0x84, 0xf6, 0x77, 0x7f, 0xb7, 0xe0, 0x68, 0x1c, 0x47, 0x61, 0x4c, 0x2e, 0x52, - 0x31, 0x1f, 0x89, 0x00, 0x93, 0x1b, 0xd4, 0x82, 0xfd, 0x31, 0x23, 0xdc, 0x4b, 0x42, 0x1a, 0x0f, - 0x07, 0xb6, 0xd5, 0xb2, 0xda, 0x7b, 0x38, 0x0f, 0xa1, 0x36, 0xbc, 0x5a, 0x8a, 0x60, 0xe0, 0x25, - 0x9e, 0xfd, 0xa2, 0x65, 0xb5, 0xf7, 0x7b, 0x6f, 0x3a, 0x2a, 0x70, 0x67, 0xa4, 0x51, 0xbc, 0x5a, - 0x46, 0x2e, 0x1c, 0xb0, 0x54, 0xcc, 0x2f, 0xe9, 0x0f, 0x82, 0xf0, 0xe1, 0xc0, 0xae, 0xa8, 0x60, - 0x05, 0xcc, 0x3d, 0x83, 0xb7, 0x6b, 0x35, 0x08, 0x86, 0x7a, 0x50, 0xe5, 0x44, 0x30, 0xdb, 0x6a, - 0x55, 0xda, 0xfb, 0xbd, 0x46, 0x47, 0xb3, 0x9c, 0x84, 0x71, 0x10, 0x91, 0x91, 0x08, 0xf4, 0xe6, - 0x8b, 0xc8, 0x4b, 0x66, 0x94, 0x2f, 0xb1, 0xf2, 0x75, 0xff, 0xb0, 0xe0, 0x44, 0x7a, 0x90, 0x28, - 0xf3, 0xc0, 0x44, 0xa4, 0x51, 0x72, 0x1e, 0x8a, 0x04, 0x7d, 0x06, 0x2f, 0x53, 0x5d, 0x84, 0x66, - 0x64, 0xac, 0x2c, 0xd3, 0x8b, 0xff, 0x9e, 0x09, 0x35, 0x00, 0x68, 0x56, 0xb2, 0x22, 0xf5, 0x1a, - 0xe7, 0x10, 0xf7, 0xc1, 0x02, 0x5b, 0x73, 0xea, 0x7b, 0x89, 0x3f, 0x97, 0xd8, 0x38, 0x26, 0xcf, - 0xa0, 0xef, 0x57, 0x70, 0x94, 0xd7, 0x52, 0x12, 0xb5, 0x2b, 0xad, 0x4a, 0x7b, 0x0f, 0x6f, 0xe0, - 0x6e, 0x08, 0x27, 0x25, 0x35, 0x09, 0x86, 0xce, 0xe1, 0x48, 0x28, 0xca, 0x12, 0xd7, 0xaa, 0x19, - 0xed, 0x5b, 0x39, 0x45, 0xb6, 0x2a, 0x8b, 0x37, 0x76, 0xba, 0xf7, 0x50, 0x2f, 0x11, 0x50, 0x4a, - 0xa7, 0x9d, 0x3e, 0xd0, 0x29, 0x51, 0xe4, 0x2b, 0x38, 0x87, 0xc8, 0x36, 0x61, 0xe2, 0xdf, 0x0e, - 0x07, 0x8a, 0xfa, 0x1e, 0x36, 0x16, 0xfa, 0x02, 0xde, 0xc8, 0x5f, 0x32, 0xce, 0x47, 0xca, 0x97, - 0x66, 0x96, 0x6a, 0x78, 0x0d, 0x75, 0xef, 0xa0, 0x7e, 0x46, 0x12, 0x99, 0x52, 0x68, 0xb6, 0x93, - 0xc4, 0x4b, 0x52, 0x21, 0x85, 0x6f, 0x00, 0xa4, 0xff, 0xca, 0x64, 0x29, 0x99, 0x72, 0x88, 0x6c, - 0x0c, 0xcd, 0x35, 0x46, 0xe7, 0xcf, 0x43, 0xc8, 0x81, 0xd7, 0x94, 0x15, 0x46, 0x39, 0xb3, 0xdd, - 0xbf, 0xab, 0x60, 0x6f, 0xcf, 0x2c, 0x18, 0xb2, 0xe1, 0x15, 0xe1, 0x3c, 0xa3, 0x5c, 0xc3, 0x2b, - 0x53, 0xf2, 0x25, 0x9c, 0x8f, 0x44, 0xb0, 0xe2, 0xab, 0x2d, 0x34, 0x81, 0x43, 0x91, 0xfa, 0x3e, - 0x11, 0xc2, 0x74, 0xa3, 0xa2, 0xba, 0x71, 0x6a, 0xba, 0x51, 0x96, 0xa9, 0x33, 0xc9, 0x6f, 0xc2, - 0xc5, 0x18, 0xe8, 0x02, 0x0e, 0x66, 0x5e, 0x18, 0x91, 0xa9, 0x89, 0x59, 0x55, 0x31, 0xbf, 0xde, - 0x15, 0xf3, 0xa3, 0xda, 0x33, 0x20, 0x89, 0x17, 0x46, 0xb8, 0x10, 0xc1, 0xf9, 0x0d, 0x0e, 0x4d, - 0x46, 0xbd, 0x2c, 0x25, 0x62, 0xa6, 0xd7, 0x66, 0xb4, 0x33, 0x5b, 0x72, 0x15, 0x2a, 0xea, 0x8a, - 0xab, 0xb6, 0x24, 0xee, 0xd3, 0x38, 0xce, 0x44, 0x35, 0x96, 0xbc, 0x3d, 0x42, 0xd1, 0xf7, 0xfc, - 0x45, 0xc0, 0x69, 0x1a, 0x4f, 0xed, 0xaa, 0x3a, 0x68, 0x05, 0xcc, 0xf9, 0x09, 0x0e, 0xf2, 0xe5, - 0xe5, 0x8e, 0x79, 0xa5, 0x70, 0xcc, 0x9f, 0xdc, 0x01, 0xe7, 0x2f, 0x2b, 0xe3, 0x66, 0xe4, 0x2b, - 0xbb, 0x42, 0xca, 0x78, 0x79, 0x70, 0x3c, 0x55, 0x55, 0xad, 0xa6, 0x5f, 0x6b, 0xfa, 0xc4, 0x56, - 0x1a, 0xdd, 0xb7, 0x86, 0x72, 0x7f, 0x05, 0xf4, 0x7d, 0xe8, 0x2f, 0x64, 0x80, 0xf1, 0x6c, 0x26, - 0x03, 0x98, 0x2b, 0x86, 0x6e, 0x5e, 0x31, 0xf9, 0x49, 0x6e, 0x00, 0xac, 0xda, 0x62, 0x46, 0xbd, - 0x86, 0x73, 0x88, 0x3c, 0x6e, 0x0b, 0x13, 0xb7, 0x70, 0xad, 0xac, 0xa1, 0xee, 0x3b, 0xf8, 0x74, - 0x23, 0xbf, 0x60, 0xee, 0x9f, 0x16, 0x38, 0xa3, 0x34, 0x4a, 0xc2, 0x4b, 0xc2, 0x97, 0x61, 0xec, - 0x45, 0xe7, 0x34, 0x08, 0xe3, 0x0f, 0x73, 0xe2, 0x2f, 0x64, 0x7d, 0x65, 0x42, 0xee, 0xaa, 0xea, - 0x18, 0x6a, 0x09, 0x5d, 0x90, 0xd8, 0xf4, 0x56, 0x1b, 0xeb, 0x6c, 0xab, 0x1b, 0x6c, 0xdd, 0x31, - 0x7c, 0x5e, 0x5a, 0xcd, 0xff, 0x39, 0x9d, 0xbd, 0x87, 0x2a, 0xe8, 0xb7, 0x16, 0xf5, 0xe1, 0xb0, - 0xf0, 0x7a, 0xa1, 0xba, 0x69, 0xeb, 0xfa, 0xbb, 0xea, 0xd8, 0xdb, 0x17, 0x04, 0x43, 0x3f, 0xc2, - 0xf1, 0xb6, 0x21, 0x40, 0x8d, 0x47, 0x27, 0xe4, 0xc6, 0x69, 0xee, 0x98, 0x20, 0x74, 0x05, 0xef, - 0xb6, 0x5e, 0xf9, 0xa8, 0x59, 0xa8, 0x65, 0xf3, 0x91, 0x72, 0x5a, 0x8f, 0x3b, 0x08, 0x86, 0xa6, - 0xd0, 0x9c, 0xa4, 0x8c, 0xf0, 0x33, 0x4e, 0x53, 0xf6, 0x6c, 0x59, 0xbe, 0x83, 0x4f, 0xd6, 0xe6, - 0x0b, 0x9d, 0x98, 0x4d, 0x9b, 0x73, 0xef, 0x38, 0x65, 0x4b, 0x82, 0xa1, 0x5f, 0xa0, 0x5e, 0x32, - 0x03, 0xe8, 0xbd, 0xd9, 0x56, 0x3e, 0xb1, 0x8e, 0xbb, 0xcb, 0x45, 0xb0, 0xfe, 0xfb, 0xab, 0xa6, - 0xfc, 0xf0, 0xfa, 0x79, 0x38, 0xca, 0x7d, 0x71, 0xa9, 0x6d, 0xdf, 0xb2, 0x6b, 0x2c, 0xff, 0x5f, - 0xbf, 0x54, 0xe0, 0x37, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x59, 0x61, 0x49, 0x43, 0xbc, 0x09, - 0x00, 0x00, +func init() { + proto.RegisterFile("msggateway/msg_gateway.proto", fileDescriptor_msg_gateway_318943cf07c76ff1) +} + +var fileDescriptor_msg_gateway_318943cf07c76ff1 = []byte{ + // 844 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4d, 0x6f, 0xdb, 0x36, + 0x18, 0x86, 0x6a, 0xbb, 0x6d, 0xde, 0x24, 0x5d, 0xc6, 0xa5, 0x8b, 0xaa, 0x75, 0xa9, 0xa1, 0x7e, + 0x19, 0x05, 0x6a, 0x63, 0xd9, 0x61, 0x87, 0xdd, 0x52, 0xa3, 0x85, 0xb1, 0x08, 0xee, 0xe8, 0x16, + 0x28, 0x76, 0x19, 0x54, 0x99, 0x56, 0x34, 0xcb, 0x22, 0x4b, 0x4a, 0x0d, 0x72, 0xd9, 0x80, 0x9e, + 0x77, 0xda, 0x9f, 0xd8, 0xbf, 0xd9, 0x6f, 0x1a, 0xf8, 0x61, 0x99, 0xb2, 0xac, 0xd4, 0x2d, 0xb0, + 0xdd, 0xf4, 0x3e, 0xe4, 0xfb, 0xf1, 0x3c, 0xef, 0x4b, 0x52, 0x70, 0x77, 0x21, 0xe2, 0x38, 0xcc, + 0xc9, 0x45, 0x78, 0x39, 0x58, 0x88, 0xf8, 0x57, 0xf3, 0xdd, 0x67, 0x9c, 0xe6, 0x14, 0xc1, 0x6a, + 0xd5, 0x7b, 0x3c, 0x66, 0x24, 0x7b, 0x3a, 0x0a, 0x9e, 0x4e, 0x08, 0x7f, 0x4f, 0xf8, 0x80, 0xcd, + 0xe3, 0x81, 0xda, 0x35, 0x10, 0xd3, 0xf9, 0x85, 0x18, 0x5c, 0x08, 0xed, 0xe4, 0x7f, 0x70, 0xe0, + 0x60, 0x9c, 0xa5, 0x49, 0x46, 0x5e, 0x16, 0xe2, 0x3c, 0x10, 0x31, 0x26, 0xef, 0x50, 0x17, 0x76, + 0xc7, 0x8c, 0xf0, 0x30, 0x4f, 0x68, 0x36, 0x1a, 0xba, 0x4e, 0xd7, 0xe9, 0xed, 0x60, 0x1b, 0x42, + 0x3d, 0xb8, 0xb1, 0x10, 0xf1, 0x30, 0xcc, 0x43, 0xf7, 0x5a, 0xd7, 0xe9, 0xed, 0x9e, 0xdc, 0xea, + 0xab, 0xc0, 0xfd, 0x40, 0xa3, 0x78, 0xb9, 0x8c, 0x7c, 0xd8, 0x63, 0x85, 0x38, 0x7f, 0x45, 0x5f, + 0x0b, 0xc2, 0x47, 0x43, 0xb7, 0xa5, 0x82, 0x55, 0x30, 0xff, 0x0c, 0xbe, 0x5c, 0xab, 0x41, 0x30, + 0xf4, 0x03, 0xb4, 0x39, 0x11, 0xcc, 0x75, 0xba, 0xad, 0xde, 0xee, 0xc9, 0xfd, 0xfe, 0x8a, 0x5d, + 0x7f, 0x92, 0x64, 0x71, 0x4a, 0x02, 0x11, 0xeb, 0x08, 0x2f, 0xd3, 0x30, 0x9f, 0x51, 0xbe, 0xc0, + 0xca, 0xc1, 0xff, 0xd3, 0x81, 0x3b, 0x6b, 0x3b, 0x30, 0x11, 0x45, 0x9a, 0x9f, 0x25, 0x22, 0x47, + 0x5f, 0xc3, 0xf5, 0x42, 0x57, 0xa2, 0x69, 0x19, 0xab, 0x4c, 0x77, 0xed, 0x13, 0xd3, 0xa1, 0x63, + 0x00, 0x5a, 0x16, 0xaf, 0xe8, 0xdd, 0xc4, 0x16, 0xe2, 0xff, 0xe5, 0x80, 0xab, 0xd9, 0x9d, 0x86, + 0x79, 0x74, 0x2e, 0xb1, 0x71, 0x46, 0xfe, 0x03, 0xa5, 0x9f, 0xc0, 0x81, 0xad, 0xaa, 0x64, 0xeb, + 0xb6, 0xba, 0xad, 0xde, 0x0e, 0xae, 0xe1, 0x7e, 0x06, 0x77, 0x1a, 0x6a, 0x12, 0x0c, 0xfd, 0x0c, + 0x07, 0x42, 0x51, 0x96, 0xb8, 0x96, 0xce, 0x74, 0xe1, 0xe1, 0x15, 0xb2, 0xac, 0x34, 0xc6, 0x35, + 0x77, 0xff, 0x12, 0x8e, 0x1a, 0x54, 0x94, 0xfa, 0xe9, 0x4d, 0xcf, 0xe8, 0x94, 0x28, 0x05, 0x5a, + 0xd8, 0x42, 0x64, 0xc3, 0x30, 0x89, 0xde, 0x8f, 0x86, 0x8a, 0xff, 0x0e, 0x36, 0x16, 0x7a, 0x04, + 0xb7, 0xe4, 0x97, 0x8c, 0xf3, 0x9c, 0xf2, 0x85, 0x19, 0xad, 0x0e, 0x5e, 0x43, 0xfd, 0x0b, 0x38, + 0x7a, 0x41, 0x72, 0x99, 0x52, 0x68, 0xca, 0x93, 0x3c, 0xcc, 0x0b, 0x21, 0xd5, 0x3f, 0x06, 0x28, + 0x56, 0x5a, 0x39, 0x4a, 0x2b, 0x0b, 0x91, 0xdd, 0xa1, 0x56, 0x77, 0x74, 0x7e, 0x1b, 0x42, 0x1e, + 0xdc, 0xa4, 0xac, 0x32, 0xd9, 0xa5, 0xed, 0x7f, 0xe8, 0x80, 0xbb, 0x39, 0xb3, 0x60, 0xc8, 0x85, + 0x1b, 0x84, 0xf3, 0x92, 0x72, 0x07, 0x2f, 0x4d, 0xc9, 0x97, 0x70, 0x1e, 0x88, 0x78, 0xc9, 0x57, + 0x5b, 0xe8, 0x0d, 0xec, 0x8b, 0x22, 0x8a, 0x88, 0x10, 0xa6, 0x25, 0x2d, 0xd5, 0x92, 0x13, 0xbb, + 0x25, 0x4d, 0xe9, 0xfa, 0x13, 0xdb, 0x13, 0x57, 0x03, 0xa1, 0xd7, 0xb0, 0x37, 0x0b, 0x93, 0x94, + 0x4c, 0x4d, 0xe0, 0xb6, 0x0a, 0xfc, 0xdd, 0x56, 0x81, 0x9f, 0x2b, 0xc7, 0x21, 0xc9, 0xc3, 0x24, + 0xc5, 0x95, 0x30, 0xde, 0x1f, 0xb0, 0x6f, 0xd2, 0xea, 0x65, 0x29, 0x16, 0x33, 0x5d, 0x37, 0x93, + 0x5e, 0xda, 0x92, 0xb5, 0x50, 0x51, 0x97, 0xac, 0xb5, 0x25, 0xf1, 0x88, 0x66, 0x59, 0x29, 0xaf, + 0xb1, 0xe4, 0xb5, 0x92, 0x88, 0xd3, 0x30, 0x9a, 0xc7, 0x9c, 0x16, 0xd9, 0xd4, 0x6d, 0xab, 0x73, + 0x57, 0xc1, 0xbc, 0x37, 0xb0, 0x67, 0x97, 0x67, 0x1d, 0xfd, 0x56, 0xe5, 0xe8, 0x7f, 0x72, 0x2f, + 0xbc, 0xbf, 0x9d, 0x92, 0x9b, 0xd1, 0xb0, 0xe9, 0x5a, 0x69, 0xe2, 0x35, 0x83, 0xc3, 0xa9, 0xaa, + 0x6a, 0x79, 0x0e, 0xb4, 0xa6, 0x9f, 0xd3, 0x54, 0x23, 0xfe, 0xc6, 0x78, 0xfe, 0xef, 0x80, 0x7e, + 0x4a, 0xa2, 0xb9, 0x0c, 0x30, 0x9e, 0xcd, 0x64, 0x00, 0x73, 0xed, 0xd0, 0xfa, 0xb5, 0x63, 0x0f, + 0xf6, 0x31, 0xc0, 0xb2, 0x37, 0x66, 0xf2, 0x3b, 0xd8, 0x42, 0xe4, 0xe9, 0x9b, 0x9b, 0xb8, 0x95, + 0xab, 0x66, 0x0d, 0xf5, 0x6f, 0xc3, 0x57, 0xb5, 0xfc, 0xfa, 0x8e, 0xf6, 0x82, 0x22, 0xcd, 0x93, + 0x57, 0x84, 0x2f, 0x92, 0x2c, 0x4c, 0xcf, 0x68, 0x9c, 0x64, 0xcf, 0xce, 0x49, 0x34, 0x97, 0xf5, + 0x35, 0xa9, 0xf9, 0xb1, 0xaa, 0x0e, 0xa1, 0x93, 0xd3, 0x39, 0xc9, 0x4c, 0x83, 0xb5, 0xb1, 0xce, + 0xb6, 0x5d, 0x63, 0xeb, 0x8f, 0xe1, 0x9b, 0xc6, 0x6a, 0x3e, 0xe7, 0xb0, 0x9e, 0xfc, 0xd3, 0x86, + 0x0e, 0x27, 0x69, 0x78, 0x89, 0xce, 0x60, 0xbf, 0xf2, 0xb6, 0xa1, 0xbb, 0x76, 0x6f, 0xd7, 0x9f, + 0x5e, 0xef, 0xdb, 0x2b, 0x56, 0x05, 0x43, 0x21, 0x1c, 0x6e, 0x1a, 0x07, 0x74, 0xff, 0xe3, 0x03, + 0xf3, 0xce, 0x7b, 0xb0, 0xcd, 0x54, 0xa1, 0x29, 0xdc, 0xde, 0xf8, 0x34, 0xa0, 0x07, 0xf5, 0xd2, + 0xea, 0x2f, 0x9a, 0xf7, 0x70, 0x8b, 0x5d, 0x82, 0xa1, 0x0c, 0xee, 0x4d, 0x0a, 0x46, 0xf8, 0x0b, + 0x4e, 0x0b, 0xf6, 0x3f, 0xe4, 0xc3, 0xf0, 0xc5, 0xda, 0x1c, 0xa2, 0x63, 0xdb, 0xb3, 0x7e, 0x48, + 0xbc, 0x7b, 0x57, 0xae, 0x0b, 0x86, 0x7e, 0x83, 0xa3, 0x86, 0xa9, 0x41, 0x8f, 0x6c, 0xdf, 0xe6, + 0x41, 0xf7, 0x1e, 0x6f, 0xb5, 0x4f, 0xb0, 0xd3, 0x27, 0xbf, 0xf4, 0xe4, 0x2f, 0xdd, 0x28, 0xb0, + 0x7e, 0xe5, 0x56, 0xae, 0x3f, 0xb2, 0xb7, 0x41, 0x69, 0xbc, 0xbd, 0xae, 0x96, 0xbf, 0xff, 0x37, + 0x00, 0x00, 0xff, 0xff, 0xb5, 0x31, 0x87, 0xc1, 0x2f, 0x0a, 0x00, 0x00, } diff --git a/pkg/proto/msggateway/msg_gateway.proto b/pkg/proto/msggateway/msg_gateway.proto index 20487c7a9..5e751dfc4 100644 --- a/pkg/proto/msggateway/msg_gateway.proto +++ b/pkg/proto/msggateway/msg_gateway.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; -option go_package = "OpenIM/pkg/proto/msggateway;pbMsggateway"; +option go_package = "OpenIM/pkg/proto/msggateway;msggateway"; package msggateway; message OnlinePushMsgReq {