From 9f5897e06c9308a92bd5939a55acdac483eaa623 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Thu, 30 Dec 2021 11:04:53 +0800 Subject: [PATCH] Refactor code --- internal/api/group/group.go | 9 ++++++--- pkg/base_info/group_api_struct.go | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 87378cde6..9401304cb 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -302,7 +302,7 @@ func GetGroupsInfo(c *gin.Context) { return } req := &rpc.GetGroupsInfoReq{} - utils.CopyStructFields(req, params) + utils.CopyStructFields(req, ¶ms) var ok bool ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) if !ok { @@ -321,9 +321,12 @@ func GetGroupsInfo(c *gin.Context) { return } - resp := api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg} - c.JSON(http.StatusOK, resp) + resp := api.GetGroupInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, GroupInfoList: RpcResp.GroupInfoList} + if len(resp.GroupInfoList) == 0 { + resp.GroupInfoList = []*open_im_sdk.GroupInfo{} + } log.NewInfo(req.OperationID, "GetGroupsInfo api return ", resp) + c.JSON(http.StatusOK, resp) } //process application diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index 243dc4e2b..e502ee10d 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -104,7 +104,7 @@ type GetGroupInfoReq struct { } type GetGroupInfoResp struct { CommResp - Data []open_im_sdk.GroupInfo `json:"data"` + GroupInfoList []*open_im_sdk.GroupInfo `json:"data"` } type ApplicationGroupResponseReq struct {