diff --git a/config/config.yaml b/config/config.yaml index 04f14f854..be5937300 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -226,7 +226,7 @@ notification: groupApplicationAccepted: conversation: - reliabilityLevel: 3 + reliabilityLevel: 2 unreadCount: true offlinePush: switch: false diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 8a5edf918..c3a228744 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -245,6 +245,7 @@ func CreateGroup(c *gin.Context) { c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) return } + // req := &rpc.CreateGroupReq{GroupInfo: &open_im_sdk.GroupInfo{}} utils.CopyStructFields(req.GroupInfo, ¶ms) diff --git a/internal/rpc/msg/group_notification.go b/internal/rpc/msg/group_notification.go index 58898b6de..b252c6513 100644 --- a/internal/rpc/msg/group_notification.go +++ b/internal/rpc/msg/group_notification.go @@ -403,7 +403,7 @@ func MemberEnterNotification(req *pbGroup.GroupApplicationResponseReq) { log.Error(req.OperationID, "setGroupInfo failed ", err.Error(), req.GroupID, MemberEnterTips.Group) return } - if err := setOpUserInfo(req.OpUserID, req.GroupID, MemberEnterTips.EntrantUser); err != nil { + if err := setGroupMemberInfo(req.GroupID, req.FromUserID, MemberEnterTips.EntrantUser); err != nil { log.Error(req.OperationID, "setOpUserInfo failed ", err.Error(), req.OpUserID, req.GroupID, MemberEnterTips.EntrantUser) return } diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index b6db4dcc2..6dc9668c6 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -81,11 +81,15 @@ type GetGroupAllMemberResp struct { } type CreateGroupReq struct { - MemberList []*GroupAddMemberInfo `json:"memberList" binding:"required"` - OwnerUserID string `json:"ownerUserID" binding:"required"` - GroupName string `json:"groupName"` - GroupType int32 `json:"groupType"` - OperationID string `json:"operationID" binding:"required"` + MemberList []*GroupAddMemberInfo `json:"memberList" binding:"required"` + OwnerUserID string `json:"ownerUserID" binding:"required"` + GroupType int32 `json:"groupType"` + GroupName string `json:"groupName"` + Notification string `json:"notification"` + Introduction string `json:"introduction"` + FaceURL string `json:"faceURL"` + Ex string `json:"ex"` + OperationID string `json:"operationID" binding:"required"` } type CreateGroupResp struct { CommResp @@ -105,7 +109,7 @@ type GetGroupApplicationListResp struct { type GetUserReqGroupApplicationListReq struct { OperationID string `json:"operationID" binding:"required"` - UserID string `json:"userID" binding:"required"` + UserID string `json:"userID" binding:"required"` } type GetUserRespGroupApplicationResp struct {