From 1ce2a86f37f23f18c66af2517d396a7ecdec0ccc Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 29 Dec 2021 17:05:52 +0800 Subject: [PATCH 1/4] nil return modify --- internal/msg_gateway/gate/validate.go | 2 +- internal/rpc/user/user.go | 2 +- pkg/common/db/mysql_model/im_mysql_model/user_model.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/msg_gateway/gate/validate.go b/internal/msg_gateway/gate/validate.go index 269229e9c..fe1411a62 100644 --- a/internal/msg_gateway/gate/validate.go +++ b/internal/msg_gateway/gate/validate.go @@ -59,7 +59,7 @@ type SeqListData struct { func (ws *WServer) argsValidate(m *Req, r int32) (isPass bool, errCode int32, errMsg string, returnData interface{}) { switch r { case constant.WSSendMsg: - data := open_im_sdk.UserSendMsgReq{} + data := open_im_sdk.MsgData{} if err := proto.Unmarshal(m.Data, &data); err != nil { log.ErrorByKv("Decode Data struct err", "", "err", err.Error(), "reqIdentifier", r) return false, 203, err.Error(), nil diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 69d3c2bc3..c6391bcb3 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -104,7 +104,7 @@ func (s *userServer) SetReceiveMessageOpt(ctx context.Context, req *pbUser.SetRe resp := pbUser.SetReceiveMessageOptResp{CommonResp: &pbUser.CommonResp{}} for _, v := range req.ConversationIDList { - resp.ConversationOptResultList = append(resp.ConversationOptResultList, &pbUser.OptResult{ConversationID: v, Result: 0}) + resp.ConversationOptResultList = append(resp.ConversationOptResultList, &pbUser.OptResult{ConversationID: v, Result: req.Opt}) } log.NewInfo(req.OperationID, "SetReceiveMessageOpt rpc return ", resp.String()) return &resp, nil diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_model.go index 298487c38..fb7001b41 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go @@ -100,7 +100,7 @@ func SelectAllUserID() ([]string, error) { return nil, err } var resultArr []string - err = dbConn.Table("user").Select([]string{"user_id"}).Scan(&resultArr).Error + err = dbConn.Table("user").Select("user_id").Scan(&resultArr).Error if err != nil { return nil, err } From 7c04bcae26c093d7fcee099a78840f3e1b85e3d5 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 29 Dec 2021 17:34:44 +0800 Subject: [PATCH 2/4] nil return modify --- internal/msg_transfer/logic/db.go | 5 ----- pkg/common/db/mysql_model/im_mysql_model/user_model.go | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/internal/msg_transfer/logic/db.go b/internal/msg_transfer/logic/db.go index bd1972386..0c09e0c8e 100644 --- a/internal/msg_transfer/logic/db.go +++ b/internal/msg_transfer/logic/db.go @@ -2,7 +2,6 @@ package logic import ( "Open_IM/pkg/common/db" - "Open_IM/pkg/common/db/mysql_model/im_mysql_model" "Open_IM/pkg/common/log" pbMsg "Open_IM/pkg/proto/chat" "Open_IM/pkg/utils" @@ -21,7 +20,3 @@ func saveUserChat(uid string, msg *pbMsg.MsgDataToMQ) error { log.NewInfo(msg.OperationID, "IncrUserSeq cost time", utils.GetCurrentTimestampByMill()-time) return db.DB.SaveUserChat(uid, pbSaveData.MsgData.SendTime, &pbSaveData) } - -func getGroupList(groupID string) ([]string, error) { - return im_mysql_model.SelectGroupList(groupID) -} diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_model.go index fb7001b41..cd9267642 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go @@ -100,7 +100,7 @@ func SelectAllUserID() ([]string, error) { return nil, err } var resultArr []string - err = dbConn.Table("user").Select("user_id").Scan(&resultArr).Error + err = dbConn.Table("user").Select("user_id").Scan(resultArr).Error if err != nil { return nil, err } From bd5480b264e68de0f146e068178cd73497ac80b3 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 29 Dec 2021 17:39:04 +0800 Subject: [PATCH 3/4] nil return modify --- pkg/common/db/mysql_model/im_mysql_model/user_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_model.go index cd9267642..fb7001b41 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go @@ -100,7 +100,7 @@ func SelectAllUserID() ([]string, error) { return nil, err } var resultArr []string - err = dbConn.Table("user").Select("user_id").Scan(resultArr).Error + err = dbConn.Table("user").Select("user_id").Scan(&resultArr).Error if err != nil { return nil, err } From 8faf1140fb3c84cdddeb29fe6e815de13d609456 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 29 Dec 2021 17:51:06 +0800 Subject: [PATCH 4/4] nil return modify --- pkg/common/db/mysql_model/im_mysql_model/user_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_model.go index fb7001b41..46909e95c 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go @@ -100,7 +100,7 @@ func SelectAllUserID() ([]string, error) { return nil, err } var resultArr []string - err = dbConn.Table("user").Select("user_id").Scan(&resultArr).Error + err = dbConn.Table("user").Select("user_id").Pluck("user_id", &resultArr).Error if err != nil { return nil, err }