重构代码结构与认证体系，集成异步任务消费者

cmd/fill/main.go

@@ -1,128 +0,0 @@
-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/u"
-	client2 "platform/web/domains/client"
-	proxy2 "platform/web/domains/proxy"
-	m "platform/web/models"
-	q "platform/web/queries"
-)
-
-func main() {
-
-	env.Init()
-	logs.Init()
-
-	// 初始化数据库连接
-	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.
-			Select(q.Proxy.Version, q.Proxy.Name, q.Proxy.Host, q.Proxy.Type, q.Proxy.Secret).
-			Create(&m.Proxy{
-				Version: 1,
-				Name:    "7a17e8b4-cdc3-4500-bf16-4a665991a7f6",
-				Host:    "110.40.82.248",
-				Type:    int32(proxy2.TypeSelfHosted),
-				Secret:  u.P("api:123456"),
-			}, &m.Proxy{
-				Version: 1,
-				Name:    "58e03f38-4cef-429c-8bb8-530142d0a745",
-				Host:    "123.6.147.241",
-				Type:    int32(proxy2.TypeThirdParty),
-				Secret:  u.P("api:123456"),
-			})
-		if err != nil {
-			return err
-		}
-
-		// 客户端
-		testSecret, err := bcrypt.GenerateFromPassword([]byte("test"), bcrypt.DefaultCost)
-		if err != nil {
-			return err
-		}
-
-		tasksSecret, err := bcrypt.GenerateFromPassword([]byte("tasks"), bcrypt.DefaultCost)
-		if err != nil {
-			return err
-		}
-
-		proxySecret, err := bcrypt.GenerateFromPassword([]byte("proxy"), bcrypt.DefaultCost)
-		if err != nil {
-			return err
-		}
-
-		err = q.Client.
-			Select(
-				q.Client.ClientID,
-				q.Client.ClientSecret,
-				q.Client.GrantClient,
-				q.Client.GrantRefresh,
-				q.Client.GrantPassword,
-				q.Client.Spec,
-				q.Client.Name,
-			).
-			Create(&m.Client{
-				ClientID:      "test",
-				ClientSecret:  string(testSecret),
-				GrantCode:     true,
-				GrantClient:   true,
-				GrantRefresh:  true,
-				GrantPassword: true,
-				Spec:          int32(client2.SpecTrusted),
-				Name:          "默认客户端",
-			}, &m.Client{
-				ClientID:     "tasks",
-				ClientSecret: string(tasksSecret),
-				GrantClient:  true,
-				Spec:         int32(client2.SpecTrusted),
-				Name:         "异步任务处理服务",
-			}, &m.Client{
-				ClientID:     "proxy",
-				ClientSecret: string(proxySecret),
-				GrantClient:  true,
-				Spec:         int32(client2.SpecTrusted),
-				Name:         "代理转发服务",
-			}, &m.Client{
-				ClientID:    "edge",
-				GrantClient: true,
-				Spec:        int32(client2.SpecWeb),
-				Name:        "代理边缘节点",
-			})
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-	if err != nil {
-		panic(err)
-	}
-
-	slog.Info("✔ Data inserted successfully")
-}

cmd/gen/main.go

@@ -1,12 +1,13 @@
 package main
 
 import (
+	"strings"
+
 	"gorm.io/driver/postgres"
 	"gorm.io/gen"
 	"gorm.io/gen/field"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
-	"strings"
 )
 
 var g *gen.Generator
@@ -15,7 +16,7 @@ func main() {
 
 	// 初始化
 	db, _ := gorm.Open(
-		postgres.Open("host=localhost user=test password=test dbname=app port=5432 sslmode=disable TimeZone=Asia/Shanghai"),
+		postgres.Open("host=localhost user=dev password=dev dbname=app port=5432 sslmode=disable TimeZone=Asia/Shanghai"),
 		&gorm.Config{
 			NamingStrategy: schema.NamingStrategy{
 				SingularTable: true,
@@ -47,11 +48,13 @@ func main() {
 			return field
 		}),
 		gen.FieldRename("contact_qq", "ContactQQ"),
+		gen.FieldRename("ua", "UA"),
 	}
 
 	// 生成模型
 	customs := make(map[string]any)
 
+	// resource
 	resourceShort := g.GenerateModel("resource_short", common...)
 	customs["resource_short"] = resourceShort
 
@@ -76,6 +79,7 @@ func main() {
 	)...)
 	customs["resource"] = resource
 
+	// trade
 	trade := g.GenerateModel("trade", common...)
 	customs["trade"] = trade
 
@@ -104,6 +108,7 @@ func main() {
 	)...)
 	customs["bill"] = bill
 
+	// proxy
 	edge := g.GenerateModel("edge", common...)
 	customs["edge"] = edge
 
@@ -117,9 +122,42 @@ func main() {
 	)...)
 	customs["proxy"] = proxy
 
+	// session
+	user := g.GenerateModel("user", common...)
+	customs["user"] = user
+
+	admin := g.GenerateModel("admin", common...)
+	customs["admin"] = admin
+
+	client := g.GenerateModel("client", common...)
+	customs["client"] = client
+
+	session := g.GenerateModel("session", append(common,
+		gen.FieldRelate(field.BelongsTo, "User", user, &field.RelateConfig{
+			RelatePointer: true,
+			GORMTag: field.GormTag{
+				"foreignKey": []string{"UserID"},
+			},
+		}),
+		gen.FieldRelate(field.BelongsTo, "Admin", admin, &field.RelateConfig{
+			RelatePointer: true,
+			GORMTag: field.GormTag{
+				"foreignKey": []string{"AdminID"},
+			},
+		}),
+		gen.FieldRelate(field.BelongsTo, "Client", client, &field.RelateConfig{
+			RelatePointer: true,
+			GORMTag: field.GormTag{
+				"foreignKey": []string{"ClientID"},
+				"belongsTo":  []string{"ID"},
+			},
+		}),
+	)...)
+	customs["session"] = session
+
 	// 生成表结构
 	tables, _ := db.Migrator().GetTables()
-	models := make([]interface{}, len(tables))
+	models := make([]any, len(tables))
 	for i, name := range tables {
 		if customs[name] != nil {
 			models[i] = customs[name]

cmd/main/main.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"context"
+	"fmt"
 	"log/slog"
 	"os"
 	"os/signal"
@@ -11,45 +13,16 @@ import (
 )
 
 func main() {
-
-	// 退出信号
-	shutdown := make(chan os.Signal, 1)
-	signal.Notify(shutdown, syscall.SIGINT, syscall.SIGTERM)
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
+	defer cancel()
 
 	// 初始化应用
 	env.Init()
 	logs.Init()
 
 	// 创建服务
-	app, err := web.New(&web.Config{
-		Listen: ":8080",
-	})
+	err := web.RunApp(ctx)
 	if err != nil {
-		slog.Error("Failed to create server", slog.Any("err", err))
-		return
-	}
-
-	// 异步运行服务
-	errCh := make(chan error)
-	defer close(errCh)
-	go func() {
-		err := app.Run()
-		if err != nil {
-			slog.Error("Failed to run server", slog.Any("err", err))
-			errCh <- err
-		}
-		errCh <- nil
-	}()
-
-	// 关闭服务
-	select {
-	case err = <-errCh:
-	case <-shutdown:
-		slog.Debug("捕获结束信号")
-		app.Stop()
-		err = <-errCh
-	}
-	if err != nil {
-		slog.Error("Server error", slog.Any("err", err))
+		slog.Error(fmt.Sprintf("%v", err))
 	}
 }