TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-04 00:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: i18n

Browse Source
This commit is contained in:
meilin.huang
2024-11-20 22:43:53 +08:00
parent 74ae031853
commit 99a746085b
308 changed files with 8177 additions and 3880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/pkg/base/app.go
View File

@@ -3,7 +3,6 @@ package base
import (
"context"
"fmt"
"mayfly-go/pkg/contextx"
"mayfly-go/pkg/global"
"mayfly-go/pkg/model"
@@ -162,13 +161,13 @@ func (ai *AppImpl[T, R]) CountByCond(cond any) int64 {
// Tx 执行事务操作
func (ai *AppImpl[T, R]) Tx(ctx context.Context, funcs ...func(context.Context) error) (err error) {
tx := contextx.GetTx(ctx)
tx := GetTxFromCtx(ctx)
dbCtx := ctx
var txDb *gorm.DB
if tx == nil {
txDb = global.Db.Begin()
dbCtx, tx = contextx.WithTxDb(ctx, txDb)
dbCtx, tx = NewCtxWithTxDb(ctx, txDb)
} else {
txDb = tx.DB
tx.Count++