From bd56ce094a3d5a151a26100da5a0e3a69adea20f Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Sat, 24 May 2025 23:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96https=E5=A4=9A=E7=BA=A7?= =?UTF-8?q?=E4=B8=BB=E5=9F=9F=E5=90=8D=E5=AD=98=E5=9C=A8=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E6=97=B6=E7=9A=84=E5=8C=B9=E9=85=8D=E6=9C=BA?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/neutrinoproxy/server/util/ProxyUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ProxyUtil.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ProxyUtil.java index 14b777cf..0208b059 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ProxyUtil.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ProxyUtil.java @@ -414,9 +414,9 @@ public class ProxyUtil { * 通过完整域名获取域名 */ public static String getDomainNameByFullDomain(String fullDomain) { - List domains = domainToDomainNameIdMap.keySet().stream().filter(item -> fullDomain.endsWith(item)).collect(Collectors.toList()); + List domains = domainToDomainNameIdMap.keySet().stream().sorted((a,b) -> b.length() - a.length()).filter(item -> fullDomain.endsWith(item)).collect(Collectors.toList()); // 不存在 或者 有多条记录,返回null - if (CollectionUtil.isEmpty(domains) || domains.size() > 1) { + if (CollectionUtil.isEmpty(domains)) { return null; } return domains.getFirst();