blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-26 11:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/errcode' into errcode

Browse Source
This commit is contained in:
Gordon 2023-03-15 16:52:58 +08:00
commit 7b17ed6303
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/common/db/controller/user.go
View File

@ -48,7 +48,6 @@ func (u *userDatabase) InitOnce(ctx context.Context, users []*relation.UserModel
if len(miss) > 0 { if len(miss) > 0 {
_ = u.userDB.Create(ctx, miss) _ = u.userDB.Create(ctx, miss)
} }
return nil return nil
} }

7
pkg/common/db/relation/user_model.go
View File

@ -13,12 +13,11 @@ type UserGorm struct {
} }
func NewUserGorm(db *gorm.DB) relation.UserModelInterface { func NewUserGorm(db *gorm.DB) relation.UserModelInterface {
return &UserGorm{DB: db.Model(&relation.UserModel{})} return &UserGorm{DB: db}
} }
func (u *UserGorm) db() *gorm.DB { func (u *UserGorm) db() *gorm.DB {
newDB := *u.DB return u.DB.Model(&relation.UserModel{})
return &newDB
} }
// 插入多条 // 插入多条
@ -38,7 +37,7 @@ func (u *UserGorm) Update(ctx context.Context, users []*relation.UserModel) (err
// 获取指定用户信息 不存在，也不返回错误 // 获取指定用户信息 不存在，也不返回错误
func (u *UserGorm) Find(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error) { func (u *UserGorm) Find(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error) {
log.ZDebug(ctx, "Find args", "userIDs", userIDs) log.ZDebug(ctx, "Find args", "userIDs", userIDs, "db", u.db())
err = utils.Wrap(u.db().Where("user_id in (?)", userIDs).Find(&users).Error, "") err = utils.Wrap(u.db().Where("user_id in (?)", userIDs).Find(&users).Error, "")
return users, err return users, err
} }