red-future/common
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 19 Wiki Activity

提交5个文件, 修改了mongo方法, 如果token获取错误, 然后获取完租户id后, 把错误清除

Browse Source
This commit is contained in:
Cold
2025-12-24 18:33:11 +08:00
committed by 张斌
parent 3dc3ebc9ad
commit ecf3c29759
5 changed files with 88 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
mongo/mongo.go
View File

@@ -261,31 +261,58 @@ func GetTenantInfo(ctx context.Context) (user do.User, err error) {
return
}
// 2. token 获取失败，尝试从请求参数获取 customerServiceId
// 2. token 获取失败，尝试从请求参数或context获取 accountName
var accountName string
// 2.1 尝试从request获取（HTTP请求场景）
req := g.RequestFromCtx(ctx)
if req == nil {
return user, gerror.New("无法获取租户信息：无 token 且无 request")
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()
}
}
customerServiceId := req.Get("customerServiceId").String()
if customerServiceId == "" {
customerServiceId = 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 customerServiceId == "" {
return user, gerror.New("无法获取租户信息：无 token 且无 customerServiceId 参数")
}
// 兼容旧参数名
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{"customerServiceId": customerServiceId, "isDeleted": false}
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("通过 customerServiceId 查询租户失败: %v", findErr)
return user, gerror.Newf("通过 accountName 查询租户失败: %v", findErr)
}
user.TenantId = account.TenantId
user.UserName = customerServiceId
user.UserName = accountName
err = nil // 清空之前从token获取时的错误
return
}

10
rabbitmq/consumer_manager.go
View File

@@ -104,9 +104,13 @@ func (cm *ConsumerManager) Init() (err error) {
}
glog.Info(cm.ctx, "RabbitMQ 连接已初始化")
// 设置响应队列（RAGFlow 响应消息）
if err = SetupResponseQueue(cm.ctx); err != nil {
glog.Fatalf(cm.ctx, "设置响应队列失败: %v", err)
// 声明响应Exchange（队列由各消费者自己声明和绑定）
if err = DeclareExchange(cm.ctx, &ExchangeConfig{
Name: "ragflow.response",
Type: "topic",
Durable: true,
}); err != nil {
glog.Fatalf(cm.ctx, "声明响应Exchange失败: %v", err)
return
}

28
ragflow/document.go
View File

@@ -5,10 +5,10 @@ package ragflow
import (
"bytes"
"context"
"encoding/json"
"mime/multipart"
"strings"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/errors/gerror"
)
@@ -44,6 +44,11 @@ type UploadDocumentReq struct {
FilePaths []string // 本地文件路径列表
}
// UploadDocumentRes 上传文档响应
type UploadDocumentRes struct {
Id string `json:"id"` // 文档ID
}
// ListDocumentsReq 列出文档请求
type ListDocumentsReq struct {
Page int `json:"page,omitempty"` // 页码，默认 1
@@ -190,28 +195,25 @@ func (c *Client) UploadDocumentFromText(ctx context.Context, datasetId, content,
defer resp.Close()
// 解析响应
var result struct {
var response struct {
Code int `json:"code"`
Message string `json:"message"`
Data struct {
Id string `json:"id"`
} `json:"data"`
Data []UploadDocumentRes `json:"data"` // RAGFlow返回数组
}
bodyBytes := resp.ReadAll()
if err = gjson.DecodeTo(bodyBytes, &result); err != nil {
return "", err
if err := json.Unmarshal(resp.ReadAll(), &response); err != nil {
return "", gerror.Newf("json Decode failed: %v", err)
}
if result.Code != 0 {
return "", gerror.Newf("上传文档失败 (code=%d): %s", result.Code, result.Message)
if len(response.Data) == 0 {
return "", gerror.New("上传文档返回data为空")
}
if result.Data.Id == "" {
return "", gerror.New("上传成功但未返回文档ID")
if response.Code != 0 {
return "", gerror.Newf("上传文档失败 (code=%d): %s", response.Code, response.Message)
}
return result.Data.Id, nil
return response.Data[0].Id, nil
}
// UploadDocument 上传文档（保留兼容）

18
redis/redis.go
View File

@@ -487,9 +487,10 @@ const (
// UserState 用户会话状态（阶段+对话计数+咨询方向,统一5分钟过期）
type UserState struct {
Stage int `json:"stage"` // 用户阶段：5=未选择方向 0=AI模型 1=打招呼 2=业务 3=发卡片
Count int64 `json:"count"` // 对话计数
Direction string `json:"direction"` // 用户选择的咨询方向（如：产品咨询、售后服务）
Stage int `json:"stage"` // 当前阶段
Direction string `json:"direction"` // 咨询方向
Count int64 `json:"count"` // 对话计数（v5.2卡片触发）
CustomerServiceId string `json:"customerServiceId"` // 用户选择的方向对应的客服账号ID
}
// GetUserState 获取用户状态（阶段+计数）
@@ -528,6 +529,17 @@ func SetUserStage(ctx context.Context, userId, platform string, stage int) error
return err
}
// SetUserCustomerServiceId 设置用户对应的客服账号ID，并刷新过期时间
func SetUserCustomerServiceId(ctx context.Context, userId, platform, customerServiceId string) error {
key := UserStateKeyPrefix + userId + "_" + platform
_, err := redisClient.Do(ctx, "HSET", key, "customerServiceId", customerServiceId)
if err != nil {
return err
}
_, err = redisClient.Do(ctx, "EXPIRE", key, UserStateExpireSeconds)
return err
}
// SetUserDirection 设置用户选择的咨询方向，并刷新过期时间
func SetUserDirection(ctx context.Context, userId, platform, direction string) error {
key := UserStateKeyPrefix + userId + "_" + platform

2
redis/types.go
View File

@@ -17,6 +17,8 @@ type SendStreamMessage struct {
Platform string `json:"platform,omitempty"` // 平台标识
AccountId string `json:"account_id,omitempty"` // 账号ID
TenantId string `json:"tenant_id,omitempty"` // 租户ID（数据隔离）
CustomerServiceId string `json:"customer_service_id,omitempty"` // 客服账号ID
ChatId string `json:"chat_id,omitempty"` // RAGFlow Chat ID（从ragflow_config查询）
ReplyQueue string `json:"reply_queue,omitempty"` // 响应队列名称（支持多实例独立队列）
History []HistoryMessage `json:"history,omitempty"` // 历史对话（归档后恢复时携带）
}