Merge commit '0952958af7685646cdbf2a4907c6e2ae59d4d352'

src/Flyshot.Core.Config/PathCompatibility.cs

@@ -22,7 +22,7 @@ public enum CompatibilityPathStyle
 public static class PathCompatibility
 {
     /// <summary>
-    /// 按旧系统常见目录约定解析配置文件路径。
+    /// 按当前服务配置目录约定解析配置文件路径。
     /// </summary>
     /// <param name="configPath">调用方传入的原始配置路径。</param>
     /// <param name="repoRoot">当前兼容搜索的仓库根目录。</param>
@@ -48,11 +48,10 @@ public static class PathCompatibility
         }
 
         var normalizedRepoRoot = Path.GetFullPath(repoRoot);
-        var fileName = Path.GetFileName(rawPath);
         var checkedPaths = new List<string>();
 
-        // 先按最常见的候选路径顺序尝试，保持与旧工具链相近的定位逻辑。
-        foreach (var candidate in BuildConfigCandidates(normalizedRepoRoot, rawPath, fileName))
+        // 相对路径只允许落在当前服务根目录的 Config 下，避免隐式回退到父工作区旧文件。
+        foreach (var candidate in BuildConfigCandidates(normalizedRepoRoot, rawPath))
         {
             var fullCandidate = Path.GetFullPath(candidate);
             if (checkedPaths.Contains(fullCandidate, StringComparer.OrdinalIgnoreCase))
@@ -67,18 +66,6 @@ public static class PathCompatibility
             }
         }
 
-        // 最后一层兜底按文件名全仓库搜索，但只接受唯一命中，避免同名配置误判。
-        var matches = Directory
-            .EnumerateFiles(normalizedRepoRoot, fileName, SearchOption.AllDirectories)
-            .Select(Path.GetFullPath)
-            .Distinct(StringComparer.OrdinalIgnoreCase)
-            .ToArray();
-
-        if (matches.Length == 1)
-        {
-            return matches[0];
-        }
-
         throw new FileNotFoundException(
             $"未找到配置文件 '{configPath}'。已检查: {string.Join(", ", checkedPaths)}",
             configPath);
@@ -106,15 +93,11 @@ public static class PathCompatibility
     }
 
     /// <summary>
-    /// 枚举旧系统中最常见的配置候选路径。
+    /// 枚举当前服务配置目录下允许的配置候选路径。
     /// </summary>
-    private static IEnumerable<string> BuildConfigCandidates(string repoRoot, string rawPath, string fileName)
+    private static IEnumerable<string> BuildConfigCandidates(string repoRoot, string rawPath)
     {
-        yield return Path.Combine(repoRoot, rawPath);
-        yield return Path.Combine(repoRoot, "Rvbust", "Data", fileName);
-        yield return Path.Combine(repoRoot, "Rvbust", "Install", "FlyingShot", "Config", fileName);
-        yield return Path.Combine(repoRoot, "Rvbust", fileName);
-        yield return Path.Combine(repoRoot, fileName);
+        yield return Path.Combine(repoRoot, "Config", rawPath);
     }
 
     /// <summary>