blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-26 03:26:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor code

Browse Source
This commit is contained in:
wenxu12345 2021-12-30 17:44:06 +08:00
parent 0c02afa54e
commit 79a39b39d9
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,7 @@ func GetGroupAllMember(c *gin.Context) {
return return
} }
req := &rpc.GetGroupAllMemberReq{} req := &rpc.GetGroupAllMemberReq{}
utils.CopyStructFields(req, params) utils.CopyStructFields(req, &params)
var ok bool var ok bool
ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"))
if !ok { if !ok {
@ -165,9 +165,12 @@ func GetGroupAllMember(c *gin.Context) {
return return
} }
memberListResp := api.GetGroupAllMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, Data: RpcResp.MemberList} memberListResp := api.GetGroupAllMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, MemberList: RpcResp.MemberList}
c.JSON(http.StatusOK, memberListResp) if len(memberListResp.MemberList) == 0 {
memberListResp.MemberList = []*open_im_sdk.GroupMemberFullInfo{}
}
log.NewInfo(req.OperationID, "GetGroupAllMember api return ", memberListResp) log.NewInfo(req.OperationID, "GetGroupAllMember api return ", memberListResp)
c.JSON(http.StatusOK, memberListResp)
} }
func GetJoinedGroupList(c *gin.Context) { func GetJoinedGroupList(c *gin.Context) {

2
internal/rpc/group/group.go
View File

@ -261,7 +261,7 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro
for _, v := range memberList { for _, v := range memberList {
var node open_im_sdk.GroupMemberFullInfo var node open_im_sdk.GroupMemberFullInfo
utils.CopyStructFields(node, v) utils.CopyStructFields(&node, &v)
resp.MemberList = append(resp.MemberList, &node) resp.MemberList = append(resp.MemberList, &node)
} }
log.NewInfo(req.OperationID, "GetGroupAllMember rpc return ", resp.String()) log.NewInfo(req.OperationID, "GetGroupAllMember rpc return ", resp.String())

2
pkg/base_info/group_api_struct.go
View File

@ -69,7 +69,7 @@ type GetGroupAllMemberReq struct {
} }
type GetGroupAllMemberResp struct { type GetGroupAllMemberResp struct {
CommResp CommResp
Data []*open_im_sdk.GroupMemberFullInfo `json:"data"` MemberList []*open_im_sdk.GroupMemberFullInfo `json:"data"`
} }
type CreateGroupReq struct { type CreateGroupReq struct {