Fengling.Platform.Domain/AggregatesModel/GatewayAggregate/GwDestination.cs

@@ -34,11 +34,4 @@ public class GwDestination
     /// 状态
     /// </summary>
     public int Status { get; set; } = 1;
-    
-    /// <summary>
-    /// 租户代码，用于区分租户专属目标
-    /// null 或空字符串表示默认目标（所有租户共享）
-    /// 有值表示该目标专属于指定租户
-    /// </summary>
-    public string? TenantCode { get; set; }
 }

Fengling.Platform.Domain/AggregatesModel/GatewayAggregate/GwRouteMatch.cs

@@ -1,7 +1,3 @@
-using Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Text.Json.Serialization;
-
 namespace Fengling.Platform.Domain.AggregatesModel.GatewayAggregate;
 
 /// <summary>
@@ -28,15 +24,11 @@ public class GwRouteMatch
     /// <summary>
     /// Header 匹配规则
     /// </summary>
-    [NotMapped]
-    [JsonInclude]
     public List<GwRouteHeader>? Headers { get; set; }
 
     /// <summary>
     /// 查询参数匹配规则
     /// </summary>
-    [NotMapped]
-    [JsonInclude]
     public List<GwRouteQueryParameter>? QueryParameters { get; set; }
 }
 

Fengling.Platform.Domain/AggregatesModel/GatewayAggregate/GwTenantRoute.cs

@@ -1,13 +1,17 @@
 namespace Fengling.Platform.Domain.AggregatesModel.GatewayAggregate;
 
 /// <summary>
-/// 网关路由实体 - 表示全局路由规则配置
+/// 网关租户路由实体 - 表示路由规则配置
 /// </summary>
