Merge branch 'tuoyun'

# Conflicts:
#	cmd/open_im_api/main.go
#	config/config.yaml
#	go.sum
#	pkg/common/config/config.go
#	pkg/common/db/model.go

pkg/base_info/conversation_api_struct.go

@@ -32,17 +32,83 @@ type SetReceiveMessageOptResp struct {
 	ConversationOptResultList []*OptResult `json:"data"`
 }
 
-//type Conversation struct {
-//	OwnerUserID      string `gorm:"column:owner_user_id;primary_key;type:char(128)" json:"OwnerUserID"`
-//	ConversationID   string `gorm:"column:conversation_id;primary_key;type:char(128)" json:"conversationID"`
-//	ConversationType int32  `gorm:"column:conversation_type" json:"conversationType"`
-//	UserID           string `gorm:"column:user_id;type:char(64)" json:"userID"`
-//	GroupID          string `gorm:"column:group_id;type:char(128)" json:"groupID"`
-//	RecvMsgOpt       int32  `gorm:"column:recv_msg_opt" json:"recvMsgOpt"`
-//	UnreadCount      int32  `gorm:"column:unread_count" json:"unreadCount"`
-//	DraftTextTime    int64  `gorm:"column:draft_text_time" json:"draftTextTime"`
-//	IsPinned         bool   `gorm:"column:is_pinned" json:"isPinned"`
-//	AttachedInfo     string `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
-//	Ex               string `gorm:"column:ex;type:varchar(1024)" json:"ex"`
-//}
+type Conversation struct {
+	OwnerUserID      string `json:"ownerUserID" binding:"required"`
+	ConversationID   string `json:"conversationID"`
+	ConversationType int32  `json:"conversationType"`
+	UserID           string `json:"userID"`
+	GroupID          string `json:"groupID"`
+	RecvMsgOpt       int32  `json:"recvMsgOpt"  binding:"omitempty,oneof=0 1 2"`
+	UnreadCount      int32  `json:"unreadCount"  binding:"omitempty"`
+	DraftTextTime    int64  `json:"draftTextTime"`
+	IsPinned         bool   `json:"isPinned" binding:"omitempty"`
+	IsPrivateChat    bool   `json:"isPrivateChat"`
+	AttachedInfo     string `json:"attachedInfo"`
+	Ex               string `json:"ex"`
+}
 
+type SetConversationReq struct {
+	Conversation
+	OperationID string `json:"operationID" binding:"required"`
+}
+
+type SetConversationResp struct {
+	CommResp
+}
+
+type BatchSetConversationsReq struct {
+	Conversations []Conversation `json:"conversations" binding:"required"`
+	OwnerUserID   string         `json:"ownerUserID" binding:"required"`
+	OperationID   string         `json:"operationID" binding:"required"`
+}
+
+type BatchSetConversationsResp struct {
+	CommResp
+	Data struct {
+		Success []string `json:"success"`
+		Failed  []string `json:"failed"`
+	} `json:"data"`
+}
+
+type GetConversationReq struct {
+	ConversationID string `json:"conversationID" binding:"required"`
+	OwnerUserID    string `json:"ownerUserID" binding:"required"`
+	OperationID    string `json:"operationID" binding:"required"`
+}
+
+type GetConversationResp struct {
+	CommResp
+	Conversation Conversation `json:"data"`
+}
+
+type GetAllConversationsReq struct {
+	OwnerUserID string `json:"ownerUserID" binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
+}
+
+type GetAllConversationsResp struct {
+	CommResp
+	Conversations []Conversation `json:"data"`
+}
+
+type GetConversationsReq struct {
+	ConversationIDs []string `json:"conversationIDs" binding:"required"`
+	OwnerUserID     string   `json:"ownerUserID" binding:"required"`
+	OperationID     string   `json:"operationID" binding:"required"`
+}
+
+type GetConversationsResp struct {
+	CommResp
+	Conversations []Conversation `json:"data"`
+}
+
+type SetRecvMsgOptReq struct {
+	OwnerUserID    string `json:"ownerUserID" binding:"required"`
+	ConversationID string `json:"conversationID"`
+	RecvMsgOpt     int32  `json:"recvMsgOpt"  binding:"omitempty,oneof=0 1 2"`
+	OperationID    string `json:"operationID" binding:"required"`
+}
+
+type SetRecvMsgOptResp struct {
+	CommResp
+}

pkg/base_info/group_api_struct.go

@@ -177,3 +177,11 @@ type TransferGroupOwnerReq struct {
 type TransferGroupOwnerResp struct {
 	CommResp
 }
+
+type DismissGroupReq struct {
+	GroupID     string `json:"groupID" binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
+}
+type DismissGroupResp struct {
+	CommResp
+}

