From bb1186a8d84df37cfca4ec93b90f1d3ca8ef38ba Mon Sep 17 00:00:00 2001 From: yml Date: Sun, 15 Nov 2026 17:59:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(seed):=20=E5=88=9B=E5=BB=BA=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E5=B9=B3=E5=8F=B0=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/cmd/tenant-demo-seed/main.go | 53 ++++++++++++++++++++++++++-- scripts/seed-tenant-demo.sh | 10 +++++- 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/backend/cmd/tenant-demo-seed/main.go b/backend/cmd/tenant-demo-seed/main.go index 660f9ba1..7b8b1c84 100644 --- a/backend/cmd/tenant-demo-seed/main.go +++ b/backend/cmd/tenant-demo-seed/main.go @@ -7,6 +7,7 @@ import ( "encoding/json" "fmt" "os" + "strings" "time" "hfb_sys/backend/internal/config" @@ -35,6 +36,8 @@ const ( type demoEnv struct { db *gorm.DB + adminUser string + adminPass string dachui model.Tenant jieyou model.Tenant ownerD model.User @@ -61,16 +64,20 @@ func main() { if err != nil { fail("连接 MySQL 失败", err) } - if err := seed(context.Background(), db); err != nil { + if err := seed(context.Background(), db, cfg); err != nil { fail("写入双站演示数据失败", err) } } -func seed(ctx context.Context, db *gorm.DB) error { +func seed(ctx context.Context, db *gorm.DB, cfg config.Config) error { if db == nil { return fmt.Errorf("数据库未连接") } - env := &demoEnv{db: db} + env := &demoEnv{ + db: db, + adminUser: cfg.BootstrapAdminUsername, + adminPass: cfg.BootstrapAdminPassword, + } if err := env.ensureTenants(ctx); err != nil { return err } @@ -157,6 +164,9 @@ func (e *demoEnv) ensureDomains(ctx context.Context) error { } func (e *demoEnv) ensureAdmins(ctx context.Context) error { + if err := e.ensureSuperAdmin(ctx); err != nil { + return err + } var role model.Role if err := e.db.WithContext(ctx).Where("code = ?", "cs").First(&role).Error; err != nil { if err != gorm.ErrRecordNotFound { @@ -209,6 +219,40 @@ func (e *demoEnv) ensureAdmins(ctx context.Context) error { return nil } +func (e *demoEnv) ensureSuperAdmin(ctx context.Context) error { + username := strings.TrimSpace(e.adminUser) + password := e.adminPass + if username == "" || password == "" { + return nil + } + var role model.Role + if err := e.db.WithContext(ctx).Where("code = ?", "super_admin").First(&role).Error; err != nil { + return err + } + var admin model.AdminUser + err := e.db.WithContext(ctx).Where("username = ?", username).First(&admin).Error + if err == gorm.ErrRecordNotFound { + hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) + if err != nil { + return err + } + admin = model.AdminUser{ + Username: username, + PasswordHash: string(hash), + Nickname: "超级管理员", + Status: "active", + TokenVersion: 1, + } + if err := e.db.WithContext(ctx).Create(&admin).Error; err != nil { + return err + } + } else if err != nil { + return err + } + binding := model.AdminUserRole{AdminID: admin.ID, RoleID: role.ID, TenantID: 0} + return e.db.WithContext(ctx).Clauses(clause.OnConflict{DoNothing: true}).Create(&binding).Error +} + func (e *demoEnv) ensureUsers(ctx context.Context) error { hash, err := bcrypt.GenerateFromPassword([]byte(demoPassword), bcrypt.DefaultCost) if err != nil { @@ -479,6 +523,9 @@ func (e *demoEnv) printSummary() { fmt.Printf("解忧前台: http://jieyou.localhost:5189 (账号 %s / %s,密码 %s)\n", ownerJPhone, renterJPhone, demoPassword) fmt.Printf("大锤后台: http://dachui.localhost:5189/admin/login (demo_dachui_cs / %s)\n", demoPassword) fmt.Printf("解忧后台: http://jieyou.localhost:5189/admin/login (demo_jieyou_cs / %s)\n", demoPassword) + if e.adminUser != "" { + fmt.Printf("平台超管: %s / %s\n", e.adminUser, e.adminPass) + } for _, row := range e.orders { fmt.Printf("演示订单: %s buyer=%d source=%d status=%s\n", row.OrderNo, row.BuyerTenantID, row.SourceTenantID, row.Status) } diff --git a/scripts/seed-tenant-demo.sh b/scripts/seed-tenant-demo.sh index dde2d8c7..a4d6d8e2 100755 --- a/scripts/seed-tenant-demo.sh +++ b/scripts/seed-tenant-demo.sh @@ -3,7 +3,15 @@ set -euo pipefail ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" BACKEND_DIR="${ROOT_DIR}/backend" -MYSQL_DSN="${MYSQL_DSN:-hfb:secret@tcp(127.0.0.1:13306)/hfb_sys?charset=utf8mb4&parseTime=True&loc=Local}" +REQUESTED_MYSQL_DSN="${MYSQL_DSN:-}" +if [[ -f "${BACKEND_DIR}/.env" ]]; then + while IFS= read -r line || [[ -n "${line}" ]]; do + [[ -z "${line}" || "${line}" =~ ^[[:space:]]*# ]] && continue + line="${line#export }" + export "${line}" + done < "${BACKEND_DIR}/.env" +fi +MYSQL_DSN="${REQUESTED_MYSQL_DSN:-hfb:secret@tcp(127.0.0.1:13306)/hfb_sys?charset=utf8mb4&parseTime=True&loc=Local}" GOOSE_VERSION="${GOOSE_VERSION:-v3.27.1}" GOPROXY="${GOPROXY:-https://goproxy.cn,direct}"