fix: admin 初始化在数据库未就绪时静默失败
initAdmin 改为后台 goroutine 并重试最多 30 秒,避免 users-rpc 启动时 PostgreSQL 尚未接受连接导致管理员账户创建失败。
This commit is contained in:
+46
-32
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"juwan-backend/app/snowflake/rpc/snowflake"
|
||||
"juwan-backend/app/users/rpc/internal/models/users"
|
||||
@@ -21,40 +22,53 @@ func initAdmin(svcCtx *svc.ServiceContext) {
|
||||
return
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
exists, _ := svcCtx.UsersModelRW.Users.Query().Where(users.UsernameEQ(username)).Exist(ctx)
|
||||
if exists {
|
||||
return
|
||||
}
|
||||
go func() {
|
||||
ctx := context.Background()
|
||||
for i := range 30 {
|
||||
exists, err := svcCtx.UsersModelRW.Users.Query().Where(users.UsernameEQ(username)).Exist(ctx)
|
||||
if err != nil {
|
||||
if i < 29 {
|
||||
time.Sleep(time.Second)
|
||||
continue
|
||||
}
|
||||
logx.Errorf("check admin user: %v", err)
|
||||
return
|
||||
}
|
||||
if exists {
|
||||
return
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
hashedPassword, err := pwdUtils.HashPassword(password)
|
||||
if err != nil {
|
||||
logx.Errorf("hash admin password: %v", err)
|
||||
return
|
||||
}
|
||||
hashedPassword, err := pwdUtils.HashPassword(password)
|
||||
if err != nil {
|
||||
logx.Errorf("hash admin password: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
resp, err := svcCtx.Snowflake.NextId(ctx, &snowflake.NextIdReq{})
|
||||
if err != nil {
|
||||
logx.Errorf("generate admin user ID: %v", err)
|
||||
return
|
||||
}
|
||||
resp, err := svcCtx.Snowflake.NextId(ctx, &snowflake.NextIdReq{})
|
||||
if err != nil {
|
||||
logx.Errorf("generate admin user ID: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
_, err = svcCtx.UsersModelRW.Users.Create().
|
||||
SetID(resp.Id).
|
||||
SetUsername(username).
|
||||
SetPasswordHash(hashedPassword).
|
||||
SetEmail(email).
|
||||
SetPhone("").
|
||||
SetBio("").
|
||||
SetAvatar("").
|
||||
SetCurrentRole("consumer").
|
||||
SetNickname(username).
|
||||
SetIsAdmin(true).
|
||||
Save(ctx)
|
||||
if err != nil {
|
||||
logx.Errorf("create admin user: %v", err)
|
||||
return
|
||||
}
|
||||
_, err = svcCtx.UsersModelRW.Users.Create().
|
||||
SetID(resp.Id).
|
||||
SetUsername(username).
|
||||
SetPasswordHash(hashedPassword).
|
||||
SetEmail(email).
|
||||
SetPhone("").
|
||||
SetBio("").
|
||||
SetAvatar("").
|
||||
SetCurrentRole("consumer").
|
||||
SetNickname(username).
|
||||
SetIsAdmin(true).
|
||||
Save(ctx)
|
||||
if err != nil {
|
||||
logx.Errorf("create admin user: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
logx.Infof("initialized admin user: %s", username)
|
||||
logx.Infof("initialized admin user: %s", username)
|
||||
}()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user