From 8248752e626687643584c6390eb43a5000d5584a Mon Sep 17 00:00:00 2001 From: Changjin Li Date: Wed, 22 Jul 2026 22:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B1=E4=BA=AB=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E5=BA=93=E6=96=87=E6=A1=A3=E9=A2=84=E8=A7=88=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/application/service/knowledge.go | 3 +++ internal/application/service/knowledge_util.go | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/internal/application/service/knowledge.go b/internal/application/service/knowledge.go index abaf5e45..d28493c9 100644 --- a/internal/application/service/knowledge.go +++ b/internal/application/service/knowledge.go @@ -56,6 +56,7 @@ type knowledgeService struct { tagService interfaces.KnowledgeTagService fileSvc interfaces.FileService storageResolver interfaces.StorageBackendResolver + resourceCatalog interfaces.ResourceCatalog modelService interfaces.ModelService task interfaces.TaskEnqueuer taskInspector interfaces.TaskInspector @@ -98,6 +99,7 @@ func NewKnowledgeService( tagService interfaces.KnowledgeTagService, fileSvc interfaces.FileService, storageResolver interfaces.StorageBackendResolver, + resourceCatalog interfaces.ResourceCatalog, modelService interfaces.ModelService, task interfaces.TaskEnqueuer, taskInspector interfaces.TaskInspector, @@ -125,6 +127,7 @@ func NewKnowledgeService( tagService: tagService, fileSvc: fileSvc, storageResolver: storageResolver, + resourceCatalog: resourceCatalog, modelService: modelService, task: task, taskInspector: taskInspector, diff --git a/internal/application/service/knowledge_util.go b/internal/application/service/knowledge_util.go index 8f5710be..da463986 100644 --- a/internal/application/service/knowledge_util.go +++ b/internal/application/service/knowledge_util.go @@ -310,6 +310,24 @@ func (s *knowledgeService) resolveFileService(ctx context.Context, kb *types.Kno // the provider inferred from the file path. This protects historical data when // tenant/KB config changes but files were stored under the old provider. func (s *knowledgeService) resolveFileServiceForPath(ctx context.Context, kb *types.KnowledgeBase, filePath string) interfaces.FileService { + // A resource:// reference belongs to the tenant that registered it. Shared + // KB requests use the viewer's effective tenant in ctx, which can otherwise + // select the wrong storage backend and pass the resource URL to local disk. + if _, ok := types.ParseResourcePath(filePath); ok && s.resourceCatalog != nil && s.storageResolver != nil && s.tenantRepo != nil { + resource, err := s.resourceCatalog.Resolve(ctx, filePath) + if err == nil && resource != nil { + ownerTenant, tenantErr := s.tenantRepo.GetTenantByID(ctx, resource.TenantID) + if tenantErr == nil && ownerTenant != nil { + baseDir := strings.TrimSpace(os.Getenv("LOCAL_STORAGE_BASE_DIR")) + if resolved, _, resolveErr := s.storageResolver.ResolveFileService(ctx, ownerTenant, resource.StorageBackendID, resource.Provider, baseDir); resolveErr == nil && resolved != nil { + return resolved + } else if resolveErr != nil { + logger.Warnf(ctx, "[storage] failed to resolve resource owner backend: resource=%s tenant=%d err=%v", resource.Handle, resource.TenantID, resolveErr) + } + } + } + } + if backendID, inner, ok := types.ParseStorageBackendPath(filePath); ok && s.storageResolver != nil { tenant, _ := ctx.Value(types.TenantInfoContextKey).(*types.Tenant) if tenant != nil {