fix(model): users 唯一索引改为 (shop_id, username) 复合索引
Deploy / deploy (push) Successful in 1m13s

原来 uniqueIndex:uk_shop_username 只在 Username 字段上,导致用户名全局唯一。
S002/S003 的 admin 用户与 S001 冲突,INSERT 被静默跳过,无法登录。

将 User 的 TenantBase 改为直接定义 ShopID,使其参与复合唯一索引。
需要 Reset DB 使新索引生效。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-05-24 14:50:34 +08:00
parent fcf92675b1
commit 86baaf3a1c
4 changed files with 7 additions and 9 deletions
+3 -3
View File
@@ -132,21 +132,21 @@ func main() {
hash := mustHash("password123")
admin := upsert(db, &model.User{}, "shop_id = ? AND username = ?", shop.ID, "admin", func() any {
return &model.User{
TenantBase: model.TenantBase{ShopID: shop.ID},
ShopID: shop.ID,
Username: "admin", PasswordHash: hash, RealName: "张三(管理员)",
Phone: "13800000001", Role: "admin", IsActive: true,
}
}).(model.User)
operator := upsert(db, &model.User{}, "shop_id = ? AND username = ?", shop.ID, "operator", func() any {
return &model.User{
TenantBase: model.TenantBase{ShopID: shop.ID},
ShopID: shop.ID,
Username: "operator", PasswordHash: hash, RealName: "李四(操作员)",
Phone: "13800000002", Role: "operator", IsActive: true,
}
}).(model.User)
upsert(db, &model.User{}, "shop_id = ? AND username = ?", shop.ID, "test", func() any {
return &model.User{
TenantBase: model.TenantBase{ShopID: shop.ID},
ShopID: shop.ID,
Username: "test", PasswordHash: hash, RealName: "王五(只读)",
Phone: "13800000003", Role: "readonly", IsActive: true,
}
+1 -1
View File
@@ -52,7 +52,7 @@ func (h *UserHandler) Create(c *gin.Context) {
role = "operator"
}
u := model.User{
TenantBase: model.TenantBase{ShopID: shopID},
ShopID: shopID,
Username: req.Username,
PasswordHash: string(hash),
RealName: req.RealName,
+2 -1
View File
@@ -1,7 +1,8 @@
package model
type User struct {
TenantBase
Base
ShopID uint64 `gorm:"not null;index;uniqueIndex:uk_shop_username" json:"shop_id"`
Username string `gorm:"size:50;uniqueIndex:uk_shop_username" json:"username"`
PasswordHash string `gorm:"size:255" json:"-"`
RealName string `gorm:"size:50" json:"real_name"`
+1 -4
View File
@@ -349,10 +349,7 @@ func hashPassword(plain string) string {
func CreateTestUser(db *gorm.DB, shopID uint64, username, password, role string) *model.User {
hash := hashPassword(password)
user := &model.User{
TenantBase: model.TenantBase{
Base: model.Base{},
ShopID: shopID,
},
ShopID: shopID,
Username: username,
PasswordHash: hash,
RealName: "Test User " + username,