blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-23 21:39:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

msg api

Browse Source
This commit is contained in:
away 2021-06-28 15:26:31 +08:00
parent a2c097ff0e
commit ca0ee35d46
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/chat/pull_msg.go
View File

@ -13,13 +13,13 @@ import (
) )
type paramsUserPullMsg struct { type paramsUserPullMsg struct {
ReqIdentifier int `json:"reqIdentifier" binding:"required"` ReqIdentifier *int `json:"reqIdentifier" binding:"required"`
SendID string `json:"sendID" binding:"required"` SendID string `json:"sendID" binding:"required"`
OperationID string `json:"operationID" binding:"required"` OperationID string `json:"operationID" binding:"required"`
MsgIncr int `json:"msgIncr" binding:"required"` MsgIncr *int `json:"msgIncr" binding:"required"`
Data struct { Data struct {
SeqBegin int64 `json:"seqBegin" binding:"required"` SeqBegin *int64 `json:"seqBegin" binding:"required"`
SeqEnd int64 `json:"seqEnd" binding:"required"` SeqEnd *int64 `json:"seqEnd" binding:"required"`
} }
} }
@ -39,8 +39,8 @@ func UserPullMsg(c *gin.Context) {
pbData := pbChat.PullMessageReq{} pbData := pbChat.PullMessageReq{}
pbData.UserID = params.SendID pbData.UserID = params.SendID
pbData.OperationID = params.OperationID pbData.OperationID = params.OperationID
pbData.SeqBegin = params.Data.SeqBegin pbData.SeqBegin = *params.Data.SeqBegin
pbData.SeqEnd = params.Data.SeqEnd pbData.SeqEnd = *params.Data.SeqEnd
grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName) grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName)
msgClient := pbChat.NewChatClient(grpcConn) msgClient := pbChat.NewChatClient(grpcConn)
reply, err := msgClient.PullMessage(context.Background(), &pbData) reply, err := msgClient.PullMessage(context.Background(), &pbData)
@ -67,8 +67,8 @@ func UserPullMsg(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{
"errCode": reply.ErrCode, "errCode": reply.ErrCode,
"errMsg": reply.ErrMsg, "errMsg": reply.ErrMsg,
"msgIncr": params.MsgIncr, "msgIncr": *params.MsgIncr,
"reqIdentifier": params.ReqIdentifier, "reqIdentifier": *params.ReqIdentifier,
"data": msg, "data": msg,
}) })

9
src/api/chat/send_msg.go
View File

@ -18,17 +18,17 @@ type paramsUserSendMsg struct {
PlatformID int32 `json:"platformID" binding:"required"` PlatformID int32 `json:"platformID" binding:"required"`
SendID string `json:"sendID" binding:"required"` SendID string `json:"sendID" binding:"required"`
OperationID string `json:"operationID" binding:"required"` OperationID string `json:"operationID" binding:"required"`
MsgIncr int32 `json:"msgIncr" binding:"required"` MsgIncr int32 `json:"msgIncr"`
Data struct { Data struct {
SessionType int32 `json:"sessionType" binding:"required"` SessionType int32 `json:"sessionType" binding:"required"`
MsgFrom int32 `json:"msgFrom" binding:"required"` MsgFrom int32 `json:"msgFrom" binding:"required"`
ContentType int32 `json:"contentType" binding:"required"` ContentType int32 `json:"contentType" binding:"required"`
RecvID string `json:"recvID" binding:"required"` RecvID string `json:"recvID" binding:"required"`
ForceList []string `json:"forceList" binding:"required"` ForceList []string `json:"forceList"`
Content string `json:"content" binding:"required"` Content string `json:"content" binding:"required"`
Options map[string]interface{} `json:"options" binding:"required"` Options map[string]interface{} `json:"options" `
ClientMsgID string `json:"clientMsgID" binding:"required"` ClientMsgID string `json:"clientMsgID" binding:"required"`
OffLineInfo map[string]interface{} `json:"offlineInfo" binding:"required"` OffLineInfo map[string]interface{} `json:"offlineInfo" `
Ex map[string]interface{} `json:"ext"` Ex map[string]interface{} `json:"ext"`
} }
} }
@ -90,6 +90,7 @@ func UserSendMsg(c *gin.Context) {
"data": gin.H{ "data": gin.H{
"clientMsgID": reply.ClientMsgID, "clientMsgID": reply.ClientMsgID,
"serverMsgID": reply.ServerMsgID, "serverMsgID": reply.ServerMsgID,
"sendTime": reply.SendTime,
}, },
}) })