diff --git a/cmd/server/migrate.go b/cmd/server/migrate.go index 378d568..167dccb 100644 --- a/cmd/server/migrate.go +++ b/cmd/server/migrate.go @@ -13,7 +13,7 @@ var migrateCmd = &cobra.Command{ Use: "migrate", Short: "执行数据库 Schema 自动迁移", Run: func(cmd *cobra.Command, args []string) { - err := db.Init(global.Config.Database.Driver, global.Config.Database.Dsn()) + err := db.InitDB(global.Config.Database.Driver, global.Config.Database.Dsn()) if err != nil { global.Log.Fatal("连接数据库失败", zap.Error(err)) } diff --git a/cmd/server/server.go b/cmd/server/server.go index 5270139..dfc2801 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -14,7 +14,7 @@ var serverCmd = &cobra.Command{ Short: "启动 Web API 接口服务", Run: func(cmd *cobra.Command, args []string) { // 初始化 db 包 - err := db.Init(global.Config.Database.Driver, global.Config.Database.Dsn()) + err := db.InitDB(global.Config.Database.Driver, global.Config.Database.Dsn()) if err != nil { global.Log.Fatal("数据库连接失败", zap.Error(err)) } @@ -33,7 +33,6 @@ var serverCmd = &cobra.Command{ global.Log.Fatal("初始化 Casbin 失败", zap.Error(err)) } - global.Log.Info("数据库初始化成功,正在启动 Web 服务...") // 启动 Gin 服务 server.Run() }, diff --git a/cmd/server/user.go b/cmd/server/user.go index eb08d13..ba82222 100644 --- a/cmd/server/user.go +++ b/cmd/server/user.go @@ -25,7 +25,7 @@ var userCreateCmd = &cobra.Command{ Use: "create", Short: "交互式创建一个管理员用户", Run: func(cmd *cobra.Command, args []string) { - err := db.Init(global.Config.Database.Driver, global.Config.Database.Dsn()) + err := db.InitDB(global.Config.Database.Driver, global.Config.Database.Dsn()) if err != nil { global.Log.Fatal("连接数据库失败", zap.Error(err)) } diff --git a/internal/db/db.go b/internal/db/db.go index d319f33..84d7909 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -1,6 +1,7 @@ package db import ( + "EnGin/internal/global" "database/sql" "fmt" "time" @@ -16,8 +17,8 @@ import ( // Client 跨包调用的统一数据库客户端实例 var Client *ent.Client -// Init 根据配置初始化数据库连接 -func Init(driver string, dsn string) error { +// InitDB 根据配置初始化数据库连接 +func InitDB(driver string, dsn string) error { // 先创建标准 sql.DB 以配置连接池 db, err := sql.Open(driver, dsn) if err != nil { @@ -37,6 +38,8 @@ func Init(driver string, dsn string) error { // 将 sql.DB 包装为 ent 客户端 drv := entsql.OpenDB(driver, db) Client = ent.NewClient(ent.Driver(drv)) + global.Log.Info("数据库初始化成功") + return nil } diff --git a/internal/server/server.go b/internal/server/server.go index 717a099..93cd11e 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -21,7 +21,7 @@ func Run() { // 注册路由 router.RegisterRoutes(r) port := global.Config.Server.Port - global.Log.Info(fmt.Sprintf("Server is running on port %d", port)) + global.Log.Info(fmt.Sprintf("服务运行在端口 %d", port)) if err := r.Run(fmt.Sprintf(":%d", port)); err != nil { global.Log.Fatal("Web 服务启动失败", zap.Error(err)) }