From 9476ee4bcd86aea26ee4df3936e04efb645bcb08 Mon Sep 17 00:00:00 2001 From: suxiang <2585546823@qq.com> Date: Tue, 10 Sep 2024 23:16:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=A6=E7=BB=86=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/controller/req/proxy/PortMappingUpdateReq.java | 2 +- .../proxy/security/HttpVisitorSecurityChannelHandler.java | 2 +- .../org/dromara/neutrinoproxy/server/service/DomainService.java | 2 +- .../java/org/dromara/neutrinoproxy/server/util/ProxyUtil.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateReq.java index a91b6471..741ae920 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateReq.java @@ -86,7 +86,7 @@ public class PortMappingUpdateReq { /** * 域名映射列表 */ - private List domainMappings; + private List domainMappings; @Data public class DomainMapping { diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/HttpVisitorSecurityChannelHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/HttpVisitorSecurityChannelHandler.java index 9c3d56c6..dfe745da 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/HttpVisitorSecurityChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/HttpVisitorSecurityChannelHandler.java @@ -62,7 +62,7 @@ public class HttpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdap ctx.channel().close(); return; } - // 根据域名拿到绑定的映射对应的cmdChannel + // 根据完整域名拿到服务端端口 serverPort = ProxyUtil.getServerPortByFullDomain(host); if (null == serverPort) { ctx.channel().close(); diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java index 8b2d93dc..0ed243b7 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java @@ -193,7 +193,7 @@ public class DomainService { ProxyUtil.removeDomainToDomainNameId(oldDomainNameDO.getDomain()); ProxyUtil.setDomainToDomainNameId(req.getDomain(), req.getId()); if (CollectionUtil.isEmpty(oldFullDomainNameBOS)) return; - //更新完整域名到服务器端口映射 + //存在域名映射,更新完整域名到服务器端口映射 for (FullDomainNameBO oldFullDomainNameBO : oldFullDomainNameBOS) { String oldFullDomain = StrUtil.join(StrPool.DOT, oldFullDomainNameBO.getSubdomain(), oldFullDomainNameBO.getDomain()); Integer serverPort = ProxyUtil.getServerPortByFullDomain(oldFullDomain); 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 c590abd4..b163dca2 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 @@ -410,7 +410,7 @@ public class ProxyUtil { } /** - * 通过完整域名获取域名id + * 通过完整域名获取域名 */ public static String getDomainNameByFullDomain(String fullDomain) { List domains = domainToDomainNameIdMap.keySet().stream().filter(item -> fullDomain.endsWith(item)).collect(Collectors.toList());