From cc5125d51dbb0ed7e9bf19234d8947d8537c2140 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Thu, 30 Dec 2021 11:28:24 +0800 Subject: [PATCH 1/2] Refactor code --- cmd/open_im_api/main.go | 4 ++-- pkg/base_info/group_api_struct.go | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index ea550d174..510d8cf55 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -53,8 +53,8 @@ func main() { groupRouterGroup.POST("/quit_group", group.QuitGroup) //1 groupRouterGroup.POST("/group_application_response", group.ApplicationGroupResponse) groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner) - groupRouterGroup.POST("/get_group_applicationList", group.GetGroupApplicationList) - groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo) + groupRouterGroup.POST("/get_group_applicationList", group.GetGroupApplicationList) //1 + groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo) //1 groupRouterGroup.POST("/kick_group", group.KickGroupMember) groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList) groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMember) diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index e502ee10d..af109afdb 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -108,20 +108,20 @@ type GetGroupInfoResp struct { } type ApplicationGroupResponseReq struct { - OperationID string `json:"groupIDList" binding:"required"` - GroupID string `json:"groupIDList" binding:"required"` - FromUserID string `json:"groupIDList" binding:"required"` - HandledMsg string `json:"groupIDList" binding:"required"` - HandleResult int32 `json:"groupIDList" binding:"required"` + OperationID string `json:"operationID" binding:"required"` + GroupID string `json:"groupID" binding:"required"` + FromUserID string `json:"fromUserID" binding:"required"` + HandledMsg string `json:"handledMsg"` + HandleResult int32 `json:"handleResult" binding:"required"` } type ApplicationGroupResponseResp struct { CommResp } type JoinGroupReq struct { - GroupID string `json:"groupID"` + GroupID string `json:"groupID" binding:"required"` ReqMessage string `json:"reqMessage"` - OperationID string `json:"operationID"` + OperationID string `json:"operationID" binding:"required"` } type JoinGroupResp struct { CommResp From 81aaa951705f5ef6866576d82f3a2617a4528bf3 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Thu, 30 Dec 2021 11:42:10 +0800 Subject: [PATCH 2/2] Refactor code --- internal/api/group/group.go | 6 +++--- internal/rpc/group/group.go | 9 +++------ pkg/base_info/group_api_struct.go | 4 ++-- pkg/common/constant/constant.go | 3 +++ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 9401304cb..c7297e083 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -338,7 +338,7 @@ func ApplicationGroupResponse(c *gin.Context) { return } req := &rpc.GroupApplicationResponseReq{} - utils.CopyStructFields(req, params) + utils.CopyStructFields(req, ¶ms) var ok bool ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) if !ok { @@ -357,9 +357,9 @@ func ApplicationGroupResponse(c *gin.Context) { return } - resp := api.CommResp{ErrCode: reply.CommonResp.ErrCode, ErrMsg: reply.CommonResp.ErrMsg} - c.JSON(http.StatusOK, resp) + resp := api.ApplicationGroupResponseResp{CommResp: api.CommResp{ErrCode: reply.CommonResp.ErrCode, ErrMsg: reply.CommonResp.ErrMsg}} log.NewInfo(req.OperationID, "ApplicationGroupResponse api return ", resp) + c.JSON(http.StatusOK, resp) } func JoinGroup(c *gin.Context) { diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 7a7dd5cf1..e737fb163 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -432,23 +432,20 @@ func (s *groupServer) GroupApplicationResponse(_ context.Context, req *pbGroup.G log.NewInfo(req.OperationID, "GroupApplicationResponse args ", req.String()) groupRequest := imdb.GroupRequest{} + utils.CopyStructFields(&groupRequest, req) groupRequest.UserID = req.FromUserID - groupRequest.GroupID = req.GroupID - groupRequest.HandledTime = time.Now() - groupRequest.HandleResult = req.HandleResult groupRequest.HandleUserID = req.OpUserID - groupRequest.HandledMsg = req.HandledMsg err := imdb.UpdateGroupRequest(groupRequest) if err != nil { log.NewError(req.OperationID, "GroupApplicationResponse failed ", err.Error(), req.String()) return &pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil } chat.ApplicationProcessedNotification(req) - if req.HandleResult == 1 { + if req.HandleResult == constant.GroupResponseAgree { chat.MemberEnterNotification(req) } - log.NewInfo(req.OperationID, "rpc GroupApplicationResponse return ") + log.NewInfo(req.OperationID, "rpc GroupApplicationResponse return ", pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{}}) return &pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{}}, nil } diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index af109afdb..f6a5ef86f 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -110,9 +110,9 @@ type GetGroupInfoResp struct { type ApplicationGroupResponseReq struct { OperationID string `json:"operationID" binding:"required"` GroupID string `json:"groupID" binding:"required"` - FromUserID string `json:"fromUserID" binding:"required"` + FromUserID string `json:"fromUserID" binding:"required"` //application from FromUserID HandledMsg string `json:"handledMsg"` - HandleResult int32 `json:"handleResult" binding:"required"` + HandleResult int32 `json:"handleResult" binding:"required, oneof=-1 1"` } type ApplicationGroupResponseResp struct { CommResp diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index aa2f12c45..636096176 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -125,6 +125,9 @@ const ( GroupOwner = 2 GroupAdmin = 3 + GroupResponseAgree = 1 + GroupResponseRefuse = -1 + Male = 1 Female = 2 )