Revert "🐛 DomainMatch"

This reverts commit 008ab5f.
xygkevin · Aug 1, 2024 · 38485f1 · 38485f1
1 parent 008ab5f
commit 38485f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Models/ReverseProxyConfig.cs b/src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Models/ReverseProxyConfig.cs
@@ -148,17 +148,17 @@ static string GetDomainPatternString(string s)
     //    return result;
     //}
 
-    public bool TryGetDomainConfig(string url, [MaybeNullWhen(false)] out IDomainConfig value)
+    public bool TryGetDomainConfig(string domain, [MaybeNullWhen(false)] out IDomainConfig value)
     {
         //value = domainConfigCache.GetOrAdd(domain.Host, GetDomainConfig);
 
-        var uri = new Uri(url);
+        var uri = new UriBuilder(domain).Uri;
 
         domainConfigCache.TryGetValue(uri.Host, out value);
         if (value != null)
             return true;
 
-        value = GetDomainConfig(uri.Host);
+        value = GetDomainConfig(domain);
         if (value == null)
             return false;
 

diff --git a/....ReverseProxy/Services.Implementation/HttpServer/Middleware/HttpReverseProxyMiddleware.cs b/....ReverseProxy/Services.Implementation/HttpServer/Middleware/HttpReverseProxyMiddleware.cs
@@ -93,7 +93,7 @@ var protocol when protocol.StartsWith("HTTP/3") => System.Net.HttpVersion.Versio
         }
 
         if (domainConfig.Items.Any_Nullable())
-            domainConfig = RecursionMatchDomainConfig(context.Request.Host.Host, domainConfig);
+            domainConfig = RecursionMatchDomainConfig(url, domainConfig);
 
         if (domainConfig.Response == null)
         {
@@ -158,16 +158,16 @@ var protocol when protocol.StartsWith("HTTP/3") => System.Net.HttpVersion.Versio
     /// <summary>
     /// 递归匹配子域名配置
     /// </summary>
-    /// <param name="domain"></param>
+    /// <param name="url"></param>
     /// <param name="domainConfig"></param>
     /// <returns></returns>
-    static IDomainConfig RecursionMatchDomainConfig(string domain, IDomainConfig domainConfig)
+    static IDomainConfig RecursionMatchDomainConfig(string url, IDomainConfig domainConfig)
     {
         if (domainConfig.Items.Any_Nullable())
         {
-            var item = domainConfig.Items.FirstOrDefault(s => s.Key.IsMatch(domain)).Value;
+            var item = domainConfig.Items.FirstOrDefault(s => s.Key.IsMatch(url)).Value;
             if (item != null)
-                return RecursionMatchDomainConfig(domain, item);
+                return RecursionMatchDomainConfig(url, item);
         }
         return domainConfig;
     }