From cd65d4200448c9e1d23aa4ad8fc57191951590e1 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 8 Aug 2022 16:46:43 +0800 Subject: [PATCH 1/4] getui debug --- internal/push/getui/push.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/push/getui/push.go b/internal/push/getui/push.go index 03d3346ce..a02a57ea8 100644 --- a/internal/push/getui/push.go +++ b/internal/push/getui/push.go @@ -179,7 +179,7 @@ func (g *Getui) request(url string, content interface{}, token string, returnStr return err } 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)) if err != nil { return err @@ -197,7 +197,7 @@ func (g *Getui) request(url string, content interface{}, token string, returnStr if err != nil { return err } - log.NewInfo(operationID, "getui", utils.GetSelfFuncName(), "resp, ", string(result)) + log.NewDebug(operationID, "getui", utils.GetSelfFuncName(), "resp, ", string(result)) commonResp := GetuiCommonResp{} commonResp.Data = returnStruct if err := json.Unmarshal(result, &commonResp); err != nil { From 4cfa8d880fc38967fbe04d639b88bd260f8e31fb Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 8 Aug 2022 17:14:59 +0800 Subject: [PATCH 2/4] getui debug --- pkg/common/db/RedisModel.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/common/db/RedisModel.go b/pkg/common/db/RedisModel.go index 589999d4c..4bbd66039 100644 --- a/pkg/common/db/RedisModel.go +++ b/pkg/common/db/RedisModel.go @@ -383,8 +383,8 @@ func (d *DataBases) SetGetuiToken(token string, expireTime int64) error { } func (d *DataBases) GetGetuiToken() (string, error) { - result := d.RDB.Get(context.Background(), getuiToken) - return result.String(), result.Err() + result, err := d.RDB.Get(context.Background(), getuiToken).Result() + return result, err } func (d *DataBases) SetSendMsgFailedFlag(operationID string) error { From ffc4da1589aa91199e818c36a3223df510e83d41 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 8 Aug 2022 17:42:06 +0800 Subject: [PATCH 3/4] callback add seq --- internal/rpc/msg/callback.go | 1 + internal/rpc/msg/send_msg.go | 5 ----- pkg/call_back_struct/common.go | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index ba03998a5..e00ee001a 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -28,6 +28,7 @@ func copyCallbackCommonReqStruct(msg *pbChat.SendMsgReq) cbApi.CommonCallbackReq AtUserIDList: msg.MsgData.AtUserIDList, SenderFaceURL: msg.MsgData.SenderFaceURL, Content: callback.GetContent(msg.MsgData), + Seq: msg.MsgData.Seq, } return req } diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index a73f14016..c9b17544d 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -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()) 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) default: diff --git a/pkg/call_back_struct/common.go b/pkg/call_back_struct/common.go index acbfced6d..ea61818e5 100644 --- a/pkg/call_back_struct/common.go +++ b/pkg/call_back_struct/common.go @@ -14,6 +14,7 @@ type CommonCallbackReq struct { Status int32 `json:"status"` CreateTime int64 `json:"createTime"` Content string `json:"content"` + Seq uint32 `json:"seq"` AtUserIDList []string `json:"atUserList"` SenderFaceURL string `json:"faceURL"` } From c304de92883e1f834a106e9c1a530f5b4875a2a6 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 8 Aug 2022 20:03:08 +0800 Subject: [PATCH 4/4] userinfo get --- internal/api/user/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/user/user.go b/internal/api/user/user.go index 48171ece0..257c2a7cf 100644 --- a/internal/api/user/user.go +++ b/internal/api/user/user.go @@ -343,7 +343,7 @@ func GetSelfUserInfo(c *gin.Context) { return } - req.UserIDList = append(req.UserIDList, req.OpUserID) + req.UserIDList = append(req.UserIDList, params.UserID) log.NewInfo(params.OperationID, "GetUserInfo args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)