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-05 14:43:03 +08:00
commit e77b4f334d
4 changed files with 402 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
internal/api/group/group.go
View File

@ -243,50 +243,6 @@ func GetGroupAllMemberList(c *gin.Context) {
c.JSON(http.StatusOK, memberListResp) c.JSON(http.StatusOK, memberListResp)
} }
//get_group_all_member_list_by_split
func GetGroupAllMemberListBySplit(c *gin.Context) {
params := api.GetGroupAllMemberListBySplitReq{}
if err := c.BindJSON(&params); err != nil {
log.NewError("0", "BindJSON failed ", err.Error())
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
return
}
req := &rpc.GetGroupAllMemberReq{}
utils.CopyStructFields(req, &params)
var ok bool
var errInfo string
ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
if !ok {
errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
log.NewError(req.OperationID, errMsg)
c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
return
}
log.NewInfo(req.OperationID, "GetGroupAllMember args ", req.String())
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
if etcdConn == nil {
errMsg := req.OperationID + "getcdv3.GetConn == nil"
log.NewError(req.OperationID, errMsg)
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
return
}
client := rpc.NewGroupClient(etcdConn)
RpcResp, err := client.GetGroupAllMember(context.Background(), req)
if err != nil {
log.NewError(req.OperationID, "GetGroupAllMember failed err", err.Error(), req.String())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
return
}
memberListResp := api.GetGroupAllMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, MemberList: RpcResp.MemberList}
memberListResp.Data = jsonData.JsonDataList(memberListResp.MemberList)
log.NewInfo(req.OperationID, "GetGroupAllMember api return ", memberListResp)
c.JSON(http.StatusOK, memberListResp)
}
// @Summary 获取用户加入群列表 // @Summary 获取用户加入群列表
// @Description 获取用户加入群列表 // @Description 获取用户加入群列表
// @Tags 群组相关 // @Tags 群组相关

27
pkg/base_info/group_api_struct.go
View File

@ -73,8 +73,8 @@ type GetGroupMemberListResp struct {
type GetGroupAllMemberReq struct { type GetGroupAllMemberReq struct {
GroupID string `json:"groupID" binding:"required"` GroupID string `json:"groupID" binding:"required"`
OperationID string `json:"operationID" binding:"required"` OperationID string `json:"operationID" binding:"required"`
Offset int `json:"offset"` Offset int32 `json:"offset" binding:"required"`
Count int `json:"count"` Count int32 `json:"count" binding:"required"`
} }
type GetGroupAllMemberResp struct { type GetGroupAllMemberResp struct {
CommResp CommResp
@ -82,17 +82,18 @@ type GetGroupAllMemberResp struct {
Data []map[string]interface{} `json:"data" swaggerignore:"true"` Data []map[string]interface{} `json:"data" swaggerignore:"true"`
} }
type GetGroupAllMemberListBySplitReq struct { //
GroupID string `json:"groupID" binding:"required"` //type GetGroupAllMemberListBySplitReq struct {
OperationID string `json:"operationID" binding:"required"` // GroupID string `json:"groupID" binding:"required"`
Offset int32 `json:"offset" binding:"required"` // OperationID string `json:"operationID" binding:"required"`
Count int32 `json:"count" binding:"required"` // Offset int32 `json:"offset" binding:"required"`
} // Count int32 `json:"count" binding:"required"`
type GetGroupAllMemberListBySplitResp struct { //}
CommResp //type GetGroupAllMemberListBySplitResp struct {
MemberList []*open_im_sdk.GroupMemberFullInfo `json:"-"` // CommResp
Data []map[string]interface{} `json:"data" swaggerignore:"true"` // MemberList []*open_im_sdk.GroupMemberFullInfo `json:"-"`
} // Data []map[string]interface{} `json:"data" swaggerignore:"true"`
//}
type CreateGroupReq struct { type CreateGroupReq struct {
MemberList []*GroupAddMemberInfo `json:"memberList"` MemberList []*GroupAddMemberInfo `json:"memberList"`

600
pkg/proto/group/group.pb.go
View File

File diff suppressed because it is too large Load Diff

15
pkg/proto/group/group.proto
View File

@ -433,6 +433,19 @@ message SetGroupMemberInfoResp{
CommonResp CommonResp = 1; CommonResp CommonResp = 1;
} }
message GetGroupAbstractInfoReq{
string groupID = 1;
string opUserID = 2;
string operationID = 3;
}
message GetGroupAbstractInfoResp{
CommonResp CommonResp = 1;
int32 groupMemberNumber = 2;
uint64 groupMemberListHash = 3;
}
service group{ service group{
rpc createGroup(CreateGroupReq) returns(CreateGroupResp); rpc createGroup(CreateGroupReq) returns(CreateGroupResp);
rpc joinGroup(JoinGroupReq) returns(JoinGroupResp); rpc joinGroup(JoinGroupReq) returns(JoinGroupResp);
@ -471,7 +484,7 @@ service group{
rpc GetJoinedSuperGroupList(GetJoinedSuperGroupListReq) returns (GetJoinedSuperGroupListResp); rpc GetJoinedSuperGroupList(GetJoinedSuperGroupListReq) returns (GetJoinedSuperGroupListResp);
rpc GetSuperGroupsInfo(GetSuperGroupsInfoReq) returns (GetSuperGroupsInfoResp); rpc GetSuperGroupsInfo(GetSuperGroupsInfoReq) returns (GetSuperGroupsInfoResp);
rpc SetGroupMemberInfo(SetGroupMemberInfoReq) returns (SetGroupMemberInfoResp); rpc SetGroupMemberInfo(SetGroupMemberInfoReq) returns (SetGroupMemberInfoResp);
rpc GetGroupAbstractInfo(GetGroupAbstractInfoReq) returns (GetGroupAbstractInfoResp);
} }