tidy code

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

@@ -8,6 +8,19 @@ import (
 	"time"
 )
 
+//type Group struct {
+//	GroupID       string    `gorm:"column:group_id;primaryKey;"`
+//	GroupName     string    `gorm:"column:name"`
+//	Introduction  string    `gorm:"column:introduction"`
+//	Notification  string    `gorm:"column:notification"`
+//	FaceUrl       string    `gorm:"column:face_url"`
+//	CreateTime    time.Time `gorm:"column:create_time"`
+//	Status        int32     `gorm:"column:status"`
+//	CreatorUserID string    `gorm:"column:creator_user_id"`
+//	GroupType     int32     `gorm:"column:group_type"`
+//	Ex            string    `gorm:"column:ex"`
+//}
+
 func InsertIntoGroup(groupInfo Group) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
@@ -24,228 +37,24 @@ func InsertIntoGroup(groupInfo Group) error {
 	return nil
 }
 
-func FindGroupInfoByGroupId(groupId string) (*Group, error) {
+func GetGroupInfoByGroupID(groupId string) (*Group, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var groupInfo Group
-	err = dbConn.Raw("select * from `group` where group_id=?", groupId).Scan(&groupInfo).Error
+	err = dbConn.Table("group").Where("group_id=?", groupId).Find(&groupInfo).Error
 	if err != nil {
 		return nil, err
 	}
 	return &groupInfo, nil
 }
 
-func SetGroupInfo(groupId, groupName, introduction, notification, groupFaceUrl, ex string) error {
+func SetGroupInfo(groupInfo Group) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	dbConn.LogMode(true)
 	if err != nil {
 		return err
 	}
-	if groupName != "" {
-		if err = dbConn.Exec("update `group` set name=? where group_id=?", groupName, groupId).Error; err != nil {
-			return err
-		}
-	}
-	if introduction != "" {
-		if err = dbConn.Exec("update `group` set introduction=? where group_id=?", introduction, groupId).Error; err != nil {
-			return err
-		}
-	}
-	if notification != "" {
-		if err = dbConn.Exec("update `group` set notification=? where group_id=?", notification, groupId).Error; err != nil {
-			return err
-		}
-	}
-	if groupFaceUrl != "" {
-		if err = dbConn.Exec("update `group` set face_url=? where group_id=?", groupFaceUrl, groupId).Error; err != nil {
-			return err
-		}
-	}
-	if ex != "" {
-		if err = dbConn.Exec("update `group` set ex=? where group_id=?", ex, groupId).Error; err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func GetGroupApplicationList(uid string) (*group.GetGroupApplicationListResp, error) {
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return nil, err
-	}
-
-	var gID string
-	var gIDs []string
-	rows, err := dbConn.Raw("select group_id from `group_member` where uid = ? and administrator_level > 0", uid).Rows()
-	defer rows.Close()
-	if err != nil {
-		return nil, err
-	}
-
-	for rows.Next() {
-		rows.Scan(&gID)
-		gIDs = append(gIDs, gID)
-	}
-
-	if len(gIDs) == 0 {
-		return &group.GetGroupApplicationListResp{}, nil
-	}
-
-	sql := "select id, group_id, from_user_id, to_user_id, flag, req_msg, handled_msg, create_time, " +
-		"from_user_nickname, to_user_nickname, from_user_face_url, to_user_face_url, handled_user  from `group_request` where  group_id in ( "
-	for i := 0; i < len(gIDs); i++ {
-		if i == len(gIDs)-1 {
-			sql = sql + "\"" + gIDs[i] + "\"" + " )"
-		} else {
-			sql = sql + "\"" + gIDs[i] + "\"" + ", "
-		}
-	}
-
-	var groupRequest GroupRequest
-	var groupRequests []GroupRequest
-	log.Info("", "", sql)
-	rows, err = dbConn.Raw(sql).Rows()
-	defer rows.Close()
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		rows.Scan(&groupRequest.ID, &groupRequest.GroupID, &groupRequest.FromUserID, &groupRequest.ToUserID, &groupRequest.Flag, &groupRequest.ReqMsg,
-			&groupRequest.HandledMsg, &groupRequest.CreateTime, &groupRequest.FromUserNickname, &groupRequest.ToUserNickname,
-			&groupRequest.FromUserFaceUrl, &groupRequest.ToUserFaceUrl, &groupRequest.HandledUser)
-		groupRequests = append(groupRequests, groupRequest)
-	}
-
-	reply := &group.GetGroupApplicationListResp{}
-	reply.Data = &group.GetGroupApplicationListData{}
-	reply.Data.Count = int32(len(groupRequests))
-	for i := 0; i < int(reply.Data.Count); i++ {
-		addUser := group.GetGroupApplicationList_Data_User{
-			ID:               groupRequests[i].ID,
-			GroupID:          groupRequests[i].GroupID,
-			FromUserID:       groupRequests[i].FromUserID,
-			FromUserNickname: groupRequests[i].FromUserNickname,
-			FromUserFaceUrl:  groupRequests[i].FromUserFaceUrl,
-			ToUserID:         groupRequests[i].ToUserID,
-			AddTime:          groupRequests[i].CreateTime.Unix(),
-			RequestMsg:       groupRequests[i].ReqMsg,
-			HandledMsg:       groupRequests[i].HandledMsg,
-			Flag:             groupRequests[i].Flag,
-			ToUserNickname:   groupRequests[i].ToUserNickname,
-			ToUserFaceUrl:    groupRequests[i].ToUserFaceUrl,
-			HandledUser:      groupRequests[i].HandledUser,
-			Type:             0,
-			HandleStatus:     0,
-			HandleResult:     0,
-		}
-
-		if addUser.ToUserID != "0" {
-			addUser.Type = 1
-		}
-
-		if len(groupRequests[i].HandledUser) > 0 {
-			if groupRequests[i].HandledUser == uid {
-				addUser.HandleStatus = 2
-			} else {
-				addUser.HandleStatus = 1
-			}
-		}
-
-		if groupRequests[i].Flag == 1 {
-			addUser.HandleResult = 1
-		}
-
-		reply.Data.User = append(reply.Data.User, &addUser)
-	}
-	return reply, nil
-}
-
-func TransferGroupOwner(pb *group.TransferGroupOwnerReq) (*group.TransferGroupOwnerResp, error) {
-	oldOwner, err := FindGroupMemberInfoByGroupIdAndUserId(pb.GroupID, pb.OldOwnerUserID)
-	if err != nil {
-		return nil, err
-	}
-	newOwner, err := FindGroupMemberInfoByGroupIdAndUserId(pb.GroupID, pb.NewOwnerUserID)
-	if err != nil {
-		return nil, err
-	}
-
-	if oldOwner.UserID == newOwner.UserID {
-		return nil, errors.New("the self")
-	}
-
-	if err = UpdateTheUserAdministratorLevel(pb.GroupID, pb.OldOwnerUserID, 0); err != nil {
-		return nil, err
-	}
-
-	if err = UpdateTheUserAdministratorLevel(pb.GroupID, pb.NewOwnerUserID, 1); err != nil {
-		UpdateTheUserAdministratorLevel(pb.GroupID, pb.OldOwnerUserID, 1)
-		return nil, err
-	}
-
-	return &group.TransferGroupOwnerResp{CommonResp: &group.CommonResp{ErrCode: 0}}, nil
-}
-
-func GroupApplicationResponse(pb *group.GroupApplicationResponseReq) (*group.CommonResp, error) {
-
-	ownerUser, err := FindGroupMemberInfoByGroupIdAndUserId(pb.GroupID, pb.OwnerID)
-	if err != nil {
-		log.ErrorByKv("FindGroupMemberInfoByGroupIdAndUserId failed", pb.OperationID, "groupId", pb.GroupID, "ownerID", pb.OwnerID)
-		return nil, err
-	}
-	if ownerUser.AdministratorLevel <= 0 {
-		return nil, errors.New("insufficient permissions")
-	}
-
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return nil, err
-	}
-	var groupRequest GroupRequest
-	err = dbConn.Raw("select * from `group_request` where handled_user = ? and group_id = ? and from_user_id = ? and to_user_id = ?",
-		"", pb.GroupID, pb.FromUserID, pb.ToUserID).Scan(&groupRequest).Error
-	if err != nil {
-		log.ErrorByKv("find group_request info failed", pb.OperationID, "groupId", pb.GroupID, "fromUserId", pb.FromUserID, "toUserId", pb.OwnerID)
-		return nil, err
-	}
-
-	if groupRequest.Flag != 0 {
-		return nil, errors.New("application has already handle")
-	}
-
-	var saveFlag int
-	if pb.HandleResult == 0 {
-		saveFlag = -1
-	} else if pb.HandleResult == 1 {
-		saveFlag = 1
-	} else {
-		return nil, errors.New("parma HandleResult error")
-	}
-	err = dbConn.Exec("update `group_request` set flag = ?, handled_msg = ?, handled_user = ? where group_id = ? and from_user_id = ? and to_user_id = ?",
-		saveFlag, pb.HandledMsg, pb.OwnerID, groupRequest.GroupID, groupRequest.FromUserID, groupRequest.ToUserID).Error
-	if err != nil {
-		log.ErrorByKv("update group request failed", pb.OperationID, "groupID", pb.GroupID, "flag", saveFlag, "ownerId", pb.OwnerID, "fromUserId", pb.FromUserID, "toUserID", pb.ToUserID)
-		return nil, err
-	}
-
-	if saveFlag == 1 {
-		if groupRequest.ToUserID == "0" {
-			err = InsertIntoGroupMember(pb.GroupID, pb.FromUserID, groupRequest.FromUserNickname, groupRequest.FromUserFaceUrl, 0)
-			if err != nil {
-				log.ErrorByKv("InsertIntoGroupMember failed", pb.OperationID, "groupID", pb.GroupID, "fromUserId", pb.FromUserID)
-				return nil, err
-			}
-		} else {
-			err = InsertIntoGroupMember(pb.GroupID, pb.ToUserID, groupRequest.ToUserNickname, groupRequest.ToUserFaceUrl, 0)
-			if err != nil {
-				log.ErrorByKv("InsertIntoGroupMember failed", pb.OperationID, "groupID", pb.GroupID, "fromUserId", pb.FromUserID)
-				return nil, err
-			}
-		}
-	}
-
-	return &group.GroupApplicationResponseResp{}, nil
+	err = dbConn.Table("friend_request").Where("group_id=?", groupInfo.GroupID).Update(&groupInfo).Error
+	return err
 }

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

