From 5233e4c097301af1638eb8302f83fa53ebca99d7 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 6 Sep 2022 16:08:28 +0800 Subject: [PATCH] fix bug --- internal/demo/register/set_password.go | 4 ++++ internal/rpc/group/group.go | 8 ++++++++ internal/rpc/user/user.go | 2 ++ .../db/mysql_model/im_mysql_model/group_member_model.go | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/internal/demo/register/set_password.go b/internal/demo/register/set_password.go index 74e93b95e..0c1a065fc 100644 --- a/internal/demo/register/set_password.go +++ b/internal/demo/register/set_password.go @@ -33,6 +33,8 @@ type ParamsSetPassword struct { OperationID string `json:"operationID" binding:"required"` AreaCode string `json:"areaCode"` InvitationCode string `json:"invitationCode"` + Gender int32 `json:"gender"` + Birth int32 `json:"birth"` } func SetPassword(c *gin.Context) { @@ -113,6 +115,8 @@ func SetPassword(c *gin.Context) { openIMRegisterReq.Nickname = params.Nickname openIMRegisterReq.Secret = config.Config.Secret openIMRegisterReq.FaceURL = params.FaceURL + openIMRegisterReq.Gender = params.Gender + openIMRegisterReq.Birth = uint32(params.Birth) openIMRegisterResp := api.UserRegisterResp{} log.NewDebug(params.OperationID, utils.GetSelfFuncName(), "register req:", openIMRegisterReq) bMsg, err := http2.Post(url, openIMRegisterReq, 2) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 971c21c32..aa7bb2b7e 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1365,6 +1365,14 @@ func (s *groupServer) GetGroups(_ context.Context, req *pbGroup.GetGroupsReq) (* resp.CommonResp.ErrMsg = err.Error() return resp, nil } + memberNum, err := imdb.GetGroupMembersCount(req.GroupID, "") + if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID) + resp.CommonResp.ErrCode = constant.ErrDB.ErrCode + resp.CommonResp.ErrMsg = err.Error() + return resp, nil + } + groupInfo.MemberCount = uint32(memberNum) resp.CMSGroups = append(resp.CMSGroups, &pbGroup.CMSGroup{GroupInfo: groupInfo, GroupOwnerUserName: groupMember.Nickname, GroupOwnerUserID: groupMember.UserID}) } else { groups, err := imdb.GetGroupsByName(req.GroupName, req.Pagination.PageNumber, req.Pagination.ShowNumber) diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 486f7e901..5aa93244a 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -561,6 +561,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb var user sdkws.UserInfo utils.CopyStructFields(&user, userDB) user.CreateTime = uint32(userDB.CreateTime.Unix()) + user.Birth = uint32(userDB.Birth.Unix()) resp.UserList = append(resp.UserList, &pbUser.CmsUser{User: &user}) } } else { @@ -582,6 +583,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb var user sdkws.UserInfo utils.CopyStructFields(&user, userDB) user.CreateTime = uint32(userDB.CreateTime.Unix()) + user.Birth = uint32(userDB.Birth.Unix()) resp.UserList = append(resp.UserList, &pbUser.CmsUser{User: &user}) } } diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go index d73ee287d..341094d5d 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go @@ -213,9 +213,9 @@ func GetGroupMembersByGroupIdCMS(groupId string, userName string, showNumber, pa return groupMembers, nil } -func GetGroupMembersCount(groupId, userName string) (int64, error) { +func GetGroupMembersCount(groupID, userName string) (int64, error) { var count int64 - if err := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("group_id=?", groupId).Where(fmt.Sprintf(" nickname like '%%%s%%' ", userName)).Count(&count).Error; err != nil { + if err := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("group_id=?", groupID).Where(fmt.Sprintf(" nickname like '%%%s%%' ", userName)).Count(&count).Error; err != nil { return count, err } return count, nil