tidy code

pkg/base_info/conversation_api_struct.go

@@ -0,0 +1 @@
+package base_info

pkg/base_info/manage_api_struct.go

@@ -0,0 +1,98 @@
+package base_info
+
+import open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+
+type paramsManagementSendMsg struct {
+	OperationID      string                       `json:"operationID" binding:"required"`
+	SendID           string                       `json:"sendID" binding:"required"`
+	RecvID           string                       `json:"recvID" `
+	GroupID          string                       `json:"groupID" `
+	SenderNickName   string                       `json:"senderNickName" `
+	SenderFaceURL    string                       `json:"senderFaceURL" `
+	SenderPlatformID int32                        `json:"senderPlatformID"`
+	ForceList        []string                     `json:"forceList" `
+	Content          map[string]interface{}       `json:"content" binding:"required"`
+	ContentType      int32                        `json:"contentType" binding:"required"`
+	SessionType      int32                        `json:"sessionType" binding:"required"`
+	IsOnlineOnly     bool                         `json:"isOnlineOnly"`
+	OfflinePushInfo  *open_im_sdk.OfflinePushInfo `json:"offlinePushInfo"`
+}
+
+type PictureBaseInfo struct {
+	UUID   string `mapstructure:"uuid"`
+	Type   string `mapstructure:"type" validate:"required"`
+	Size   int64  `mapstructure:"size" validate:"required"`
+	Width  int32  `mapstructure:"width" validate:"required"`
+	Height int32  `mapstructure:"height" validate:"required"`
+	Url    string `mapstructure:"url" validate:"required"`
+}
+
+type PictureElem struct {
+	SourcePath      string          `mapstructure:"sourcePath"`
+	SourcePicture   PictureBaseInfo `mapstructure:"sourcePicture" validate:"required"`
+	BigPicture      PictureBaseInfo `mapstructure:"bigPicture" `
+	SnapshotPicture PictureBaseInfo `mapstructure:"snapshotPicture"`
+}
+type SoundElem struct {
+	UUID      string `mapstructure:"uuid"`
+	SoundPath string `mapstructure:"soundPath"`
+	SourceURL string `mapstructure:"sourceUrl"`
+	DataSize  int64  `mapstructure:"dataSize"`
+	Duration  int64  `mapstructure:"duration"`
+}
+type VideoElem struct {
+	VideoPath      string `mapstructure:"videoPath"`
+	VideoUUID      string `mapstructure:"videoUUID"`
+	VideoURL       string `mapstructure:"videoUrl"`
+	VideoType      string `mapstructure:"videoType"`
+	VideoSize      int64  `mapstructure:"videoSize"`
+	Duration       int64  `mapstructure:"duration"`
+	SnapshotPath   string `mapstructure:"snapshotPath"`
+	SnapshotUUID   string `mapstructure:"snapshotUUID"`
+	SnapshotSize   int64  `mapstructure:"snapshotSize"`
+	SnapshotURL    string `mapstructure:"snapshotUrl"`
+	SnapshotWidth  int32  `mapstructure:"snapshotWidth"`
+	SnapshotHeight int32  `mapstructure:"snapshotHeight"`
+}
+type FileElem struct {
+	FilePath  string `mapstructure:"filePath"`
+	UUID      string `mapstructure:"uuid"`
+	SourceURL string `mapstructure:"sourceUrl"`
+	FileName  string `mapstructure:"fileName"`
+	FileSize  int64  `mapstructure:"fileSize"`
+}
+
+type paramsDeleteUsers struct {
+	OperationID   string   `json:"operationID" binding:"required"`
+	DeleteUidList []string `json:"deleteUidList" binding:"required"`
+}
+type paramsGetAllUsersUid struct {
+	OperationID string `json:"operationID" binding:"required"`
+}
+type paramsGetUsersOnlineStatus struct {
+	OperationID string   `json:"operationID" binding:"required"`
+	UserIDList  []string `json:"userIDList" binding:"required,lte=200"`
+}
+type paramsAccountCheck struct {
+	OperationID string   `json:"operationID" binding:"required"`
+	UserIDList  []string `json:"userIDList" binding:"required,lte=100"`
+}
+
+type AtElem struct {
+	Text       string   `mapstructure:"text"`
+	AtUserList []string `mapstructure:"atUserList"`
+	IsAtSelf   bool     `mapstructure:"isAtSelf"`
+}
+type LocationElem struct {
+	Description string  `mapstructure:"description"`
+	Longitude   float64 `mapstructure:"longitude"`
+	Latitude    float64 `mapstructure:"latitude"`
+}
+type CustomElem struct {
+	Data        string `mapstructure:"data" validate:"required"`
+	Description string `mapstructure:"description"`
+	Extension   string `mapstructure:"extension"`
+}
+type TextElem struct {
+	Text string `mapstructure:"text" validate:"required"`
+}