pkg/base_info/minio_api_struct.go

@@ -6,8 +6,20 @@ type MinioStorageCredentialReq struct {
 
 type MiniostorageCredentialResp struct {
 	SecretAccessKey string `json:"secretAccessKey"`
-	AccessKeyID string `json:"accessKeyID"`
-	SessionToken string `json:"sessionToken"`
-	BucketName string `json:"bucketName"`
-	StsEndpointURL string `json:"stsEndpointURL"`
+	AccessKeyID     string `json:"accessKeyID"`
+	SessionToken    string `json:"sessionToken"`
+	BucketName      string `json:"bucketName"`
+	StsEndpointURL  string `json:"stsEndpointURL"`
+}
+
+type MinioUploadFileReq struct {
+	OperationID string `form:"operationID" binding:"required"`
+	FileType    int    `form:"fileType" binding:"required"`
+}
+
+type MinioUploadFileResp struct {
+	URL             string `json:"URL"`
+	NewName         string `json:"newName"`
+	SnapshotURL     string `json:"snapshotURL,omitempty"`
+	SnapshotNewName string `json:"snapshotName,omitempty"`
 }

pkg/base_info/msg.go

@@ -0,0 +1,12 @@
+package base_info
+
+type DelMsgReq struct {
+	OpUserID    string   `json:"opUserID,omitempty"`
+	UserID      string   `json:"userID,omitempty"`
+	SeqList     []uint32 `json:"seqList,omitempty"`
+	OperationID string   `json:"operationID,omitempty"`
+}
+
+type DelMsgResp struct {
+	CommResp
+}

pkg/base_info/office_struct.go

@@ -0,0 +1,74 @@
+package base_info
+
+import (
+	pbOffice "Open_IM/pkg/proto/office"
+)
+
+type GetUserTagsReq struct {
+	OperationID string `json:"operationID"`
+}
+
+type GetUserTagsResp struct {
+	CommResp
+	Data struct {
+		Tags []*pbOffice.Tag `json:"tags"`
+	} `json:"data"`
+}
+
+type CreateTagReq struct {
+	TagName     string   `json:"tagName" binding:"required"`
+	UserIDList  []string `json:"userIDList" binding:"required"`
+	OperationID string   `json:"operationID" binding:"required"`
+}
+
+type CreateTagResp struct {
+	CommResp
+}
+
+type DeleteTagReq struct {
+	TagID       string `json:"tagID" binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
+}
+
+type DeleteTagResp struct {
+	CommResp
+}
+
+type SetTagReq struct {
+	TagID              string   `json:"tagID" binding:"required"`
+	NewName            string   `json:"newName"`
+	IncreaseUserIDList []string `json:"increaseUserIDList"`
+	ReduceUserIDList   []string `json:"reduceUserIDList"`
+	OperationID        string   `json:"operationID" binding:"required"`
+}
+
+type SetTagResp struct {
+	CommResp
+}
+
+type SendMsg2TagReq struct {
+	TagID            string `json:"tagID" binding:"required"`
+	SenderPlatformID int32  `json:"senderPlatformID" binding:"required"`
+	Content          string `json:"content" binding:"required"`
+	ContentType      int32  `json:"contentType" binding:"required"`
+	OperationID      string `json:"operationID" binding:"required"`
+}
+
+type SendMsg2TagResp struct {
+	CommResp
+}
+
+type GetTagSendLogsReq struct {
+	PageNumber  int32  `json:"pageNumber" binding:"required"`
+	ShowNumber  int32  `json:"showNumber" binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
+}
+
+type GetTagSendLogsResp struct {
+	CommResp
+	Data struct {
+		Logs        []*pbOffice.TagSendLog `json:"logs"`
+		CurrentPage int32                  `json:"currentPage"`
+		ShowNumber  int32                  `json:"showNumber"`
+	} `json:"data"`
+}