重构项目结构，将 orm 和 rds 包迁移到 web/globals

cmd/fill/main.go

@@ -1,11 +1,14 @@
 package main
 
 import (
+	"fmt"
 	"golang.org/x/crypto/bcrypt"
+	"gorm.io/driver/postgres"
+	"gorm.io/gorm"
+	"gorm.io/gorm/schema"
 	"log/slog"
 	"platform/pkg/env"
 	"platform/pkg/logs"
-	"platform/pkg/orm"
 	client2 "platform/web/domains/client"
 	proxy2 "platform/web/domains/proxy"
 	m "platform/web/models"
@@ -13,11 +16,29 @@ import (
 )
 
 func main() {
+
 	env.Init()
 	logs.Init()
-	orm.Init()
 
-	err := q.Q.Transaction(func(tx *q.Query) (err error) {
+	// 初始化数据库连接
+	dsn := fmt.Sprintf(
+		"host=%s user=%s password=%s dbname=%s port=%s sslmode=disable TimeZone=Asia/Shanghai",
+		env.DbHost, env.DbUserName, env.DbPassword, env.DbName, env.DbPort,
+	)
+	db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
+		NamingStrategy: schema.NamingStrategy{
+			SingularTable: true,
+		},
+	})
+	if err != nil {
+		slog.Error("gorm 初始化数据库失败：", slog.Any("err", err))
+		panic(err)
+	}
+
+	q.SetDefault(db)
+
+	// 填充数据
+	err = q.Q.Transaction(func(tx *q.Query) (err error) {
 
 		// 代理
 		err = q.Proxy.

cmd/main/main.go

@@ -6,8 +6,6 @@ import (
 	"os/signal"
 	"platform/pkg/env"
 	"platform/pkg/logs"
-	"platform/pkg/orm"
-	"platform/pkg/rds"
 	"platform/web"
 	"syscall"
 )
@@ -18,13 +16,11 @@ func main() {
 	shutdown := make(chan os.Signal, 1)
 	signal.Notify(shutdown, syscall.SIGINT, syscall.SIGTERM)
 
-	// init 先后顺序有依赖
+	// 初始化应用
 	env.Init()
 	logs.Init()
-	orm.Init()
-	rds.Init()
 
-	// web 服务
+	// 创建服务
 	app, err := web.New(&web.Config{
 		Listen: ":8080",
 	})
@@ -33,10 +29,11 @@ func main() {
 		return
 	}
 
+	// 异步运行服务
 	errCh := make(chan error)
 	defer close(errCh)
 	go func() {
-		err = app.Run()
+		err := app.Run()
 		if err != nil {
 			slog.Error("Failed to run server", slog.Any("err", err))
 			errCh <- err
@@ -45,32 +42,14 @@ func main() {
 	}()
 
 	// 关闭服务
-	exit := false
 	select {
+	case err = <-errCh:
 	case <-shutdown:
 		slog.Info("Received shutdown signal")
 		app.Stop()
-		exit = true
-	case err := <-errCh:
-		if err != nil {
-			slog.Error("Server error", slog.Any("err", err))
-		}
+		err = <-errCh
 	}
-
-	if exit {
-		err := <-errCh
-		if err != nil {
-			slog.Error("Server error", slog.Any("err", err))
-		}
-	}
-
-	// 关闭资源
-	err = orm.Exit()
 	if err != nil {
-		slog.Error("Failed to close database connection", slog.Any("err", err))
-	}
-	err = rds.Exit()
-	if err != nil {
-		slog.Error("Failed to close redis connection", slog.Any("err", err))
+		slog.Error("Server error", slog.Any("err", err))
 	}
 }