diff --git a/mongo/mongo.go b/mongo/mongo.go index d0bff5f..101f2d1 100644 --- a/mongo/mongo.go +++ b/mongo/mongo.go @@ -11,7 +11,6 @@ import ( "github.com/gogf/gf/v2/container/gvar" "gitee.com/red-future---jilin-g/common/consts" - "gitee.com/red-future---jilin-g/common/do" "gitee.com/red-future---jilin-g/common/redis" "gitee.com/red-future---jilin-g/common/utils" "github.com/gogf/gf/v2/errors/gerror" @@ -99,6 +98,13 @@ func connect() error { return nil } +// GetDB 获取 MongoDB 数据库实例 +func GetDB() *mongo.Database { + mu.RLock() + defer mu.RUnlock() + return db +} + // healthCheck 健康检查协程 func healthCheck() { ticker := time.NewTicker(30 * time.Second) @@ -261,76 +267,12 @@ func oneOptionsToMap(ctx context.Context, opts ...options.Lister[options.FindOne return } -// getTenantInfo 获取租户信息 -// 优先从 token 获取，失败则从请求参数 customerServiceId 查询 customer_service_account 表 -func getTenantInfo(ctx context.Context) (user do.User, err error) { - // 1. 优先从 token 获取 - user, err = utils.GetUserInfo(ctx) - if err == nil { - return - } - - // 2. token 获取失败，尝试从请求参数或context获取 accountName - var accountName string - - // 2.1 尝试从request获取（HTTP请求场景） - req := g.RequestFromCtx(ctx) - if req != nil { - accountName = req.Get("accountName").String() - if accountName == "" { - accountName = req.Get("account_name").String() - } - // 兼容旧参数名 - if accountName == "" { - accountName = req.Get("customerServiceId").String() - } - if accountName == "" { - accountName = req.Get("customer_service_id").String() - } - } - - // 2.2 request不存在或未获取到，尝试从context.Value获取（WebSocket场景） - if accountName == "" { - if val := ctx.Value("accountName"); val != nil { - if str, ok := val.(string); ok { - accountName = str - } - } - // 兼容旧参数名 - if accountName == "" { - if val := ctx.Value("customerServiceId"); val != nil { - if str, ok := val.(string); ok { - accountName = str - } - } - } - } - - if accountName == "" { - return user, gerror.New("无法获取租户信息：无 token 且无 accountName 参数") - } - - // 3. 直接查询 customer_service_account 表获取 tenantId - filter := bson.M{"accountName": accountName, "isDeleted": false} - var account struct { - TenantId interface{} `bson:"tenantId"` - } - if findErr := db.Collection("customer_service_account").FindOne(ctx, filter).Decode(&account); findErr != nil { - return user, gerror.Newf("通过 accountName 查询租户失败: %v", findErr) - } - - user.TenantId = account.TenantId - user.UserName = accountName - err = nil // 清空之前从token获取时的错误 - return -} - // Find 查询多条记录 func (m *MongoDB) Find(ctx context.Context, filter bson.M, result interface{}, collection string, opts ...options.Lister[options.FindOptions]) (err error) { if err = utils.ValidStructPtr(result); err != nil { return } - user, err := getTenantInfo(ctx) + user, err := utils.GetUserInfo(ctx) if err != nil { return } @@ -379,7 +321,7 @@ func (m *MongoDB) FindOne(ctx context.Context, filter bson.M, result interface{} if err = utils.ValidStructPtr(result); err != nil { return } - user, err := getTenantInfo(ctx) + user, err := utils.GetUserInfo(ctx) if err != nil { return } @@ -456,7 +398,7 @@ func (m *MongoDB) Delete(ctx context.Context, filter bson.M, collection string, err = gerror.New("缺少查询条件") return } - user, err := getTenantInfo(ctx) + user, err := utils.GetUserInfo(ctx) if err != nil { return } @@ -477,7 +419,7 @@ func (m *MongoDB) Update(ctx context.Context, filter bson.M, update bson.M, coll return } filter["isDeleted"] = false - user, err := getTenantInfo(ctx) + user, err := utils.GetUserInfo(ctx) if err != nil { return } @@ -557,7 +499,7 @@ func (m *MongoDB) SaveOrUpdate(ctx context.Context, filter []bson.M, update []bs err = gerror.New("查询条件和更新数据的数量必须一致") return } - user, err := getTenantInfo(ctx) + user, err := utils.GetUserInfo(ctx) if err != nil { return } @@ -622,7 +564,7 @@ func (m *MongoDB) SaveOrUpdate(ctx context.Context, filter []bson.M, update []bs // Insert 插入多条记录 func (m *MongoDB) Insert(ctx context.Context, documents []interface{}, collection string, opts ...options.Lister[options.InsertManyOptions]) (ids []interface{}, err error) { - user, err := getTenantInfo(ctx) + user, err := utils.GetUserInfo(ctx) if err != nil { return } @@ -655,7 +597,7 @@ func (m *MongoDB) Insert(ctx context.Context, documents []interface{}, collectio // Count 查询总数 func (m *MongoDB) Count(ctx context.Context, filter bson.M, collection string) (count int64, err error) { - user, err := getTenantInfo(ctx) + user, err := utils.GetUserInfo(ctx) if err != nil { return } diff --git a/utils/utils.go b/utils/utils.go index c4b8393..b8ca4ca 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -60,40 +60,44 @@ func GetMonthToday(t time.Time, month int) time.Time { return target.AddDate(0, 0, t.Day()-1) } func GetUserInfo(ctx context.Context) (user do.User, err error) { - redisAddr := g.Cfg().MustGet(ctx, "redis.default.address").String() - gft := gftoken.NewGfToken( - gftoken.WithCacheKey("gfToken:"), - gftoken.WithTimeout(20), - gftoken.WithMaxRefresh(10), - gftoken.WithMultiLogin(true), - //gftoken.WithExcludePaths(g.SliceStr{"/excludeDemo"}), - gftoken.WithGRedisConfig(&gredis.Config{ - Address: redisAddr, - Db: 1, - })) r := g.RequestFromCtx(ctx) - if r == nil { - return - } - // 解析 token - data, err := gft.ParseToken(g.RequestFromCtx(ctx)) - if err != nil { - return user, gerror.Wrap(err, "token 解析失败") - } + if r != nil { + redisAddr := g.Cfg().MustGet(ctx, "redis.default.address").String() + gft := gftoken.NewGfToken( + gftoken.WithCacheKey("gfToken:"), + gftoken.WithTimeout(20), + gftoken.WithMaxRefresh(10), + gftoken.WithMultiLogin(true), + //gftoken.WithExcludePaths(g.SliceStr{"/excludeDemo"}), + gftoken.WithGRedisConfig(&gredis.Config{ + Address: redisAddr, + Db: 1, + })) + // 解析 token + data, err := gft.ParseToken(g.RequestFromCtx(ctx)) + if err != nil { + return user, gerror.Wrap(err, "token 解析失败") + } - // 检查 data 是否为 nil - if data == nil { - return user, gerror.New("token 数据为空") - } + // 检查 data 是否为 nil + if data == nil { + return user, gerror.New("token 数据为空") + } - // 检查 data.Data 是否为 nil - if data.Data == nil { - return user, gerror.New("用户信息为空") - } + // 检查 data.Data 是否为 nil + if data.Data == nil { + return user, gerror.New("用户信息为空") + } - dataMap := gconv.Map(data.Data) - user.UserName = dataMap["userName"] - user.TenantId = dataMap["tenantId"] + dataMap := gconv.Map(data.Data) + user.UserName = dataMap["userName"] + user.TenantId = dataMap["tenantId"] + } else { + user.TenantId = ctx.Value("tenantId") + } + if user.TenantId == nil { + return user, gerror.New("租户信息为空") + } return } func OrderMap(m map[string]interface{}) map[string]interface{} {