From 8cfc5925da6f884f56f3f7dfd6f782805eae610c Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 28 Dec 2021 20:44:19 +0800 Subject: [PATCH] management modify --- cmd/open_im_api/main.go | 7 +- internal/api/manage/management_user.go | 313 +++++++++++++----------- internal/api/user/user.go | 64 +---- internal/msg_gateway/gate/logic.go | 2 - internal/msg_gateway/gate/rpc_server.go | 8 +- internal/rpc/msg/send_msg.go | 10 +- pkg/base_info/manage_api_struct.go | 30 ++- pkg/base_info/user_api_struct.go | 14 -- pkg/proto/relay/relay.pb.go | 100 ++++---- pkg/proto/relay/relay.proto | 1 + 10 files changed, 264 insertions(+), 285 deletions(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 1730812bb..773b8be7d 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -26,7 +26,6 @@ func main() { { userRouterGroup.POST("/update_user_info", user.UpdateUserInfo) userRouterGroup.POST("/get_user_info", user.GetUserInfo) - //userRouterGroup.POST("/get_users_online_status", user.GetUsersOnlineStatus) } //friend routing group friendRouterGroup := r.Group("/friend") @@ -87,9 +86,9 @@ func main() { { managementGroup.POST("/delete_user", manage.DeleteUser) managementGroup.POST("/send_msg", manage.ManagementSendMsg) - // managementGroup.POST("/get_all_users_uid", manage.GetAllUsersUid) - // managementGroup.POST("/account_check", manage.AccountCheck) - // managementGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus) + managementGroup.POST("/get_all_users_uid", manage.GetAllUsersUid) + managementGroup.POST("/account_check", manage.AccountCheck) + managementGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus) } //Conversation conversationGroup := r.Group("/conversation") diff --git a/internal/api/manage/management_user.go b/internal/api/manage/management_user.go index 1cf8585a1..605bb5ddd 100644 --- a/internal/api/manage/management_user.go +++ b/internal/api/manage/management_user.go @@ -6,154 +6,175 @@ */ package manage -import "github.com/gin-gonic/gin" +import ( + api "Open_IM/pkg/base_info" + "Open_IM/pkg/common/config" + "Open_IM/pkg/common/constant" + "Open_IM/pkg/common/log" + "Open_IM/pkg/common/token_verify" + "Open_IM/pkg/grpc-etcdv3/getcdv3" + pbRelay "Open_IM/pkg/proto/relay" + rpc "Open_IM/pkg/proto/user" + "Open_IM/pkg/utils" + "context" + "github.com/gin-gonic/gin" + "net/http" + "strings" +) func DeleteUser(c *gin.Context) { + params := api.DeleteUsersReq{} + if err := c.BindJSON(¶ms); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &rpc.DeleteUsersReq{} + utils.CopyStructFields(req, ¶ms) + var ok bool + ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) + if !ok { + log.NewError(req.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token")) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"}) + return + } + log.NewInfo(params.OperationID, "DeleteUser args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName) + client := rpc.NewUserClient(etcdConn) + RpcResp, err := client.DeleteUsers(context.Background(), req) + if err != nil { + log.NewError(req.OperationID, "call delete users rpc server failed", err.Error()) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call delete users rpc server failed"}) + return + } + failedUserIDList := make([]string, 0) + for _, v := range RpcResp.FailedUserIDList { + failedUserIDList = append(failedUserIDList, v) + } + resp := api.DeleteUsersResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}} + resp.FailedUserIDList = failedUserIDList + log.NewInfo(req.OperationID, "DeleteUser api return", resp) + c.JSON(http.StatusOK, resp) } +func GetAllUsersUid(c *gin.Context) { + params := api.GetAllUsersUidReq{} + if err := c.BindJSON(¶ms); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &rpc.GetAllUserIDReq{} + utils.CopyStructFields(req, ¶ms) + var ok bool + ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) + if !ok { + log.NewError(req.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token")) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"}) + return + } + log.NewInfo(params.OperationID, "GetAllUsersUid args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName) + client := rpc.NewUserClient(etcdConn) + RpcResp, err := client.GetAllUserID(context.Background(), req) + if err != nil { + log.NewError(req.OperationID, "call GetAllUsersUid users rpc server failed", err.Error()) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call GetAllUsersUid users rpc server failed"}) + return + } + userIDList := make([]string, 0) + for _, v := range RpcResp.UserIDList { + userIDList = append(userIDList, v) + } + resp := api.GetAllUsersUidResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}} + resp.UserIDList = userIDList + log.NewInfo(req.OperationID, "GetAllUsersUid api return", resp) + c.JSON(http.StatusOK, resp) -// -//func DeleteUser(c *gin.Context) { -// params := paramsDeleteUsers{} -// if err := c.BindJSON(¶ms); err != nil { -// c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) -// return -// } -// log.InfoByKv("DeleteUser req come here", params.OperationID, "DeleteUidList", params.DeleteUidList) -// etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName) -// client := pbUser.NewUserClient(etcdConn) -// //defer etcdConn.Close() -// -// req := &pbUser.DeleteUsersReq{ -// OperationID: params.OperationID, -// DeleteUidList: params.DeleteUidList, -// Token: c.Request.Header.Get("token"), -// } -// RpcResp, err := client.DeleteUsers(context.Background(), req) -// if err != nil { -// log.NewError(req.OperationID, "call delete users rpc server failed", err.Error()) -// c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call delete users rpc server failed"}) -// return -// } -// failedUidList := make([]string, 0) -// for _, v := range RpcResp.FailedUidList { -// failedUidList = append(failedUidList, v) -// } -// log.InfoByKv("call delete user rpc server is success", params.OperationID, "resp args", RpcResp.String()) -// resp := gin.H{"errCode": RpcResp.CommonResp.ErrorCode, "errMsg": RpcResp.CommonResp.ErrorMsg, "failedUidList": RpcResp.FailedUidList} -// c.JSON(http.StatusOK, resp) -//} -//func GetAllUsersUid(c *gin.Context) { -// params := paramsGetAllUsersUid{} -// if err := c.BindJSON(¶ms); err != nil { -// c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) -// return -// } -// log.InfoByKv("GetAllUsersUid req come here", params.OperationID) -// etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName) -// client := pbUser.NewUserClient(etcdConn) -// //defer etcdConn.Close() -// -// req := &pbUser.GetAllUsersUidReq{ -// OperationID: params.OperationID, -// Token: c.Request.Header.Get("token"), -// } -// RpcResp, err := client.GetAllUsersUid(context.Background(), req) -// if err != nil { -// c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error(), "uidList": []string{}}) -// return -// } -// log.InfoByKv("call GetAllUsersUid rpc server is success", params.OperationID, "resp args", RpcResp.String()) -// resp := gin.H{"errCode": RpcResp.CommonResp.ErrorCode, "errMsg": RpcResp.CommonResp.ErrorMsg, "uidList": RpcResp.UidList} -// c.JSON(http.StatusOK, resp) -// -//} -//func AccountCheck(c *gin.Context) { -// params := paramsAccountCheck{} -// if err := c.BindJSON(¶ms); err != nil { -// c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) -// return -// } -// log.InfoByKv("AccountCheck req come here", params.OperationID, params.UserIDList) -// etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName) -// client := pbUser.NewUserClient(etcdConn) -// //defer etcdConn.Close() -// -// req := &pbUser.AccountCheckReq{ -// OperationID: params.OperationID, -// Token: c.Request.Header.Get("token"), -// UidList: params.UserIDList, -// } -// RpcResp, err := client.AccountCheck(context.Background(), req) -// if err != nil { -// c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) -// return -// } -// log.InfoByKv("call AccountCheck rpc server is success", params.OperationID, "resp args", RpcResp.String()) -// resp := gin.H{"errCode": RpcResp.CommonResp.ErrorCode, "errMsg": RpcResp.CommonResp.ErrorMsg, "result": RpcResp.Result} -// c.JSON(http.StatusOK, resp) -// -//} -//func GetUsersOnlineStatus(c *gin.Context) { -// params := paramsGetUsersOnlineStatus{} -// if err := c.BindJSON(¶ms); err != nil { -// c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) -// return -// } -// claims, err := token_verify.ParseToken(c.Request.Header.Get("token")) -// if err != nil { -// log.ErrorByKv("parse token failed", params.OperationID, "err", err.Error()) -// c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": err.Error()}) -// return -// } -// if !utils.IsContain(claims.UID, config.Config.Manager.AppManagerUid) { -// log.ErrorByKv(" Authentication failed", params.OperationID, "args", c) -// c.JSON(http.StatusBadRequest, gin.H{"errCode": 402, "errMsg": "not authorized"}) -// return -// } -// req := &pbRelay.GetUsersOnlineStatusReq{ -// OperationID: params.OperationID, -// UserIDList: params.UserIDList, -// } -// var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult -// var respResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult -// flag := false -// log.NewDebug(params.OperationID, "GetUsersOnlineStatus req come here", params.UserIDList) -// grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName) -// for _, v := range grpcCons { -// client := pbRelay.NewOnlineMessageRelayServiceClient(v) -// reply, err := client.GetUsersOnlineStatus(context.Background(), req) -// if err != nil { -// log.NewError(params.OperationID, "GetUsersOnlineStatus rpc err", req.String(), err.Error()) -// continue -// } else { -// if reply.ErrCode == 0 { -// wsResult = append(wsResult, reply.SuccessResult...) -// } -// } -// } -// log.NewDebug(params.OperationID, "call GetUsersOnlineStatus rpc server is success", wsResult) -// //Online data merge of each node -// for _, v1 := range params.UserIDList { -// flag = false -// temp := new(pbRelay.GetUsersOnlineStatusResp_SuccessResult) -// for _, v2 := range wsResult { -// if v2.UserID == v1 { -// flag = true -// temp.UserID = v1 -// temp.Status = constant.OnlineStatus -// temp.DetailPlatformStatus = append(temp.DetailPlatformStatus, v2.DetailPlatformStatus...) -// } -// -// } -// if !flag { -// temp.UserID = v1 -// temp.Status = constant.OfflineStatus -// } -// respResult = append(respResult, temp) -// } -// log.NewDebug(params.OperationID, "Finished merged data", respResult) -// resp := gin.H{"errCode": 0, "errMsg": "", "successResult": respResult} -// c.JSON(http.StatusOK, resp) -// -//} +} +func AccountCheck(c *gin.Context) { + params := api.AccountCheckReq{} + if err := c.BindJSON(¶ms); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &rpc.AccountCheckReq{} + utils.CopyStructFields(req, ¶ms) + var ok bool + ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) + if !ok { + log.NewError(req.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token")) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"}) + return + } + log.NewInfo(params.OperationID, "AccountCheck args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName) + client := rpc.NewUserClient(etcdConn) + + RpcResp, err := client.AccountCheck(context.Background(), req) + if err != nil { + log.NewError(req.OperationID, "call AccountCheck users rpc server failed", err.Error()) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call AccountCheck users rpc server failed"}) + return + } + resp := api.AccountCheckResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}} + resp.ResultList = RpcResp.ResultList + log.NewInfo(req.OperationID, "AccountCheck api return", resp) + c.JSON(http.StatusOK, resp) +} +func GetUsersOnlineStatus(c *gin.Context) { + params := api.GetUsersOnlineStatusReq{} + if err := c.BindJSON(¶ms); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &pbRelay.GetUsersOnlineStatusReq{} + utils.CopyStructFields(req, ¶ms) + var ok bool + ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) + if !ok { + log.NewError(req.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token")) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"}) + return + } + log.NewInfo(params.OperationID, "GetUsersOnlineStatus args ", req.String()) + var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult + var respResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult + flag := false + grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName) + for _, v := range grpcCons { + client := pbRelay.NewOnlineMessageRelayServiceClient(v) + reply, err := client.GetUsersOnlineStatus(context.Background(), req) + if err != nil { + log.NewError(params.OperationID, "GetUsersOnlineStatus rpc err", req.String(), err.Error()) + continue + } else { + if reply.ErrCode == 0 { + wsResult = append(wsResult, reply.SuccessResult...) + } + } + } + log.NewInfo(params.OperationID, "call GetUsersOnlineStatus rpc server is success", wsResult) + //Online data merge of each node + for _, v1 := range params.UserIDList { + flag = false + temp := new(pbRelay.GetUsersOnlineStatusResp_SuccessResult) + for _, v2 := range wsResult { + if v2.UserID == v1 { + flag = true + temp.UserID = v1 + temp.Status = constant.OnlineStatus + temp.DetailPlatformStatus = append(temp.DetailPlatformStatus, v2.DetailPlatformStatus...) + } + + } + if !flag { + temp.UserID = v1 + temp.Status = constant.OfflineStatus + } + respResult = append(respResult, temp) + } + resp := api.GetUsersOnlineStatusResp{CommResp: api.CommResp{ErrCode: 0, ErrMsg: ""}} + resp.SuccessResult = respResult + log.NewInfo(req.OperationID, "GetUsersOnlineStatus api return", resp) + c.JSON(http.StatusOK, resp) + +} diff --git a/internal/api/user/user.go b/internal/api/user/user.go index b6d550f1d..c312e462d 100644 --- a/internal/api/user/user.go +++ b/internal/api/user/user.go @@ -14,68 +14,6 @@ import ( "strings" ) -// -//func GetUsersOnlineStatus(c *gin.Context) { -// params := api.GetUsersOnlineStatusReq{} -// if err := c.BindJSON(¶ms); err != nil { -// log.NewError(params.OperationID, "bind json failed ", err.Error(), c) -// c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) -// return -// } -// -// if params.Secret != config.Config.Secret { -// log.NewError(params.OperationID, "parse token failed ", params.Secret, config.Config.Secret) -// c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": "secret failed"}) -// return -// } -// -// req := &pbRelay.GetUsersOnlineStatusReq{ -// OperationID: params.OperationID, -// UserIDList: params.UserIDList, -// } -// var wsResult []*rpc.GetUsersOnlineStatusResp_SuccessResult -// var respResult []*rpc.GetUsersOnlineStatusResp_SuccessResult -// flag := false -// log.NewDebug(params.OperationID, "GetUsersOnlineStatus req come here", params.UserIDList) -// -// grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName) -// for _, v := range grpcCons { -// client := rpc.NewOnlineMessageRelayServiceClient(v) -// reply, err := client.GetUsersOnlineStatus(context.Background(), req) -// if err != nil { -// log.NewError(params.OperationID, "GetUsersOnlineStatus rpc err", req.String(), err.Error()) -// continue -// } else { -// if reply.ErrCode == 0 { -// wsResult = append(wsResult, reply.SuccessResult...) -// } -// } -// } -// log.NewDebug(params.OperationID, "call GetUsersOnlineStatus rpc server is success", wsResult) -// //Online data merge of each node -// for _, v1 := range params.UserIDList { -// flag = false -// temp := new(pbRelay.GetUsersOnlineStatusResp_SuccessResult) -// for _, v2 := range wsResult { -// if v2.UserID == v1 { -// flag = true -// temp.UserID = v1 -// temp.Status = constant.OnlineStatus -// temp.DetailPlatformStatus = append(temp.DetailPlatformStatus, v2.DetailPlatformStatus...) -// } -// } -// if !flag { -// temp.UserID = v1 -// temp.Status = constant.OfflineStatus -// } -// respResult = append(respResult, temp) -// } -// log.NewDebug(params.OperationID, "Finished merged data", respResult) -// resp := gin.H{"errCode": 0, "errMsg": "", "data": respResult} -// -// c.JSON(http.StatusOK, resp) -//} - func GetUserInfo(c *gin.Context) { params := api.GetUserInfoReq{} if err := c.BindJSON(¶ms); err != nil { @@ -83,7 +21,7 @@ func GetUserInfo(c *gin.Context) { return } req := &rpc.GetUserInfoReq{} - utils.CopyStructFields(&req, params) + utils.CopyStructFields(req, ¶ms) var ok bool ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) if !ok { diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index fce7448bd..c7f0ff8a1 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -151,7 +151,6 @@ func (ws *WServer) pullMsgResp(conn *UserConn, m *Req, pb *sdk_ws.PullMessageRes } c, err := proto.Marshal(&mReplyData) log.NewInfo(m.OperationID, "test info is ", len(mReplyData.SingleUserMsg), mReplyData.SingleUserMsg) - mReply := Resp{ ReqIdentifier: m.ReqIdentifier, MsgIncr: m.MsgIncr, @@ -162,7 +161,6 @@ func (ws *WServer) pullMsgResp(conn *UserConn, m *Req, pb *sdk_ws.PullMessageRes } log.NewInfo(m.OperationID, "pullMsgResp all data is ", mReply.ReqIdentifier, mReply.MsgIncr, mReply.ErrCode, mReply.ErrMsg, len(mReply.Data)) - ws.sendMsg(conn, mReply) } diff --git a/internal/msg_gateway/gate/rpc_server.go b/internal/msg_gateway/gate/rpc_server.go index 4c9c03f34..450cb1c73 100644 --- a/internal/msg_gateway/gate/rpc_server.go +++ b/internal/msg_gateway/gate/rpc_server.go @@ -4,6 +4,7 @@ import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" + "Open_IM/pkg/common/token_verify" "Open_IM/pkg/grpc-etcdv3/getcdv3" pbRelay "Open_IM/pkg/proto/relay" "Open_IM/pkg/utils" @@ -105,7 +106,11 @@ func (r *RPCServer) OnlinePushMsg(_ context.Context, in *pbRelay.OnlinePushMsgRe }, nil } func (r *RPCServer) GetUsersOnlineStatus(_ context.Context, req *pbRelay.GetUsersOnlineStatusReq) (*pbRelay.GetUsersOnlineStatusResp, error) { - log.NewDebug(req.OperationID, "rpc GetUsersOnlineStatus arrived server", req.String()) + log.NewInfo(req.OperationID, "rpc GetUsersOnlineStatus arrived server", req.String()) + if !token_verify.IsMangerUserID(req.OpUserID) { + log.NewError(req.OperationID, "no permission GetUsersOnlineStatus ", req.OpUserID) + return &pbRelay.GetUsersOnlineStatusResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } var resp pbRelay.GetUsersOnlineStatusResp for _, userID := range req.UserIDList { platformList := genPlatformArray() @@ -125,6 +130,7 @@ func (r *RPCServer) GetUsersOnlineStatus(_ context.Context, req *pbRelay.GetUser resp.SuccessResult = append(resp.SuccessResult, temp) } } + log.NewInfo(req.OperationID, "GetUsersOnlineStatus rpc return ", resp.String()) return &resp, nil } func sendMsgToUser(conn *UserConn, bMsg []byte, in *pbRelay.OnlinePushMsgReq, RecvPlatForm, RecvID string) (ResultCode int64) { diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index 4c0c3ad2d..bf371f0a2 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -141,10 +141,12 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S return returnMsg(&replay, pb, 201, "kafka send msg err", "", 0) } } - err2 := rpc.sendMsgToKafka(&msgToMQ, msgToMQ.MsgData.SendID) - if err2 != nil { - log.NewError(msgToMQ.OperationID, "kafka send msg err:SendID", msgToMQ.MsgData.SendID, msgToMQ.String()) - return returnMsg(&replay, pb, 201, "kafka send msg err", "", 0) + if msgToMQ.MsgData.SendID != msgToMQ.MsgData.RecvID { //Filter messages sent to yourself + err2 := rpc.sendMsgToKafka(&msgToMQ, msgToMQ.MsgData.SendID) + if err2 != nil { + log.NewError(msgToMQ.OperationID, "kafka send msg err:SendID", msgToMQ.MsgData.SendID, msgToMQ.String()) + return returnMsg(&replay, pb, 201, "kafka send msg err", "", 0) + } } return returnMsg(&replay, pb, 0, "", msgToMQ.MsgData.ServerMsgID, msgToMQ.MsgData.SendTime) case constant.GroupChatType: diff --git a/pkg/base_info/manage_api_struct.go b/pkg/base_info/manage_api_struct.go index 3a00437a7..862706187 100644 --- a/pkg/base_info/manage_api_struct.go +++ b/pkg/base_info/manage_api_struct.go @@ -1,6 +1,10 @@ package base_info -import open_im_sdk "Open_IM/pkg/proto/sdk_ws" +import ( + pbRelay "Open_IM/pkg/proto/relay" + open_im_sdk "Open_IM/pkg/proto/sdk_ws" + pbUser "Open_IM/pkg/proto/user" +) type paramsManagementSendMsg struct { OperationID string `json:"operationID" binding:"required"` @@ -62,21 +66,37 @@ type FileElem struct { FileSize int64 `mapstructure:"fileSize"` } -type paramsDeleteUsers struct { +type DeleteUsersReq struct { OperationID string `json:"operationID" binding:"required"` DeleteUidList []string `json:"deleteUidList" binding:"required"` } -type paramsGetAllUsersUid struct { +type DeleteUsersResp struct { + CommResp + FailedUserIDList []string `json:"data"` +} +type GetAllUsersUidReq struct { OperationID string `json:"operationID" binding:"required"` } -type paramsGetUsersOnlineStatus struct { +type GetAllUsersUidResp struct { + CommResp + UserIDList []string `json:"data"` +} +type GetUsersOnlineStatusReq struct { OperationID string `json:"operationID" binding:"required"` UserIDList []string `json:"userIDList" binding:"required,lte=200"` } -type paramsAccountCheck struct { +type GetUsersOnlineStatusResp struct { + CommResp + SuccessResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult `json:"data"` +} +type AccountCheckReq struct { OperationID string `json:"operationID" binding:"required"` UserIDList []string `json:"userIDList" binding:"required,lte=100"` } +type AccountCheckResp struct { + CommResp + ResultList []*pbUser.AccountCheckResp_SingleUserStatus `json:"data"` +} type AtElem struct { Text string `mapstructure:"text"` diff --git a/pkg/base_info/user_api_struct.go b/pkg/base_info/user_api_struct.go index 2e736e97f..ff4695011 100644 --- a/pkg/base_info/user_api_struct.go +++ b/pkg/base_info/user_api_struct.go @@ -4,20 +4,6 @@ import ( open_im_sdk "Open_IM/pkg/proto/sdk_ws" ) -type GetUsersOnlineStatusReq struct { - OperationID string `json:"operationID" binding:"required"` - UserIDList []string `json:"userIDList" binding:"required,lte=200"` - Secret string `json:"secret" binding:"required,max=32"` -} -type OnlineStatus struct { - UserID string `json:"userID"` - Status string `json:"status"` -} -type GetUsersOnlineStatusResp struct { - CommResp - OnlineStatusList []*OnlineStatus `json:"data"` -} - type GetUserInfoReq struct { OperationID string `json:"operationID" binding:"required"` UserIDList []string `json:"userIDList" binding:"required"` diff --git a/pkg/proto/relay/relay.pb.go b/pkg/proto/relay/relay.pb.go index 02eb997e0..c2a3cda0c 100644 --- a/pkg/proto/relay/relay.pb.go +++ b/pkg/proto/relay/relay.pb.go @@ -36,7 +36,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_f80d9497f96c724f, []int{0} + return fileDescriptor_relay_de3bbbc2d62c0c49, []int{0} } func (m *OnlinePushMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OnlinePushMsgReq.Unmarshal(m, b) @@ -81,7 +81,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_f80d9497f96c724f, []int{1} + return fileDescriptor_relay_de3bbbc2d62c0c49, []int{1} } func (m *OnlinePushMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OnlinePushMsgResp.Unmarshal(m, b) @@ -121,7 +121,7 @@ func (m *SingleMsgToUser) Reset() { *m = SingleMsgToUser{} } func (m *SingleMsgToUser) String() string { return proto.CompactTextString(m) } func (*SingleMsgToUser) ProtoMessage() {} func (*SingleMsgToUser) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_f80d9497f96c724f, []int{2} + return fileDescriptor_relay_de3bbbc2d62c0c49, []int{2} } func (m *SingleMsgToUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SingleMsgToUser.Unmarshal(m, b) @@ -165,6 +165,7 @@ func (m *SingleMsgToUser) GetRecvPlatFormID() int32 { type GetUsersOnlineStatusReq struct { UserIDList []string `protobuf:"bytes,1,rep,name=userIDList" json:"userIDList,omitempty"` OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -174,7 +175,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_f80d9497f96c724f, []int{3} + return fileDescriptor_relay_de3bbbc2d62c0c49, []int{3} } func (m *GetUsersOnlineStatusReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusReq.Unmarshal(m, b) @@ -208,6 +209,13 @@ func (m *GetUsersOnlineStatusReq) GetOperationID() string { return "" } +func (m *GetUsersOnlineStatusReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + type GetUsersOnlineStatusResp struct { ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` @@ -222,7 +230,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_f80d9497f96c724f, []int{4} + return fileDescriptor_relay_de3bbbc2d62c0c49, []int{4} } func (m *GetUsersOnlineStatusResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp.Unmarshal(m, b) @@ -284,7 +292,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_f80d9497f96c724f, []int{4, 0} + return fileDescriptor_relay_de3bbbc2d62c0c49, []int{4, 0} } func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Unmarshal(m, b) @@ -331,7 +339,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_f80d9497f96c724f, []int{4, 1} + return fileDescriptor_relay_de3bbbc2d62c0c49, []int{4, 1} } func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Unmarshal(m, b) @@ -387,7 +395,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_f80d9497f96c724f, []int{4, 2} + return fileDescriptor_relay_de3bbbc2d62c0c49, []int{4, 2} } func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Unmarshal(m, b) @@ -544,42 +552,42 @@ var _OnlineMessageRelayService_serviceDesc = grpc.ServiceDesc{ Metadata: "relay/relay.proto", } -func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_f80d9497f96c724f) } - -var fileDescriptor_relay_f80d9497f96c724f = []byte{ - // 531 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5f, 0x6f, 0xd2, 0x50, - 0x14, 0x4f, 0x65, 0x6c, 0x72, 0x18, 0x4e, 0x6e, 0xc8, 0x56, 0xfb, 0x80, 0xc8, 0x83, 0x21, 0x46, - 0x4b, 0x82, 0x8f, 0x3e, 0x98, 0x6c, 0xcd, 0x0c, 0x89, 0x0d, 0xe4, 0xa2, 0xd1, 0xe8, 0x03, 0xb9, - 0xa3, 0x67, 0xb5, 0xa1, 0xd0, 0x72, 0xcf, 0xed, 0x16, 0xbf, 0x8e, 0x5f, 0x42, 0x3f, 0x9e, 0xe9, - 0xbd, 0x05, 0x0b, 0x61, 0x2e, 0x7b, 0x21, 0x9c, 0x3f, 0xf7, 0xf7, 0xaf, 0xed, 0x85, 0xa6, 0xc4, - 0x58, 0xfc, 0xec, 0xeb, 0x5f, 0x37, 0x95, 0x89, 0x4a, 0x58, 0x55, 0x17, 0xce, 0x8b, 0x51, 0x8a, - 0xcb, 0xe9, 0xd0, 0xef, 0xa7, 0xf3, 0xb0, 0xaf, 0x27, 0x7d, 0x0a, 0xe6, 0xd3, 0x5b, 0xea, 0xdf, - 0x92, 0xd9, 0xec, 0x06, 0xf0, 0x74, 0xb4, 0x8c, 0xa3, 0x25, 0x8e, 0x33, 0xfa, 0xe1, 0x53, 0xc8, - 0x71, 0xc5, 0x3a, 0x50, 0x1f, 0xa5, 0x28, 0x85, 0x8a, 0x92, 0xe5, 0xd0, 0xb3, 0xad, 0x8e, 0xd5, - 0xab, 0xf1, 0x72, 0x8b, 0xb9, 0x70, 0xb4, 0xa0, 0xd0, 0x13, 0x4a, 0xd8, 0x8f, 0x3a, 0x56, 0xaf, - 0x3e, 0x68, 0xb9, 0x49, 0x4e, 0x15, 0x2d, 0xa6, 0x14, 0xcc, 0x5d, 0xdf, 0xcc, 0xf8, 0x7a, 0xa9, - 0xfb, 0x1e, 0x9a, 0x3b, 0x2c, 0x94, 0xb2, 0x57, 0x70, 0x20, 0x91, 0x52, 0xdb, 0xea, 0x54, 0x7a, - 0xf5, 0xc1, 0xa9, 0x6b, 0x0c, 0x4c, 0xa2, 0x65, 0x18, 0xa3, 0x4f, 0xe1, 0xa7, 0xe4, 0x33, 0xa1, - 0xe4, 0x7a, 0xa7, 0xbb, 0x82, 0x93, 0x9d, 0x01, 0x6b, 0x03, 0x70, 0xa4, 0x2c, 0x56, 0x17, 0x49, - 0x80, 0x5a, 0x64, 0x85, 0x97, 0x3a, 0xec, 0x14, 0x0e, 0x39, 0xce, 0x6e, 0x86, 0x9e, 0x96, 0x58, - 0xe3, 0x45, 0xc5, 0x5e, 0xc2, 0x93, 0xfc, 0xdf, 0x38, 0x16, 0xea, 0x32, 0x91, 0x8b, 0xa1, 0x67, - 0x57, 0x3a, 0x56, 0xaf, 0xca, 0x77, 0xba, 0xdd, 0xef, 0x70, 0xf6, 0x01, 0x55, 0x4e, 0x45, 0x46, - 0xfb, 0x44, 0x09, 0x95, 0x51, 0x1e, 0x50, 0x1b, 0x20, 0x23, 0x94, 0x43, 0xef, 0x63, 0x44, 0x4a, - 0xeb, 0xaf, 0xf1, 0x52, 0x27, 0x0f, 0x30, 0x29, 0x05, 0x68, 0xf8, 0xcb, 0xad, 0xee, 0xef, 0x03, - 0xb0, 0xf7, 0xa3, 0x53, 0xca, 0x6c, 0x38, 0x42, 0x29, 0x37, 0xb6, 0xaa, 0x7c, 0x5d, 0xe6, 0x9e, - 0x50, 0x4a, 0x9f, 0xc2, 0xb5, 0x27, 0x53, 0xb1, 0x09, 0x34, 0x28, 0x9b, 0xcd, 0x90, 0xc8, 0x04, - 0x60, 0x57, 0x74, 0xa6, 0x6f, 0x8a, 0x4c, 0xef, 0x62, 0x72, 0x27, 0xe5, 0x43, 0x7c, 0x1b, 0x83, - 0x8d, 0xe1, 0xf8, 0x5a, 0x44, 0x31, 0x06, 0x05, 0xe6, 0x81, 0xc6, 0x7c, 0x7d, 0x1f, 0xe6, 0xa5, - 0x3e, 0xe3, 0xa1, 0x12, 0x51, 0xcc, 0xb7, 0x10, 0x9c, 0x0b, 0x68, 0x14, 0x8c, 0x66, 0xcc, 0x1c, - 0x78, 0x9c, 0xc6, 0x42, 0x5d, 0x27, 0x72, 0x51, 0xbc, 0x66, 0x9b, 0x3a, 0xf7, 0x4a, 0x1a, 0x75, - 0xed, 0xd5, 0x54, 0xce, 0x57, 0x38, 0x2e, 0x53, 0xe4, 0x7b, 0x26, 0x7a, 0xfd, 0x1c, 0x6b, 0xbc, - 0xa8, 0x1e, 0x9e, 0xa2, 0xf3, 0xcb, 0xda, 0xe8, 0x2b, 0x22, 0xf8, 0x87, 0x6d, 0x6d, 0x61, 0xdf, - 0xa1, 0x8d, 0x09, 0x68, 0x05, 0x5a, 0xd5, 0xb8, 0x70, 0x61, 0x72, 0x79, 0xe0, 0xe3, 0x28, 0xb2, - 0xdb, 0x0b, 0x35, 0xf8, 0x63, 0xc1, 0x33, 0x73, 0xd0, 0x47, 0x22, 0x11, 0x22, 0xcf, 0x31, 0x27, - 0x28, 0x6f, 0xa2, 0x19, 0xb2, 0x73, 0x68, 0x6c, 0x7d, 0x68, 0xec, 0xac, 0xe0, 0xdc, 0xfd, 0xc8, - 0x1d, 0x7b, 0xff, 0x80, 0x52, 0xf6, 0x05, 0x5a, 0xfb, 0x14, 0xb2, 0xf6, 0x7f, 0xe5, 0xaf, 0x9c, - 0xe7, 0xf7, 0xd8, 0x3b, 0x6f, 0x7e, 0x3b, 0x71, 0xcd, 0x35, 0xf5, 0x2e, 0xbd, 0xd2, 0xb2, 0xaf, - 0x0e, 0xf5, 0x2d, 0xf4, 0xf6, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x81, 0xe6, 0x3c, 0x27, 0xc4, - 0x04, 0x00, 0x00, +func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_de3bbbc2d62c0c49) } + +var fileDescriptor_relay_de3bbbc2d62c0c49 = []byte{ + // 539 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5f, 0x8f, 0xd2, 0x40, + 0x10, 0x4f, 0xe5, 0xfe, 0xc8, 0x70, 0x78, 0xb2, 0x21, 0x77, 0xb5, 0x0f, 0x88, 0x3c, 0x18, 0x62, + 0xb4, 0x24, 0xf8, 0xe8, 0x83, 0xc9, 0x5d, 0x73, 0x86, 0xc4, 0x06, 0xb2, 0x78, 0xd1, 0xf8, 0x42, + 0x7a, 0x74, 0xae, 0x36, 0x14, 0xba, 0xec, 0x6c, 0x8f, 0xf8, 0x75, 0xfc, 0x12, 0xfa, 0xf1, 0x4c, + 0x77, 0x0b, 0x16, 0xc2, 0x79, 0xb9, 0x17, 0xc2, 0xcc, 0xec, 0xfc, 0xfe, 0xb5, 0x5d, 0x68, 0x48, + 0x4c, 0x82, 0x9f, 0x3d, 0xfd, 0xeb, 0x0a, 0x99, 0xaa, 0x94, 0x1d, 0xea, 0xc2, 0x79, 0x35, 0x14, + 0xb8, 0x98, 0x0c, 0xfc, 0x9e, 0x98, 0x45, 0x3d, 0x3d, 0xe9, 0x51, 0x38, 0x9b, 0xac, 0xa8, 0xb7, + 0x22, 0x73, 0xb2, 0x13, 0xc2, 0xf3, 0xe1, 0x22, 0x89, 0x17, 0x38, 0xca, 0xe8, 0x87, 0x4f, 0x11, + 0xc7, 0x25, 0x6b, 0x43, 0x6d, 0x28, 0x50, 0x06, 0x2a, 0x4e, 0x17, 0x03, 0xcf, 0xb6, 0xda, 0x56, + 0xb7, 0xca, 0xcb, 0x2d, 0xe6, 0xc2, 0xf1, 0x9c, 0x22, 0x2f, 0x50, 0x81, 0xfd, 0xa4, 0x6d, 0x75, + 0x6b, 0xfd, 0xa6, 0x9b, 0xe6, 0x54, 0xf1, 0x7c, 0x42, 0xe1, 0xcc, 0xf5, 0xcd, 0x8c, 0xaf, 0x0f, + 0x75, 0x3e, 0x42, 0x63, 0x87, 0x85, 0x04, 0x7b, 0x03, 0x07, 0x12, 0x49, 0xd8, 0x56, 0xbb, 0xd2, + 0xad, 0xf5, 0xcf, 0x5c, 0x63, 0x60, 0x1c, 0x2f, 0xa2, 0x04, 0x7d, 0x8a, 0xbe, 0xa4, 0xd7, 0x84, + 0x92, 0xeb, 0x33, 0x9d, 0x25, 0x9c, 0xee, 0x0c, 0x58, 0x0b, 0x80, 0x23, 0x65, 0x89, 0xba, 0x4c, + 0x43, 0xd4, 0x22, 0x2b, 0xbc, 0xd4, 0x61, 0x67, 0x70, 0xc4, 0x71, 0x7a, 0x37, 0xf0, 0xb4, 0xc4, + 0x2a, 0x2f, 0x2a, 0xf6, 0x1a, 0x9e, 0xe5, 0xff, 0x46, 0x49, 0xa0, 0xae, 0x52, 0x39, 0x1f, 0x78, + 0x76, 0xa5, 0x6d, 0x75, 0x0f, 0xf9, 0x4e, 0xb7, 0xb3, 0x82, 0xf3, 0x4f, 0xa8, 0x72, 0x2a, 0x32, + 0xda, 0xc7, 0x2a, 0x50, 0x19, 0xe5, 0x01, 0xb5, 0x00, 0x32, 0x42, 0x39, 0xf0, 0x3e, 0xc7, 0xa4, + 0xb4, 0xfe, 0x2a, 0x2f, 0x75, 0xf2, 0x00, 0xd3, 0x52, 0x80, 0x86, 0xbf, 0xdc, 0x62, 0x0e, 0x3c, + 0x4d, 0xc5, 0xb5, 0xde, 0xd0, 0xf4, 0x55, 0xbe, 0xa9, 0x3b, 0xbf, 0x0f, 0xc0, 0xde, 0xcf, 0x4c, + 0x82, 0xd9, 0x70, 0x8c, 0x52, 0x6e, 0x2c, 0x1f, 0xf2, 0x75, 0x99, 0xfb, 0x45, 0x29, 0x7d, 0x8a, + 0xd6, 0x7e, 0x4d, 0xc5, 0xc6, 0x50, 0xa7, 0x6c, 0x3a, 0x45, 0x22, 0x13, 0x8e, 0x5d, 0xd1, 0x79, + 0xbf, 0x2b, 0xf2, 0xbe, 0x8f, 0xc9, 0x1d, 0x97, 0x97, 0xf8, 0x36, 0x06, 0x1b, 0xc1, 0xc9, 0x6d, + 0x10, 0x27, 0x18, 0x16, 0x98, 0x07, 0x1a, 0xf3, 0xed, 0x43, 0x98, 0x57, 0x7a, 0xc7, 0x43, 0x15, + 0xc4, 0x09, 0xdf, 0x42, 0x70, 0x2e, 0xa1, 0x5e, 0x30, 0x9a, 0x71, 0x1e, 0x91, 0x48, 0x02, 0x75, + 0x9b, 0xca, 0x79, 0xf1, 0x0a, 0x6e, 0xea, 0xdc, 0x2b, 0x69, 0xd4, 0xb5, 0x57, 0x53, 0x39, 0xdf, + 0xe0, 0xa4, 0x4c, 0x91, 0x9f, 0xcb, 0xca, 0x21, 0x17, 0xd5, 0xe3, 0x53, 0x74, 0x7e, 0x59, 0x1b, + 0x7d, 0x45, 0x04, 0xff, 0xb0, 0xad, 0x2d, 0xec, 0x7b, 0xb4, 0xb1, 0x00, 0x9a, 0xa1, 0x56, 0x35, + 0x2a, 0x5c, 0x98, 0x5c, 0x1e, 0xf9, 0x38, 0x8a, 0xec, 0xf6, 0x42, 0xf5, 0xff, 0x58, 0xf0, 0xc2, + 0x2c, 0xfa, 0x48, 0x14, 0x44, 0xc8, 0x73, 0xcc, 0x31, 0xca, 0xbb, 0x78, 0x8a, 0xec, 0x02, 0xea, + 0x5b, 0x1f, 0x21, 0x3b, 0x2f, 0x38, 0x77, 0x2f, 0x00, 0xc7, 0xde, 0x3f, 0x20, 0xc1, 0xbe, 0x42, + 0x73, 0x9f, 0x42, 0xd6, 0xfa, 0xaf, 0xfc, 0xa5, 0xf3, 0xf2, 0x01, 0x7b, 0x17, 0x8d, 0xef, 0xa7, + 0xae, 0xb9, 0xc2, 0x3e, 0x88, 0x1b, 0x2d, 0xfb, 0xe6, 0x48, 0xdf, 0x50, 0xef, 0xff, 0x06, 0x00, + 0x00, 0xff, 0xff, 0x6d, 0x5a, 0x23, 0x8f, 0xe0, 0x04, 0x00, 0x00, } diff --git a/pkg/proto/relay/relay.proto b/pkg/proto/relay/relay.proto index c3215db3f..fc95a4f7b 100644 --- a/pkg/proto/relay/relay.proto +++ b/pkg/proto/relay/relay.proto @@ -29,6 +29,7 @@ message SingleMsgToUser{ message GetUsersOnlineStatusReq{ repeated string userIDList = 1; string operationID = 2; + string opUserID = 3; } message GetUsersOnlineStatusResp{ int32 errCode = 1;