提交 79a39b39 编写于 作者: W wenxu12345

Refactor code

上级 0c02afa5
...@@ -146,7 +146,7 @@ func GetGroupAllMember(c *gin.Context) { ...@@ -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) { ...@@ -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) {
......
...@@ -261,7 +261,7 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro ...@@ -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())
......
...@@ -69,7 +69,7 @@ type GetGroupAllMemberReq struct { ...@@ -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 {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册