blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

Browse Source 
# Conflicts:
#	internal/api/user/user.go
This commit is contained in:
skiffer-git 2022-08-09 13:02:02 +08:00
commit c52bdce621
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/api/user/user.go
View File

@ -342,6 +342,7 @@ func GetSelfUserInfo(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg}) c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
return return
} }
req.UserIDList = append(req.UserIDList, params.UserID) req.UserIDList = append(req.UserIDList, params.UserID)
log.NewInfo(params.OperationID, "GetUserInfo args ", req.String()) log.NewInfo(params.OperationID, "GetUserInfo args ", req.String())

4
internal/push/getui/push.go
View File

@ -179,7 +179,7 @@ func (g *Getui) request(url string, content interface{}, token string, returnStr
return err return err
} }
client := &http.Client{} client := &http.Client{}
log.Debug(operationID, utils.GetSelfFuncName(), "json:", string(con)) log.Debug(operationID, utils.GetSelfFuncName(), "json:", string(con), "token:", token)
req, err := http.NewRequest("POST", config.Config.Push.Getui.PushUrl+url, bytes.NewBuffer(con)) req, err := http.NewRequest("POST", config.Config.Push.Getui.PushUrl+url, bytes.NewBuffer(con))
if err != nil { if err != nil {
return err return err
@ -197,7 +197,7 @@ func (g *Getui) request(url string, content interface{}, token string, returnStr
if err != nil { if err != nil {
return err return err
} }
log.NewInfo(operationID, "getui", utils.GetSelfFuncName(), "resp, ", string(result)) log.NewDebug(operationID, "getui", utils.GetSelfFuncName(), "resp, ", string(result))
commonResp := GetuiCommonResp{} commonResp := GetuiCommonResp{}
commonResp.Data = returnStruct commonResp.Data = returnStruct
if err := json.Unmarshal(result, &commonResp); err != nil { if err := json.Unmarshal(result, &commonResp); err != nil {

1
internal/rpc/msg/callback.go
View File

@ -28,6 +28,7 @@ func copyCallbackCommonReqStruct(msg *pbChat.SendMsgReq) cbApi.CommonCallbackReq
AtUserIDList: msg.MsgData.AtUserIDList, AtUserIDList: msg.MsgData.AtUserIDList,
SenderFaceURL: msg.MsgData.SenderFaceURL, SenderFaceURL: msg.MsgData.SenderFaceURL,
Content: callback.GetContent(msg.MsgData), Content: callback.GetContent(msg.MsgData),
Seq: msg.MsgData.Seq,
} }
return req return req
} }

5
internal/rpc/msg/send_msg.go
View File

@ -476,11 +476,6 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
log.NewError(msgToMQSingle.OperationID, "kafka send msg err:RecvID", msgToMQSingle.MsgData.RecvID, msgToMQSingle.String()) log.NewError(msgToMQSingle.OperationID, "kafka send msg err:RecvID", msgToMQSingle.MsgData.RecvID, msgToMQSingle.String())
return returnMsg(&replay, pb, 201, "kafka send msg err", "", 0) return returnMsg(&replay, pb, 201, "kafka send msg err", "", 0)
} }
// callback
callbackResp = callbackAfterSendSingleMsg(pb)
if callbackResp.ErrCode != 0 {
log.NewError(pb.OperationID, utils.GetSelfFuncName(), "callbackAfterSendSuperGroupMsg resp: ", callbackResp)
}
return returnMsg(&replay, pb, 0, "", msgToMQSingle.MsgData.ServerMsgID, msgToMQSingle.MsgData.SendTime) return returnMsg(&replay, pb, 0, "", msgToMQSingle.MsgData.ServerMsgID, msgToMQSingle.MsgData.SendTime)
default: default:

1
pkg/call_back_struct/common.go
View File

@ -14,6 +14,7 @@ type CommonCallbackReq struct {
Status int32 `json:"status"` Status int32 `json:"status"`
CreateTime int64 `json:"createTime"` CreateTime int64 `json:"createTime"`
Content string `json:"content"` Content string `json:"content"`
Seq uint32 `json:"seq"`
AtUserIDList []string `json:"atUserList"` AtUserIDList []string `json:"atUserList"`
SenderFaceURL string `json:"faceURL"` SenderFaceURL string `json:"faceURL"`
} }

4
pkg/common/db/RedisModel.go
View File

@ -383,8 +383,8 @@ func (d *DataBases) SetGetuiToken(token string, expireTime int64) error {
} }
func (d *DataBases) GetGetuiToken() (string, error) { func (d *DataBases) GetGetuiToken() (string, error) {
result := d.RDB.Get(context.Background(), getuiToken) result, err := d.RDB.Get(context.Background(), getuiToken).Result()
return result.String(), result.Err() return result, err
} }
func (d *DataBases) SetSendMsgFailedFlag(operationID string) error { func (d *DataBases) SetSendMsgFailedFlag(operationID string) error {