blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-08-09 20:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

send message modify and ws add binary pt

Browse Source
This commit is contained in:
Gordon 2021-10-25 10:00:52 +08:00
parent 6ab6a49e15
commit 8ac9090171
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,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": 0, "sendTime": reply.SendTime,
}, },
}) })

2
src/api/manage/management_chat.go
View File

@ -125,7 +125,7 @@ func ManagementSendMsg(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,
"sendTime": "", "sendTime": reply.SendTime,
"msgID": reply.ClientMsgID, "msgID": reply.ClientMsgID,
}) })

7
src/rpc/chat/chat/send_msg.go
View File

@ -66,7 +66,11 @@ func (rpc *rpcChat) UserSendMsg(_ context.Context, pb *pbChat.UserSendMsgReq) (*
pbData.MsgID = serverMsgID pbData.MsgID = serverMsgID
pbData.OperationID = pb.OperationID pbData.OperationID = pb.OperationID
pbData.Token = pb.Token pbData.Token = pb.Token
pbData.SendTime = pb.SendTime if pb.SendTime == 0 {
pbData.SendTime = utils.GetCurrentTimestampByNano()
} else {
pbData.SendTime = pb.SendTime
}
m := MsgCallBackResp{} m := MsgCallBackResp{}
if config.Config.MessageCallBack.CallbackSwitch { if config.Config.MessageCallBack.CallbackSwitch {
bMsg, err := http2.Post(config.Config.MessageCallBack.CallbackUrl, MsgCallBackReq{ bMsg, err := http2.Post(config.Config.MessageCallBack.CallbackUrl, MsgCallBackReq{
@ -182,5 +186,6 @@ func returnMsg(replay *pbChat.UserSendMsgResp, pb *pbChat.UserSendMsgReq, errCod
replay.ReqIdentifier = pb.ReqIdentifier replay.ReqIdentifier = pb.ReqIdentifier
replay.ClientMsgID = pb.ClientMsgID replay.ClientMsgID = pb.ClientMsgID
replay.ServerMsgID = serverMsgID replay.ServerMsgID = serverMsgID
replay.SendTime = sendTime
return replay, nil return replay, nil
} }