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
This commit is contained in:
Gordon 2022-08-01 16:42:25 +08:00
commit 4003befc2a
2 changed files with 5 additions and 5 deletions
internal/api/group
group.go
pkg/common/db
mongoModel.go

2
internal/api/group/group.go

@ -230,7 +230,7 @@ func GetGroupAllMemberList(c *gin.Context) {
client := rpc.NewGroupClient(etcdConn) client := rpc.NewGroupClient(etcdConn)
RpcResp, err := client.GetGroupAllMember(context.Background(), req) RpcResp, err := client.GetGroupAllMember(context.Background(), req)
if err != nil { if err != nil {
log.NewError(req.OperationID, "GetGroupAllMember failed ", err.Error(), req.String()) log.NewError(req.OperationID, "GetGroupAllMember failed err", err.Error(), req.String())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
return return
} }

8
pkg/common/db/mongoModel.go

@ -945,14 +945,14 @@ func (d *DataBases) GetUserFriendWorkMoments(showNumber, pageNumber int32, userI
} }
type SuperGroup struct { type SuperGroup struct {
GroupID string `bson:"group_id"` GroupID string `bson:"group_id" json:"groupID"`
//MemberNumCount int `bson:"member_num_count"` //MemberNumCount int `bson:"member_num_count"`
MemberIDList []string `bson:"member_id_list"` MemberIDList []string `bson:"member_id_list" json:"memberIDList"`
} }
type UserToSuperGroup struct { type UserToSuperGroup struct {
UserID string `bson:"user_id"` UserID string `bson:"user_id" json:"userID"`
GroupIDList []string `bson:"group_id_list"` GroupIDList []string `bson:"group_id_list" json:"groupIDList"`
} }
func (d *DataBases) CreateSuperGroup(groupID string, initMemberIDList []string, memberNumCount int) error { func (d *DataBases) CreateSuperGroup(groupID string, initMemberIDList []string, memberNumCount int) error {