-public class GwRoute
+public class GwTenantRoute
 {
     public string Id { get; set; } = Guid.CreateVersion7().ToString("N");
     
-
+    /// <summary>
+    /// 租户代码
+    /// </summary>
+    public string TenantCode { get; set; } = string.Empty;
+    
     /// <summary>
     /// 服务名称
     /// </summary>
@@ -63,7 +67,11 @@ public class GwRoute
     /// </summary>
     public int Status { get; set; } = 1;
     
-
+    /// <summary>
+    /// 是否全局路由
+    /// </summary>
+    public bool IsGlobal { get; set; } = false;
+    
     /// <summary>
     /// 创建人ID
     /// </summary>

Fengling.Platform.Domain/Fengling.Platform.Domain.csproj

@@ -6,8 +6,6 @@
     <Nullable>enable</Nullable>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
-    <Version>1.0.0</Version>
-    <PackageVersion>1.0.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

Fengling.Platform.Infrastructure/IRouteManager.cs

@@ -9,9 +9,10 @@ namespace Fengling.Platform.Infrastructure;
 /// </summary>
 public interface IRouteManager
 {
-    Task<GwRoute?> FindByIdAsync(string? id, CancellationToken cancellationToken = default);
-    Task<IList<GwRoute>> GetAllAsync(CancellationToken cancellationToken = default);
-    Task<IdentityResult> CreateRouteAsync(GwRoute route, CancellationToken cancellationToken = default);
-    Task<IdentityResult> UpdateRouteAsync(GwRoute route, CancellationToken cancellationToken = default);
-    Task<IdentityResult> DeleteRouteAsync(GwRoute route, CancellationToken cancellationToken = default);
+    Task<GwTenantRoute?> FindByIdAsync(string? id, CancellationToken cancellationToken = default);
+    Task<GwTenantRoute?> FindByTenantCodeAsync(string tenantCode, CancellationToken cancellationToken = default);
+    Task<IList<GwTenantRoute>> GetAllAsync(CancellationToken cancellationToken = default);
+    Task<IdentityResult> CreateRouteAsync(GwTenantRoute route, CancellationToken cancellationToken = default);
+    Task<IdentityResult> UpdateRouteAsync(GwTenantRoute route, CancellationToken cancellationToken = default);
+    Task<IdentityResult> DeleteRouteAsync(GwTenantRoute route, CancellationToken cancellationToken = default);
 }

Fengling.Platform.Infrastructure/IRouteStore.cs

@@ -9,14 +9,15 @@ namespace Fengling.Platform.Infrastructure;
 /// </summary>
 public interface IRouteStore
 {
-    Task<GwRoute?> FindByIdAsync(string? id, CancellationToken cancellationToken = default);
-    Task<GwRoute?> FindByClusterIdAsync(string clusterId, CancellationToken cancellationToken = default);
-    Task<IList<GwRoute>> GetAllAsync(CancellationToken cancellationToken = default);
-    Task<IList<GwRoute>> GetPagedAsync(int page, int pageSize,
+    Task<GwTenantRoute?> FindByIdAsync(string? id, CancellationToken cancellationToken = default);
+    Task<GwTenantRoute?> FindByTenantCodeAsync(string tenantCode, CancellationToken cancellationToken = default);
+    Task<GwTenantRoute?> FindByClusterIdAsync(string clusterId, CancellationToken cancellationToken = default);
+    Task<IList<GwTenantRoute>> GetAllAsync(CancellationToken cancellationToken = default);
+    Task<IList<GwTenantRoute>> GetPagedAsync(int page, int pageSize, string? tenantCode = null, 
         string? serviceName = null, RouteStatus? status = null, CancellationToken cancellationToken = default);
-    Task<int> GetCountAsync(string? serviceName = null, 
+    Task<int> GetCountAsync(string? tenantCode = null, string? serviceName = null, 
         RouteStatus? status = null, CancellationToken cancellationToken = default);
-    Task<IdentityResult> CreateAsync(GwRoute route, CancellationToken cancellationToken = default);
-    Task<IdentityResult> UpdateAsync(GwRoute route, CancellationToken cancellationToken = default);
-    Task<IdentityResult> DeleteAsync(GwRoute route, CancellationToken cancellationToken = default);
+    Task<IdentityResult> CreateAsync(GwTenantRoute route, CancellationToken cancellationToken = default);
+    Task<IdentityResult> UpdateAsync(GwTenantRoute route, CancellationToken cancellationToken = default);
+    Task<IdentityResult> DeleteAsync(GwTenantRoute route, CancellationToken cancellationToken = default);
 }

Fengling.Platform.Infrastructure/PlatformDbContext.cs

@@ -4,9 +4,6 @@ using Fengling.Platform.Domain.AggregatesModel.TenantAggregate;
 using Fengling.Platform.Domain.AggregatesModel.UserAggregate;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.ChangeTracking;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using System.Text.Json;
 
 namespace Fengling.Platform.Infrastructure;
 
@@ -18,7 +15,7 @@ public class PlatformDbContext(DbContextOptions options)
     public DbSet<AuditLog> AuditLogs => Set<AuditLog>();
     
     // Gateway 实体
-    public DbSet<GwRoute> GwRoutes => Set<GwRoute>();
+    public DbSet<GwTenantRoute> GwTenantRoutes => Set<GwTenantRoute>();
     public DbSet<GwCluster> GwClusters => Set<GwCluster>();
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -28,12 +25,6 @@ public class PlatformDbContext(DbContextOptions options)
             throw new ArgumentNullException(nameof(modelBuilder));
         }
 
-        // 忽略这些类型，让它们只作为 JSON 值对象使用
-        modelBuilder.Ignore<GwRouteMatch>();
-        modelBuilder.Ignore<GwRouteHeader>();
-        modelBuilder.Ignore<GwRouteQueryParameter>();
-        modelBuilder.Ignore<GwTransform>();
-
         modelBuilder.Entity<ApplicationUser>(entity =>
         {
             entity.Property(e => e.PhoneNumber).HasMaxLength(20);
@@ -91,10 +82,10 @@ public class PlatformDbContext(DbContextOptions options)
         });
 
         // Gateway 实体配置
-        modelBuilder.Entity<GwRoute>(entity =>
+        modelBuilder.Entity<GwTenantRoute>(entity =>
         {
-            entity.ToTable("GwRoutes");
             entity.HasKey(e => e.Id);
+            entity.Property(e => e.TenantCode).HasMaxLength(50);
             entity.Property(e => e.ServiceName).HasMaxLength(100).IsRequired();
             entity.Property(e => e.ClusterId).HasMaxLength(100).IsRequired();
             entity.Property(e => e.AuthorizationPolicy).HasMaxLength(100);
@@ -109,38 +100,27 @@ public class PlatformDbContext(DbContextOptions options)
                 )
                 .HasMaxLength(50);
             
-            // 值对象映射为 JSON 列 - 使用值转换器
-            var jsonOptions = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
-            entity.Property(e => e.Match)
-                .HasConversion(
-                    v => JsonSerializer.Serialize(v, jsonOptions),
-                    v => JsonSerializer.Deserialize<GwRouteMatch>(v, jsonOptions)!,
-                    new ValueComparer<GwRouteMatch>(
-                        (c1, c2) => JsonSerializer.Serialize(c1, jsonOptions) == JsonSerializer.Serialize(c2, jsonOptions),
-                        c => c == null ? 0 : JsonSerializer.Serialize(c, jsonOptions).GetHashCode(),
-                        c => JsonSerializer.Deserialize<GwRouteMatch>(JsonSerializer.Serialize(c, jsonOptions), jsonOptions)!))
-                .HasColumnType("jsonb");
+            // 值对象映射为 JSON 列
+            entity.OwnsOne(e => e.Match, navigationBuilder =>
+            {
+                navigationBuilder.ToJson();
+            });
             
-            // 转换规则映射为 JSON 列 - 使用值转换器
-            entity.Property(e => e.Transforms)
-                .HasConversion(
-                    v => JsonSerializer.Serialize(v, jsonOptions),
-                    v => JsonSerializer.Deserialize<List<GwTransform>>(v, jsonOptions),
-                    new ValueComparer<List<GwTransform>>(
-                        (c1, c2) => JsonSerializer.Serialize(c1, jsonOptions) == JsonSerializer.Serialize(c2, jsonOptions),
-                        c => c == null ? 0 : JsonSerializer.Serialize(c, jsonOptions).GetHashCode(),
-                        c => JsonSerializer.Deserialize<List<GwTransform>>(JsonSerializer.Serialize(c, jsonOptions), jsonOptions)!))
-                .HasColumnType("jsonb");
+            // 转换规则映射为 JSON 列
+            entity.OwnsMany(e => e.Transforms, navigationBuilder =>
+            {
+                navigationBuilder.ToJson();
+            });
             
+            entity.HasIndex(e => e.TenantCode);
             entity.HasIndex(e => e.ServiceName);
             entity.HasIndex(e => e.ClusterId);
-            entity.HasIndex(e => new { e.ServiceName, e.Status });
+            entity.HasIndex(e => new { e.ServiceName, e.IsGlobal, e.Status });
         });
 
         // GwCluster 聚合根配置
         modelBuilder.Entity<GwCluster>(entity =>
         {
-            entity.ToTable("ServiceInstances");
             entity.HasKey(e => e.Id);
             entity.Property(e => e.ClusterId).HasMaxLength(100).IsRequired();
             entity.Property(e => e.Name).HasMaxLength(100).IsRequired();

Fengling.Platform.Infrastructure/RouteManager.cs

@@ -15,21 +15,24 @@ public class RouteManager : IRouteManager
         _store = store;
     }
 
-    public virtual Task<GwRoute?> FindByIdAsync(string? id, CancellationToken cancellationToken = default)
+    public virtual Task<GwTenantRoute?> FindByIdAsync(string? id, CancellationToken cancellationToken = default)
         => _store.FindByIdAsync(id, cancellationToken);
 
-    public virtual Task<IList<GwRoute>> GetAllAsync(CancellationToken cancellationToken = default)
+    public virtual Task<GwTenantRoute?> FindByTenantCodeAsync(string tenantCode, CancellationToken cancellationToken = default)
+        => _store.FindByTenantCodeAsync(tenantCode, cancellationToken);
+
+    public virtual Task<IList<GwTenantRoute>> GetAllAsync(CancellationToken cancellationToken = default)
         => _store.GetAllAsync(cancellationToken);
 
-    public virtual Task<IdentityResult> CreateRouteAsync(GwRoute route, CancellationToken cancellationToken = default)
+    public virtual Task<IdentityResult> CreateRouteAsync(GwTenantRoute route, CancellationToken cancellationToken = default)
     {
         route.CreatedTime = DateTime.UtcNow;
         return _store.CreateAsync(route, cancellationToken);
     }
 
-    public virtual Task<IdentityResult> UpdateRouteAsync(GwRoute route, CancellationToken cancellationToken = default)
+    public virtual Task<IdentityResult> UpdateRouteAsync(GwTenantRoute route, CancellationToken cancellationToken = default)
         => _store.UpdateAsync(route, cancellationToken);
 
-    public virtual Task<IdentityResult> DeleteRouteAsync(GwRoute route, CancellationToken cancellationToken = default)
+    public virtual Task<IdentityResult> DeleteRouteAsync(GwTenantRoute route, CancellationToken cancellationToken = default)
         => _store.DeleteAsync(route, cancellationToken);
 }

Fengling.Platform.Infrastructure/RouteStore.cs

@@ -11,37 +11,45 @@ public class RouteStore<TContext> : IRouteStore
     where TContext : PlatformDbContext
 {
     private readonly TContext _context;
-    private readonly DbSet<GwRoute> _routes;
+    private readonly DbSet<GwTenantRoute> _routes;
 
     public RouteStore(TContext context)
     {
         _context = context;
-        _routes = context.GwRoutes;
+        _routes = context.GwTenantRoutes;
     }
 
     public void Dispose() { }
 
-    public virtual Task<GwRoute?> FindByIdAsync(string? id, CancellationToken cancellationToken = default)
+    public virtual Task<GwTenantRoute?> FindByIdAsync(string? id, CancellationToken cancellationToken = default)
     {
-        if (id == null) return Task.FromResult<GwRoute?>(null);
+        if (id == null) return Task.FromResult<GwTenantRoute?>(null);
         return _routes.FirstOrDefaultAsync(r => r.Id == id, cancellationToken);
     }
 
-    public virtual Task<GwRoute?> FindByClusterIdAsync(string clusterId, CancellationToken cancellationToken = default)
+    public virtual Task<GwTenantRoute?> FindByTenantCodeAsync(string tenantCode, CancellationToken cancellationToken = default)
+    {
+        return _routes.FirstOrDefaultAsync(r => r.TenantCode == tenantCode && !r.IsDeleted, cancellationToken);
+    }
+
+    public virtual Task<GwTenantRoute?> FindByClusterIdAsync(string clusterId, CancellationToken cancellationToken = default)
     {
         return _routes.FirstOrDefaultAsync(r => r.ClusterId == clusterId && !r.IsDeleted, cancellationToken);
     }
 
-    public virtual async Task<IList<GwRoute>> GetAllAsync(CancellationToken cancellationToken = default)
+    public virtual async Task<IList<GwTenantRoute>> GetAllAsync(CancellationToken cancellationToken = default)
     {
         return await _routes.Where(r => !r.IsDeleted).ToListAsync(cancellationToken);
     }
 
-    public virtual async Task<IList<GwRoute>> GetPagedAsync(int page, int pageSize,
+    public virtual async Task<IList<GwTenantRoute>> GetPagedAsync(int page, int pageSize, string? tenantCode = null,
         string? serviceName = null, RouteStatus? status = null, CancellationToken cancellationToken = default)
     {
         var query = _routes.AsQueryable();
 
+        if (!string.IsNullOrEmpty(tenantCode))
+            query = query.Where(r => r.TenantCode.Contains(tenantCode));
+
         if (!string.IsNullOrEmpty(serviceName))
             query = query.Where(r => r.ServiceName.Contains(serviceName));
 
@@ -56,11 +64,14 @@ public class RouteStore<TContext> : IRouteStore
             .ToListAsync(cancellationToken);
     }
 
-    public virtual async Task<int> GetCountAsync(string? serviceName = null,
+    public virtual async Task<int> GetCountAsync(string? tenantCode = null, string? serviceName = null,
         RouteStatus? status = null, CancellationToken cancellationToken = default)
     {
         var query = _routes.AsQueryable();
 
+        if (!string.IsNullOrEmpty(tenantCode))
+            query = query.Where(r => r.TenantCode.Contains(tenantCode));
+
         if (!string.IsNullOrEmpty(serviceName))
             query = query.Where(r => r.ServiceName.Contains(serviceName));
 
@@ -70,14 +81,14 @@ public class RouteStore<TContext> : IRouteStore
         return await query.Where(r => !r.IsDeleted).CountAsync(cancellationToken);
     }
 
-    public virtual async Task<IdentityResult> CreateAsync(GwRoute route, CancellationToken cancellationToken = default)
+    public virtual async Task<IdentityResult> CreateAsync(GwTenantRoute route, CancellationToken cancellationToken = default)
     {
         _routes.Add(route);
         await _context.SaveChangesAsync(cancellationToken);
         return IdentityResult.Success;
     }
 
-    public virtual async Task<IdentityResult> UpdateAsync(GwRoute route, CancellationToken cancellationToken = default)
+    public virtual async Task<IdentityResult> UpdateAsync(GwTenantRoute route, CancellationToken cancellationToken = default)
     {
         route.UpdatedTime = DateTime.UtcNow;
         _routes.Update(route);
@@ -85,7 +96,7 @@ public class RouteStore<TContext> : IRouteStore
         return IdentityResult.Success;
     }
 
-    public virtual async Task<IdentityResult> DeleteAsync(GwRoute route, CancellationToken cancellationToken = default)
+    public virtual async Task<IdentityResult> DeleteAsync(GwTenantRoute route, CancellationToken cancellationToken = default)
     {
         // 软删除
         route.IsDeleted = true;