mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-13 07:40:56 +00:00
fix: omit access_token from user queries
This commit is contained in:
+3
-3
@@ -212,7 +212,7 @@ func GetAllUsers(pageInfo *common.PageInfo) (users []*User, total int64, err err
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get paginated users within same transaction
|
// Get paginated users within same transaction
|
||||||
err = tx.Unscoped().Order("id desc").Limit(pageInfo.GetPageSize()).Offset(pageInfo.GetStartIdx()).Omit("password").Find(&users).Error
|
err = tx.Unscoped().Order("id desc").Limit(pageInfo.GetPageSize()).Offset(pageInfo.GetStartIdx()).Omit("password", "access_token").Find(&users).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
@@ -280,7 +280,7 @@ func SearchUsers(keyword string, group string, role *int, status *int, startIdx
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 获取分页数据
|
// 获取分页数据
|
||||||
err = query.Omit("password").Order("id desc").Limit(num).Offset(startIdx).Find(&users).Error
|
err = query.Omit("password", "access_token").Order("id desc").Limit(num).Offset(startIdx).Find(&users).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
@@ -303,7 +303,7 @@ func GetUserById(id int, selectAll bool) (*User, error) {
|
|||||||
if selectAll {
|
if selectAll {
|
||||||
err = DB.First(&user, "id = ?", id).Error
|
err = DB.First(&user, "id = ?", id).Error
|
||||||
} else {
|
} else {
|
||||||
err = DB.Omit("password").First(&user, "id = ?", id).Error
|
err = DB.Omit("password", "access_token").First(&user, "id = ?", id).Error
|
||||||
}
|
}
|
||||||
return &user, err
|
return &user, err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user