pkg/common/db/mysql_model/im_mysql_model/friend_request_model.go

@@ -2,6 +2,7 @@ package im_mysql_model
 
 import (
 	"Open_IM/pkg/common/db"
+	"time"
 )
 
 //type FriendRequest struct {

pkg/common/db/mysql_model/im_mysql_model/group_member_model.go

@@ -2,6 +2,7 @@ package im_mysql_model
 
 import (
 	"Open_IM/pkg/common/db"
+	"time"
 )
 
 //type GroupMember struct {
@@ -61,7 +62,7 @@ func GetGroupMemberListByGroupIDAndRoleLevel(groupID string, roleLevel int32) ([
 		return nil, err
 	}
 	var groupMemberList []GroupMember
-	err = dbConn.Table("group_member").Where("group_id=? and role_level=?", groupID, role_level).Find(&groupMemberList).Error
+	err = dbConn.Table("group_member").Where("group_id=? and role_level=?", groupID, roleLevel).Find(&groupMemberList).Error
 	if err != nil {
 		return nil, err
 	}

pkg/common/db/mysql_model/im_mysql_model/group_model.go

@@ -2,8 +2,6 @@ package im_mysql_model
 
 import (
 	"Open_IM/pkg/common/db"
-	"Open_IM/pkg/proto/group"
-	"errors"
 	"time"
 )
 

pkg/common/db/mysql_model/im_mysql_model/group_request_model.go

@@ -2,8 +2,6 @@ package im_mysql_model
 
 import (
 	"Open_IM/pkg/common/db"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/proto/group"
 	"time"
 )
 

pkg/common/db/mysql_model/im_mysql_model/model_struct.go

@@ -95,7 +95,7 @@ type GroupMember struct {
 	JoinTime       time.Time `gorm:"column:join_time"`
 	Nickname       string    `gorm:"column:nickname"`
 	FaceUrl        string    `gorm:"user_group_face_url"`
-	JoinSource     int32     `gorm:"column:join_source"`
+	JoinSource     time.Time `gorm:"column:join_source"`
 	OperatorUserID string    `gorm:"column:operator_user_id"`
 	Ex             string    `gorm:"column:ex"`
 }

pkg/common/utils/utils.go

@@ -0,0 +1,95 @@
+package utils
+
+import (
+	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	"Open_IM/pkg/common/token_verify"
+	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+	"Open_IM/pkg/utils"
+	"math/rand"
+	"strconv"
+	"time"
+)
+
+func OperationIDGenerator() string {
+	return strconv.FormatInt(time.Now().UnixNano()+int64(rand.Uint32()), 10)
+}
+
+func FriendOpenIMCopyDB(dst *imdb.Friend, src open_im_sdk.FriendInfo) {
+	utils.CopyStructFields(dst, src)
+	dst.FriendUserID = src.FriendUser.UserID
+}
+
+func FriendDBCopyOpenIM(dst *open_im_sdk.FriendInfo, src imdb.Friend) {
+	utils.CopyStructFields(dst, src)
+	user, _ := imdb.GetUserByUserID(src.FriendUserID)
+	if user != nil {
+		utils.CopyStructFields(dst.FriendUser, user)
+	}
+}
+
+//
+func FriendRequestOpenIMCopyDB(dst *imdb.FriendRequest, src open_im_sdk.FriendRequest) {
+	utils.CopyStructFields(dst, src)
+}
+
+func FriendRequestDBCopyOpenIM(dst *open_im_sdk.FriendRequest, src imdb.FriendRequest) {
+	utils.CopyStructFields(dst, src)
+}
+
+func GroupOpenIMCopyDB(dst *imdb.Group, src open_im_sdk.GroupInfo) {
+	utils.CopyStructFields(dst, src)
+}
+
+func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src imdb.Group) {
+	utils.CopyStructFields(dst, src)
+	user, _ := imdb.GetGroupOwnerInfoByGroupID(src.GroupID)
+	if user != nil {
+		dst.OwnerUserID = user.UserID
+	}
+	dst.MemberCount = imdb.GetGroupMemberNumByGroupID(src.GroupID)
+}
+
+func GroupMemberOpenIMCopyDB(dst *imdb.GroupMember, src open_im_sdk.GroupMemberFullInfo) {
+	utils.CopyStructFields(dst, src)
+}
+
+func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src imdb.GroupMember) {
+	utils.CopyStructFields(dst, src)
+	if token_verify.IsMangerUserID(src.UserID) {
+		u, _ := imdb.GetUserByUserID(src.UserID)
+		if u != nil {
+			utils.CopyStructFields(dst, u)
+		}
+		dst.AppMangerLevel = 1
+	}
+}
+
+func GroupRequestOpenIMCopyDB(dst *imdb.GroupRequest, src open_im_sdk.GroupRequest) {
+	utils.CopyStructFields(dst, src)
+}
+
+func GroupRequestDBCopyOpenIM(dst *open_im_sdk.GroupRequest, src imdb.GroupRequest) {
+	utils.CopyStructFields(dst, src)
+}
+
+func UserOpenIMCopyDB(dst *imdb.User, src open_im_sdk.UserInfo) {
+	utils.CopyStructFields(dst, src)
+}
+
+func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src imdb.User) {
+	utils.CopyStructFields(dst, src)
+}
+
+func BlackOpenIMCopyDB(dst *imdb.Black, src open_im_sdk.BlackInfo) {
+	utils.CopyStructFields(dst, src)
+	dst.BlockUserID = src.BlackUserInfo.UserID
+}
+
+func BlackDBCopyOpenIM(dst *open_im_sdk.BlackInfo, src imdb.Black) {
+	utils.CopyStructFields(dst, src)
+	dst.CreateTime = src.CreateTime.Unix()
+	user, _ := imdb.GetUserByUserID(src.BlockUserID)
+	if user != nil {
+		utils.CopyStructFields(dst.BlackUserInfo, user)
+	}
+}

