From 93e669d7d3b36623e5f9e61e055d9b41d7f466a2 Mon Sep 17 00:00:00 2001
From: wenxu12345 <44203734@qq.com>
Date: Thu, 30 Dec 2021 16:27:57 +0800
Subject: [PATCH] Refactor code

---
 cmd/open_im_api/main.go           | 2 +-
 internal/api/group/group.go       | 7 +++++--
 pkg/base_info/group_api_struct.go | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go
index 8efc36ab1..8afb38d63 100644
--- a/cmd/open_im_api/main.go
+++ b/cmd/open_im_api/main.go
@@ -59,7 +59,7 @@ func main() {
 		groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList)
 		groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMember)
 		groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo)
-		groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup)
+		groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup) //1
 		groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList)
 	}
 	//certificate
diff --git a/internal/api/group/group.go b/internal/api/group/group.go
index f400154aa..0238df400 100644
--- a/internal/api/group/group.go
+++ b/internal/api/group/group.go
@@ -120,9 +120,12 @@ func GetGroupMemberList(c *gin.Context) {
 		return
 	}
 
-	memberListResp := api.GetGroupMemberListResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, Data: RpcResp.MemberList, NextSeq: RpcResp.NextSeq}
-	c.JSON(http.StatusOK, memberListResp)
+	memberListResp := api.GetGroupMemberListResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, MemberList: RpcResp.MemberList, NextSeq: RpcResp.NextSeq}
+	if len(memberListResp.MemberList) == 0 {
+		memberListResp.MemberList = []*open_im_sdk.GroupMemberFullInfo{}
+	}
 	log.NewInfo(req.OperationID, "GetGroupMemberList api return ", memberListResp)
+	c.JSON(http.StatusOK, memberListResp)
 }
 
 func GetGroupAllMember(c *gin.Context) {
diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go
index 690506146..3bfa090d5 100644
--- a/pkg/base_info/group_api_struct.go
+++ b/pkg/base_info/group_api_struct.go
@@ -59,8 +59,8 @@ type GetGroupMemberListReq struct {
 }
 type GetGroupMemberListResp struct {
 	CommResp
-	NextSeq int32                              `json:"nextSeq"`
-	Data    []*open_im_sdk.GroupMemberFullInfo `json:"data"`
+	NextSeq    int32                              `json:"nextSeq"`
+	MemberList []*open_im_sdk.GroupMemberFullInfo `json:"data"`
 }
 
 type GetGroupAllMemberReq struct {