@@ -2,15 +2,41 @@ package im_mysql_model
 
 import (
 	"Open_IM/pkg/common/db"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/proto/group"
 	"time"
 )
 
-func InsertIntoGroupRequest(groupId, fromUserId, toUserId, reqMsg, fromUserNickName, fromUserFaceUrl string) error {
+//type GroupRequest struct {
+//	UserID       string    `gorm:"column:user_id;primaryKey;"`
+//	GroupID      string    `gorm:"column:group_id;primaryKey;"`
+//	HandleResult int32    `gorm:"column:handle_result"`
+//	ReqMsg       string    `gorm:"column:req_msg"`
+//	HandledMsg   string    `gorm:"column:handled_msg"`
+//	ReqTime      time.Time `gorm:"column:req_time"`
+//	HandleUserID string    `gorm:"column:handle_user_id"`
+//	HandledTime  time.Time `gorm:"column:handle_time"`
+//	Ex           string    `gorm:"column:ex"`
+//}
+
+func UpdateGroupRequest(groupRequest GroupRequest) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	toInsertInfo := GroupRequest{GroupID: groupId, FromUserID: fromUserId, ToUserID: toUserId, ReqMsg: reqMsg, FromUserNickname: fromUserNickName, FromUserFaceUrl: fromUserFaceUrl, CreateTime: time.Now()}
+	err = dbConn.Table("group_request").Where("group_id=? and user_id=?", groupRequest.GroupID, groupRequest.UserID).Update(&groupRequest).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func InsertIntoGroupRequest(toInsertInfo GroupRequest) error {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return err
+	}
+	toInsertInfo.HandledTime = time.Now()
 	err = dbConn.Table("group_request").Create(&toInsertInfo).Error
 	if err != nil {
 		return err
@@ -18,45 +44,139 @@ func InsertIntoGroupRequest(groupId, fromUserId, toUserId, reqMsg, fromUserNickN
 	return nil
 }
 
-func FindGroupRequestUserInfoByGroupIDAndUid(groupId, uid string) (*GroupRequest, error) {
+func GetGroupRequestByGroupIDAndUserID(groupID, userID string) (*GroupRequest, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
-	var requestUserInfo GroupRequest
-	err = dbConn.Table("group_request").Where("from_user_id=? and group_id=?", uid, groupId).Find(&requestUserInfo).Error
+	var groupRequest GroupRequest
+	err = dbConn.Table("group_request").Where("user_id=? and group_id=?", userID, groupID).Find(&groupRequest).Error
 	if err != nil {
 		return nil, err
 	}
-	return &requestUserInfo, nil
+	return &groupRequest, nil
 }
 
-func DelGroupRequest(groupId, fromUserId, toUserId string) error {
+func DelGroupRequestByGroupIDAndUserID(groupID, userID string) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	err = dbConn.Exec("delete from group_request where group_id=? and from_user_id=? and to_user_id=?", groupId, fromUserId, toUserId).Error
+	err = dbConn.Table("group_request").Where("group_id=? and user_id=?", groupID, userID).Delete(&GroupRequest{}).Error
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func FindGroupBeInvitedRequestInfoByUidAndGroupID(groupId, uid string) (*GroupRequest, error) {
+func GetGroupRequestByGroupID(groupID string) ([]GroupRequest, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
-	var beInvitedRequestUserInfo GroupRequest
-	err = dbConn.Table("group_request").Where("to_user_id=? and group_id=?", uid, groupId).Find(&beInvitedRequestUserInfo).Error
+	var groupRequestList []GroupRequest
+	err = dbConn.Table("group_request").Where("group_id=?", groupID).Find(&groupRequestList).Error
 	if err != nil {
 		return nil, err
 	}
-	return &beInvitedRequestUserInfo, nil
-
+	return groupRequestList, nil
 }
 
-func InsertGroupRequest(groupId, fromUser, fromUserNickName, fromUserFaceUrl, toUser, requestMsg, handledMsg string, handleStatus int) error {
-	return nil
+//received
+func GetGroupApplicationList(userID string) ([]GroupRequest, error) {
+	var groupRequestList []GroupRequest
+	memberList, err := GetGroupMemberListByUserID(userID)
+	if err != nil {
+		return nil, err
+	}
+	for _, v := range memberList {
+		if v.RoleLevel > 0 {
+			list, err := GetGroupRequestByGroupID(v.GroupID)
+			if err != nil {
+				continue
+			}
+			groupRequestList = append(groupRequestList, list...)
+		}
+	}
+	return groupRequestList, nil
 }
+
+//
+//func GroupApplicationResponse(pb *group.GroupApplicationResponseReq) (*group.CommonResp, error) {
+//
+//	ownerUser, err := FindGroupMemberInfoByGroupIdAndUserId(pb.GroupID, pb.OwnerID)
+//	if err != nil {
+//		log.ErrorByKv("FindGroupMemberInfoByGroupIdAndUserId failed", pb.OperationID, "groupId", pb.GroupID, "ownerID", pb.OwnerID)
+//		return nil, err
+//	}
+//	if ownerUser.AdministratorLevel <= 0 {
+//		return nil, errors.New("insufficient permissions")
+//	}
+//
+//	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+//	if err != nil {
+//		return nil, err
+//	}
+//	var groupRequest GroupRequest
+//	err = dbConn.Raw("select * from `group_request` where handled_user = ? and group_id = ? and from_user_id = ? and to_user_id = ?",
+//		"", pb.GroupID, pb.FromUserID, pb.ToUserID).Scan(&groupRequest).Error
+//	if err != nil {
+//		log.ErrorByKv("find group_request info failed", pb.OperationID, "groupId", pb.GroupID, "fromUserId", pb.FromUserID, "toUserId", pb.OwnerID)
+//		return nil, err
+//	}
+//
+//	if groupRequest.Flag != 0 {
+//		return nil, errors.New("application has already handle")
+//	}
+//
+//	var saveFlag int
+//	if pb.HandleResult == 0 {
+//		saveFlag = -1
+//	} else if pb.HandleResult == 1 {
+//		saveFlag = 1
+//	} else {
+//		return nil, errors.New("parma HandleResult error")
+//	}
+//	err = dbConn.Exec("update `group_request` set flag = ?, handled_msg = ?, handled_user = ? where group_id = ? and from_user_id = ? and to_user_id = ?",
+//		saveFlag, pb.HandledMsg, pb.OwnerID, groupRequest.GroupID, groupRequest.FromUserID, groupRequest.ToUserID).Error
+//	if err != nil {
+//		log.ErrorByKv("update group request failed", pb.OperationID, "groupID", pb.GroupID, "flag", saveFlag, "ownerId", pb.OwnerID, "fromUserId", pb.FromUserID, "toUserID", pb.ToUserID)
+//		return nil, err
+//	}
+//
+//	if saveFlag == 1 {
+//		if groupRequest.ToUserID == "0" {
+//			err = InsertIntoGroupMember(pb.GroupID, pb.FromUserID, groupRequest.FromUserNickname, groupRequest.FromUserFaceUrl, 0)
+//			if err != nil {
+//				log.ErrorByKv("InsertIntoGroupMember failed", pb.OperationID, "groupID", pb.GroupID, "fromUserId", pb.FromUserID)
+//				return nil, err
+//			}
+//		} else {
+//			err = InsertIntoGroupMember(pb.GroupID, pb.ToUserID, groupRequest.ToUserNickname, groupRequest.ToUserFaceUrl, 0)
+//			if err != nil {
+//				log.ErrorByKv("InsertIntoGroupMember failed", pb.OperationID, "groupID", pb.GroupID, "fromUserId", pb.FromUserID)
+//				return nil, err
+//			}
+//		}
+//	}
+//
+//	return &group.GroupApplicationResponseResp{}, nil
+//}
+
+//func FindGroupBeInvitedRequestInfoByUidAndGroupID(groupId, uid string) (*GroupRequest, error) {
+//	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+//	if err != nil {
+//		return nil, err
+//	}
+//	var beInvitedRequestUserInfo GroupRequest
+//	err = dbConn.Table("group_request").Where("to_user_id=? and group_id=?", uid, groupId).Find(&beInvitedRequestUserInfo).Error
+//	if err != nil {
+//		return nil, err
+//	}
+//	return &beInvitedRequestUserInfo, nil
+//
+//}
+
+//func InsertGroupRequest(groupId, fromUser, fromUserNickName, fromUserFaceUrl, toUser, requestMsg, handledMsg string, handleStatus int) error {
+//	return nil
+//}

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

@@ -40,7 +40,7 @@ type Group struct {
 type GroupMember struct {
 	GroupID        string    `gorm:"column:group_id;primaryKey;"`
 	UserID         string    `gorm:"column:user_id;primaryKey;"`
-	NickName       string    `gorm:"column:nickname"`
+	Nickname       string    `gorm:"column:nickname"`
 	FaceUrl        string    `gorm:"user_group_face_url"`
 	RoleLevel      int32     `gorm:"column:role_level"`
 	JoinTime       time.Time `gorm:"column:join_time"`
@@ -52,7 +52,7 @@ type GroupMember struct {
 type GroupRequest struct {
 	UserID       string    `gorm:"column:user_id;primaryKey;"`
 	GroupID      string    `gorm:"column:group_id;primaryKey;"`
-	HandleResult string    `gorm:"column:handle_result"`
+	HandleResult int32     `gorm:"column:handle_result"`
 	ReqMsg       string    `gorm:"column:req_msg"`
 	HandledMsg   string    `gorm:"column:handled_msg"`
 	ReqTime      time.Time `gorm:"column:req_time"`
@@ -73,7 +73,7 @@ type User struct {
 	CreateTime  time.Time `gorm:"column:create_time"`
 }
 
-type BlackList struct {
+type Black struct {
 	OwnerUserID    string    `gorm:"column:owner_user_id;primaryKey;"`
 	BlockUserID    string    `gorm:"column:block_user_id;primaryKey;"`
 	CreateTime     time.Time `gorm:"column:create_time"`

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

@@ -5,42 +5,52 @@ import (
 	"time"
 )
 
-func InsertInToUserBlackList(ownerID, blockID string) error {
+func InsertInToUserBlackList(black Black) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	toInsertInfo := BlackList{OwnerUserID: ownerID, BlockUserID: blockID, CreateTime: time.Now()}
-	err = dbConn.Table("user_black_list").Create(toInsertInfo).Error
+	black.CreateTime = time.Now()
+	err = dbConn.Table("user_black_list").Create(black).Error
 	return err
 }
 
-func FindRelationshipFromBlackList(ownerID, blockID string) error {
+//type Black struct {
+//	OwnerUserID    string    `gorm:"column:owner_user_id;primaryKey;"`
+//	BlockUserID    string    `gorm:"column:block_user_id;primaryKey;"`
+//	CreateTime     time.Time `gorm:"column:create_time"`
+//	AddSource      int32     `gorm:"column:add_source"`
+//	OperatorUserID int32     `gorm:"column:operator_user_id"`
+//	Ex             string    `gorm:"column:ex"`
+//}
+
+func CheckBlack(ownerUserID, blockUserID string) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	var blackList BlackList
-	err = dbConn.Table("user_black_list").Where("owner_id=? and block_id=?", ownerID, blockID).Find(&blackList).Error
+	var black Black
+	err = dbConn.Table("user_black_list").Where("owner_user_id=? and block_user_id=?", ownerUserID, blockUserID).Find(&black).Error
 	return err
 }
 
-func RemoveBlackList(ownerID, blockID string) error {
+func RemoveBlackList(ownerUserID, blockUserID string) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	err = dbConn.Exec("delete from user_black_list where owner_id=? and block_id=?", ownerID, blockID).Error
+
+	err = dbConn.Table("user_black_list").Where("owner_user_id=? and block_user_id=?", ownerUserID, blockUserID).Delete(&Black{}).Error
 	return err
 }
 
-func GetBlackListByUID(ownerID string) ([]BlackList, error) {
+func GetBlackListByUserID(ownerUserID string) ([]Black, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
-	var blackListUsersInfo []BlackList
-	err = dbConn.Table("user_black_list").Where("owner_id=?", ownerID).Find(&blackListUsersInfo).Error
+	var blackListUsersInfo []Black
+	err = dbConn.Table("user_black_list").Where("owner_user_id=?", ownerUserID).Find(&blackListUsersInfo).Error
 	if err != nil {
 		return nil, err
 	}

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

@@ -3,7 +3,6 @@ package im_mysql_model
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/db"
-	pbAuth "Open_IM/pkg/proto/auth"
 	"Open_IM/pkg/utils"
 	"fmt"
 	_ "github.com/jinzhu/gorm/dialects/mysql"
@@ -12,168 +11,101 @@ import (
 
 func init() {
 	//init managers
-	var pb pbAuth.UserRegisterReq
 	for k, v := range config.Config.Manager.AppManagerUid {
-		if !IsExistUser(v) {
-			pb.UID = v
-			pb.Name = "AppManager" + utils.IntToString(k+1)
-			err := UserRegister(&pb)
-			if err != nil {
-				fmt.Println("AppManager insert error", err.Error())
-			}
+		user, err := GetUserByUserID(v)
+		if err != nil {
+			fmt.Println("GetUserByUserID failed ", err.Error(), v, user)
+			continue
 		}
+		var appMgr User
+		appMgr.Nickname = "AppManager" + utils.IntToString(k+1)
+		err = UserRegister(appMgr)
+		if err != nil {
+			fmt.Println("AppManager insert error", err.Error())
+		}
+
 	}
 }
-func UserRegister(pb *pbAuth.UserRegisterReq) error {
+
+func UserRegister(user User) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	addUser := User{
-		UserID:     pb.UID,
-		Nickname:   pb.Name,
-		FaceUrl:    pb.Icon,
-		Gender:     pb.Gender,
-		Mobile:     pb.Mobile,
-		Birth:      pb.Birth,
-		Email:      pb.Email,
-		Ex:         pb.Ex,
-		CreateTime: time.Now(),
-	}
-	err = dbConn.Table("user").Create(&addUser).Error
+	user.CreateTime = time.Now()
+
+	err = dbConn.Table("user").Create(&user).Error
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func UserDelete(uid string) error {
+//type User struct {
+//	UserID      string    `gorm:"column:user_id;primaryKey;"`
+//	Nickname    string    `gorm:"column:name"`
+//	FaceUrl     string    `gorm:"column:icon"`
+//	Gender      int32     `gorm:"column:gender"`
+//	PhoneNumber string    `gorm:"column:phone_number"`
+//	Birth       string    `gorm:"column:birth"`
+//	Email       string    `gorm:"column:email"`
+//	Ex          string    `gorm:"column:ex"`
+//	CreateTime  time.Time `gorm:"column:create_time"`
+//}
+
+func DeleteUser(userID string) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	err = dbConn.Table("user").Where("uid=?", uid).Delete(User{}).Error
-	if err != nil {
-		return err
-	}
-	return nil
+	err = dbConn.Table("user").Where("user_id=?", userID).Delete(User{}).Error
+	return err
 }
-func FindUserByUID(uid string) (*User, error) {
+
+func GetUserByUserID(userID string) (*User, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var user User
-	err = dbConn.Table("user").Where("uid=?", uid).First(&user).Error
+	err = dbConn.Table("user").Where("user_id=?", userID).First(&user).Error
 	if err != nil {
 		return nil, err
 	}
 	return &user, nil
 }
 
-func UpDateUserInfo(uid, name, headUrl, mobilePhoneNum, birth, email, extendInfo string, gender int32) error {
+func UpdateUserInfo(user User) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	if name != "" {
-		if err = dbConn.Exec("update user set name=? where uid=?", name, uid).Error; err != nil {
-			return err
-		}
-	}
-	if headUrl != "" {
-		if err = dbConn.Exec("update user set icon=? where uid=?", headUrl, uid).Error; err != nil {
-			return err
-		}
-	}
-	if mobilePhoneNum != "" {
-		if err = dbConn.Exec("update user set mobile=? where uid=?", mobilePhoneNum, uid).Error; err != nil {
-			return err
-		}
-	}
-	if birth != "" {
-		if err = dbConn.Exec("update user set birth=? where uid=?", birth, uid).Error; err != nil {
-			return err
-		}
-	}
-	if email != "" {
-		if err = dbConn.Exec("update user set email=? where uid=?", email, uid).Error; err != nil {
-			return err
-		}
-	}
-	if extendInfo != "" {
-		if err = dbConn.Exec("update user set ex=? where uid=?", extendInfo, uid).Error; err != nil {
-			return err
-		}
-	}
-	if gender != 0 {
-		if err = dbConn.Exec("update user set gender=? where uid=?", gender, uid).Error; err != nil {
-			return err
-		}
-	}
-	return nil
+	err = dbConn.Table("user").Where("user_id=?", user.UserID).Update(&user).Error
+	return err
 }
 
-func SelectAllUID() ([]string, error) {
-	var uid []string
-
+func SelectAllUserID() ([]string, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
-		return uid, err
+		return nil, err
 	}
-	rows, err := dbConn.Raw("select uid from user").Rows()
+	var resultArr []string
+	err = dbConn.Table("user").Select([]string{"user_id"}).Scan(&resultArr).Error
 	if err != nil {
-		return uid, err
+		return nil, err
 	}
-	defer rows.Close()
-	var strUID string
-	for rows.Next() {
-		rows.Scan(&strUID)
-		uid = append(uid, strUID)
-	}
-	return uid, nil
-}
-func SelectSomeUID(uids []string) ([]string, error) {
-	var uid []string
-
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return uid, err
-	}
-	rows, err := dbConn.Raw("select uid from user where uid in (" + sqlStringHandle(uids) + ")").Rows()
-	if err != nil {
-		return uid, err
-	}
-	defer rows.Close()
-	var strUID string
-	for rows.Next() {
-		rows.Scan(&strUID)
-		uid = append(uid, strUID)
-	}
-	return uid, nil
+	return resultArr, nil
 }
 
-func IsExistUser(uid string) bool {
+func SelectSomeUserID(userIDList []string) ([]string, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
-		return false
+		return nil, err
 	}
-	var number int32
-	err = dbConn.Raw("select count(*) from `user` where  uid = ?", uid).Count(&number).Error
+	var userList []User
+	err = dbConn.Table("user").Where("(user_id) IN ? ", userIDList).Find(&userList).Error
 	if err != nil {
-		return false
+		return nil, err
 	}
-	if number != 1 {
-		return false
-	}
-	return true
-}
-func sqlStringHandle(ss []string) (s string) {
-	for i := 0; i < len(ss); i++ {
-		s += "'" + ss[i] + "'"
-		if i < len(ss)-1 {
-			s += ","
-		}
-	}
-	return s
+	return userIDList, nil
 }