提交 v1.3.0 beta

server/service/base.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"context"
-
-	"next-terminal/server/constant"
+	"next-terminal/server/common/nt"
+	"next-terminal/server/env"
 
 	"gorm.io/gorm"
 )
@@ -12,10 +12,20 @@ type baseService struct {
 }
 
 func (service baseService) Context(db *gorm.DB) context.Context {
-	return context.WithValue(context.TODO(), constant.DB, db)
+	return context.WithValue(context.TODO(), nt.DB, db)
 }
 
-func (service baseService) InTransaction(ctx context.Context) bool {
-	_, ok := ctx.Value(constant.DB).(*gorm.DB)
+func (service baseService) inTransaction(ctx context.Context) bool {
+	_, ok := ctx.Value(nt.DB).(*gorm.DB)
 	return ok
 }
+
+func (service baseService) Transaction(ctx context.Context, f func(ctx context.Context) error) error {
+	if !service.inTransaction(ctx) {
+		return env.GetDB().Transaction(func(tx *gorm.DB) error {
+			ctx := service.Context(tx)
+			return f(ctx)
+		})
+	}
+	return f(ctx)
+}