pkg/utils/utils.go

@@ -1,14 +1,8 @@
 package utils
 
 import (
-	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
-	"Open_IM/pkg/common/token_verify"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"fmt"
-	"math/rand"
 	"reflect"
-	"strconv"
-	"time"
 )
 
 // copy a by b  b->a
@@ -49,86 +43,3 @@ func CopyStructFields(a interface{}, b interface{}, fields ...string) (err error
 	}
 	return nil
 }
-
-func OperationIDGenerator() string {
-	return strconv.FormatInt(time.Now().UnixNano()+int64(rand.Uint32()), 10)
-}
-
-func FriendOpenIMCopyDB(dst *imdb.Friend, src open_im_sdk.FriendInfo) {
-	CopyStructFields(dst, src)
-	dst.FriendUserID = src.FriendUser.UserID
-}
-
-func FriendDBCopyOpenIM(dst *open_im_sdk.FriendInfo, src imdb.Friend) {
-	CopyStructFields(dst, src)
-	user, _ := imdb.GetUserByUserID(src.FriendUserID)
-	if user != nil {
-		CopyStructFields(dst.FriendUser, user)
-	}
-}
-
-//
-func FriendRequestOpenIMCopyDB(dst *imdb.FriendRequest, src open_im_sdk.FriendRequest) {
-	CopyStructFields(dst, src)
-}
-
-func FriendRequestDBCopyOpenIM(dst *open_im_sdk.FriendRequest, src imdb.FriendRequest) {
-	CopyStructFields(dst, src)
-}
-
-func GroupOpenIMCopyDB(dst *imdb.Group, src open_im_sdk.GroupInfo) {
-	CopyStructFields(dst, src)
-}
-
-func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src imdb.Group) {
-	CopyStructFields(dst, src)
-	user, _ := imdb.GetGroupOwnerInfoByGroupID(src.GroupID)
-	if user != nil {
-		dst.OwnerUserID = user.UserID
-	}
-	dst.MemberCount = imdb.GetGroupMemberNumByGroupID(src.GroupID)
-}
-
-func GroupMemberOpenIMCopyDB(dst *imdb.GroupMember, src open_im_sdk.GroupMemberFullInfo) {
-	CopyStructFields(dst, src)
-}
-
-func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src imdb.GroupMember) {
-	CopyStructFields(dst, src)
-	if token_verify.IsMangerUserID(src.UserID) {
-		u, _ := imdb.GetUserByUserID(src.UserID)
-		if u != nil {
-			CopyStructFields(dst, u)
-		}
-		dst.AppMangerLevel = 1
-	}
-}
-
-func GroupRequestOpenIMCopyDB(dst *imdb.GroupRequest, src open_im_sdk.GroupRequest) {
-	CopyStructFields(dst, src)
-}
-
-func GroupRequestDBCopyOpenIM(dst *open_im_sdk.GroupRequest, src imdb.GroupRequest) {
-	CopyStructFields(dst, src)
-}
-
-func UserOpenIMCopyDB(dst *imdb.User, src open_im_sdk.UserInfo) {
-	CopyStructFields(dst, src)
-}
-
-func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src imdb.User) {
-	CopyStructFields(dst, src)
-}
-
-func BlackOpenIMCopyDB(dst *imdb.Black, src open_im_sdk.BlackInfo) {
-	CopyStructFields(dst, src)
-	dst.BlockUserID = src.BlackUserInfo.UserID
-}
-
-func BlackDBCopyOpenIM(dst *open_im_sdk.BlackInfo, src imdb.Black) {
-	CopyStructFields(dst, src)
-	user, _ := imdb.GetUserByUserID(src.BlockUserID)
-	if user != nil {
-		CopyStructFields(dst.BlackUserInfo, user)
-	}
-}