Merge branch 'tuoyun' into superGroup

# Conflicts:
#	internal/msg_gateway/gate/callback.go
#	internal/msg_transfer/logic/online_history_msg_handler.go
#	internal/push/logic/callback.go
#	internal/push/logic/push_to_client.go
#	pkg/common/db/model.go
#	pkg/common/db/newRedisModel.go
#	pkg/proto/group/group.pb.go
#	pkg/proto/group/group.proto

pkg/base_info/group_api_struct.go

@@ -232,3 +232,17 @@ type SetGroupMemberNicknameReq struct {
 type SetGroupMemberNicknameResp struct {
 	CommResp
 }
+
+type SetGroupMemberInfoReq struct {
+	OperationID string  `json:"operationID" binding:"required"`
+	GroupID     string  `json:"groupID" binding:"required"`
+	UserID      string  `json:"userID" binding:"required"`
+	Nickname    *string `json:"nickname"`
+	FaceURL     *string `json:"userGroupFaceUrl"`
+	RoleLevel   *int32  `json:"roleLevel" validate:"gte=1,lte=3"`
+	Ex          *string `json:"ex"`
+}
+
+type SetGroupMemberInfoResp struct {
+	CommResp
+}

pkg/base_info/third_api_struct.go

@@ -57,3 +57,33 @@ type GetDownloadURLResp struct {
 		UpdateLog     string `json:"update_log"`
 	} `json:"data"`
 }
+
+type GetRTCInvitationInfoReq struct {
+	OperationID string `json:"operationID" binding:"required"`
+	ClientMsgID string `json:"clientMsgID" binding:"required"`
+}
+
+type GetRTCInvitationInfoResp struct {
+	CommResp
+	Data struct {
+		OpUserID   string `json:"opUserID"`
+		Invitation struct {
+			InviterUserID     string   `json:"inviterUserID"`
+			InviteeUserIDList []string `json:"inviteeUserIDList"`
+			GroupID           string   `json:"groupID"`
+			RoomID            string   `json:"roomID"`
+			Timeout           int32    `json:"timeout"`
+			MediaType         string   `json:"mediaType"`
+			SessionType       int32    `json:"sessionType"`
+		} `json:"invitation"`
+		OfflinePushInfo struct{} `json:"offlinePushInfo"`
+	} `json:"data"`
+}
+
+type GetRTCInvitationInfoStartAppReq struct {
+	OperationID string `json:"operationID" binding:"required"`
+}
+
+type GetRTCInvitationInfoStartAppResp struct {
+	GetRTCInvitationInfoResp
+}