chore: speedup bootstrap and migrate
This commit is contained in:
@@ -74,7 +74,6 @@ log " - python: $(python --version 2>&1 | head -n 1 || echo "not found")"
|
|||||||
log "Checking node..."
|
log "Checking node..."
|
||||||
log " - node: $(node --version 2>&1 | head -n 1 || echo "not found")"
|
log " - node: $(node --version 2>&1 | head -n 1 || echo "not found")"
|
||||||
|
|
||||||
# 延迟获取 NODE_PATH,避免同步阻塞启动
|
|
||||||
log "Checking npm..."
|
log "Checking npm..."
|
||||||
log " - npm: $(npm --version 2>&1 | head -n 1 || echo "not found")"
|
log " - npm: $(npm --version 2>&1 | head -n 1 || echo "not found")"
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/engigu/baihu-panel/internal/constant"
|
"github.com/engigu/baihu-panel/internal/constant"
|
||||||
"github.com/engigu/baihu-panel/internal/database"
|
"github.com/engigu/baihu-panel/internal/database"
|
||||||
@@ -94,14 +95,24 @@ func (a *App) initDatabase() {
|
|||||||
logger.Fatalf("Failed to init database: %v", err)
|
logger.Fatalf("Failed to init database: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 记录各个初始化阶段的时间
|
||||||
|
startTime := time.Now()
|
||||||
|
|
||||||
// 执行 V3 迁移(ID 变更迁移)
|
// 执行 V3 迁移(ID 变更迁移)
|
||||||
if err := services.RunMigrationV3(); err != nil {
|
if err := services.RunMigrationV3(); err != nil {
|
||||||
logger.Fatalf("Failed to run V3 migration: %v", err)
|
logger.Fatalf("Failed to run V3 migration: %v", err)
|
||||||
}
|
}
|
||||||
|
v3Duration := time.Since(startTime)
|
||||||
|
logger.Infof("[Database] V3 迁移检查完成, 耗时: %v", v3Duration)
|
||||||
|
|
||||||
|
// 执行表结构同步
|
||||||
|
migrateStart := time.Now()
|
||||||
if err := database.Migrate(); err != nil {
|
if err := database.Migrate(); err != nil {
|
||||||
logger.Fatalf("Failed to migrate database: %v", err)
|
logger.Fatalf("Failed to migrate database: %v", err)
|
||||||
}
|
}
|
||||||
|
migrateDuration := time.Since(migrateStart)
|
||||||
|
logger.Infof("[Database] 表结构同步完成, 耗时: %v", migrateDuration)
|
||||||
|
logger.Infof("[Database] 数据库总初始化耗时: %v", time.Since(startTime))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) initRouter() {
|
func (a *App) initRouter() {
|
||||||
|
|||||||
@@ -1,19 +1,17 @@
|
|||||||
package database
|
package database
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"crypto/md5"
|
||||||
|
"encoding/hex"
|
||||||
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/engigu/baihu-panel/internal/constant"
|
||||||
"github.com/engigu/baihu-panel/internal/logger"
|
"github.com/engigu/baihu-panel/internal/logger"
|
||||||
"github.com/engigu/baihu-panel/internal/models"
|
"github.com/engigu/baihu-panel/internal/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Migrate() error {
|
var allModels = []interface{}{
|
||||||
// 执行自定义迁移
|
|
||||||
if err := customMigrations(); err != nil {
|
|
||||||
logger.Warnf("[Database] 自定义迁移警告: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
allModels := []interface{}{
|
|
||||||
&models.AppLog{},
|
&models.AppLog{},
|
||||||
&models.User{},
|
&models.User{},
|
||||||
&models.Task{},
|
&models.Task{},
|
||||||
@@ -28,9 +26,73 @@ func Migrate() error {
|
|||||||
&models.Language{},
|
&models.Language{},
|
||||||
&models.NotifyWay{},
|
&models.NotifyWay{},
|
||||||
&models.NotifyBinding{},
|
&models.NotifyBinding{},
|
||||||
|
}
|
||||||
|
|
||||||
|
func Migrate() error {
|
||||||
|
// 1. 自动指纹识别,大幅提升远程数据库启动进度
|
||||||
|
sig := getModelSignature(allModels)
|
||||||
|
if DB.Migrator().HasTable(&models.Setting{}) {
|
||||||
|
var sigSetting models.Setting
|
||||||
|
res := DB.Where("section = ? AND `key` = ?", "system", "schema_signature").Limit(1).Find(&sigSetting)
|
||||||
|
if res.RowsAffected > 0 && string(sigSetting.Value) == sig {
|
||||||
|
logger.Info("[Database] 模型指纹一致,跳过自动表结构同步")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return AutoMigrate(allModels...)
|
// 执行自定义迁移
|
||||||
|
logger.Info("[Database] 正在执行自定义迁移与表结构同步...")
|
||||||
|
if err := customMigrations(); err != nil {
|
||||||
|
logger.Warnf("[Database] 自定义迁移警告: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Infof("[Database] 正在同步 %d 个数据模型的表结构...", len(allModels))
|
||||||
|
if err := AutoMigrate(allModels...); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. 更新指纹记录
|
||||||
|
if DB.Migrator().HasTable(&models.Setting{}) {
|
||||||
|
var sigSetting models.Setting
|
||||||
|
res := DB.Where("section = ? AND `key` = ?", "system", "schema_signature").Limit(1).Find(&sigSetting)
|
||||||
|
if res.RowsAffected > 0 {
|
||||||
|
DB.Model(&sigSetting).Update("value", models.BigText(sig))
|
||||||
|
} else {
|
||||||
|
DB.Create(&models.Setting{
|
||||||
|
ID: "sys_schema_sig",
|
||||||
|
Section: "system",
|
||||||
|
Key: "schema_signature",
|
||||||
|
Value: models.BigText(sig),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// getModelSignature 生成数据模型的结构指纹
|
||||||
|
func getModelSignature(models []interface{}) string {
|
||||||
|
var sb strings.Builder
|
||||||
|
// 包含表前缀,确保前缀变更时也能触发迁移
|
||||||
|
sb.WriteString(constant.TablePrefix)
|
||||||
|
for _, m := range models {
|
||||||
|
t := reflect.TypeOf(m)
|
||||||
|
if t.Kind() == reflect.Ptr {
|
||||||
|
t = t.Elem()
|
||||||
|
}
|
||||||
|
sb.WriteString(t.Name())
|
||||||
|
for i := 0; i < t.NumField(); i++ {
|
||||||
|
f := t.Field(i)
|
||||||
|
if f.Anonymous {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
sb.WriteString(f.Name)
|
||||||
|
sb.WriteString(f.Type.String())
|
||||||
|
sb.WriteString(f.Tag.Get("gorm"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
hash := md5.Sum([]byte(sb.String()))
|
||||||
|
return hex.EncodeToString(hash[:])
|
||||||
}
|
}
|
||||||
|
|
||||||
// hasGormTypeText 检查 gorm tag 中是否包含 type:text
|
// hasGormTypeText 检查 gorm tag 中是否包含 type:text
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ func RunMigrationV3() error {
|
|||||||
res := db.Where("section = ? AND `key` = ?", "system", "migration_v3_success").Limit(1).Find(&migrationFlag)
|
res := db.Where("section = ? AND `key` = ?", "system", "migration_v3_success").Limit(1).Find(&migrationFlag)
|
||||||
if res.Error == nil && res.RowsAffected > 0 && migrationFlag.Value == "true" {
|
if res.Error == nil && res.RowsAffected > 0 && migrationFlag.Value == "true" {
|
||||||
// 如果已经是字符串 ID 模式,双重确认
|
// 如果已经是字符串 ID 模式,双重确认
|
||||||
|
logger.Info("[MigrationV3] 系统已处于 V3 模式,跳过检查")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user