tidy code

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"`
 }