1

cmd/erp.go

@@ -9,8 +9,10 @@ import (
 	"management/internal/erpserver"
 	"management/internal/erpserver/biz"
 	"management/internal/erpserver/handler"
+	"management/internal/erpserver/store"
 	"management/internal/pkg/binding"
 	"management/internal/pkg/config"
+	"management/internal/pkg/database"
 	"management/internal/pkg/logger"
 	"management/internal/pkg/middleware"
 	"management/internal/pkg/redis"
@@ -44,9 +46,22 @@ func runErp(ctx context.Context) error {
 
 	logger.New(conf.App.Prod)
 
-	store, err := db.NewIStore(ctx, conf.DB)
+	sdb, err := db.NewIStore(ctx, conf.DB)
 	checkError(err)
 
+	dbOptions := &database.PostgreSQLOptions{
+		Addr:     conf.DB.Host,
+		Username: conf.DB.Username,
+		Password: conf.DB.Password,
+		Database: conf.DB.DBName,
+	}
+
+	// 创建并返回数据库连接
+	gdb, err := database.NewPostgreSQL(dbOptions)
+	checkError(err)
+
+	store := store.NewStore(gdb)
+
 	// 初始化数据
 	// dbinit.InitSeed()
 
@@ -55,11 +70,11 @@ func runErp(ctx context.Context) error {
 	redis, err := redis.New(conf.Redis)
 	checkError(err)
 
-	session := session.New(store.Pool(), conf.App.Prod)
+	session := session.New(sdb.Pool(), conf.App.Prod)
 
 	mustInit(snowflake.Init)
 
-	biz := biz.NewBiz(store, redis, session)
+	biz := biz.NewBiz(store, sdb, redis, session)
 
 	middleware := middleware.New(biz.SystemV1(), session)