From fa5030277fe35bdb3c20c0d41193a028ce0e7c3a Mon Sep 17 00:00:00 2001 From: suxiang <2585546823@qq.com> Date: Wed, 18 Sep 2024 13:25:49 +0800 Subject: [PATCH] =?UTF-8?q?HTTP(S)=E4=BB=A3=E7=90=86=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=EF=BC=8C=E4=B8=8D=E9=85=8D=E7=BD=AE=E5=88=99?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81HTTP(S)=E5=9F=9F=E5=90=8D=E6=98=A0?= =?UTF-8?q?=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../neutrinoproxy/server/proxy/enhance/HttpProxy.java | 6 ++---- .../neutrinoproxy/server/proxy/enhance/HttpsProxy.java | 4 ++++ neutrino-proxy-server/src/main/resources/app.yml | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java index 80d4bf68..5a4c9a72 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java @@ -1,8 +1,7 @@ package org.dromara.neutrinoproxy.server.proxy.enhance; -import cn.hutool.core.util.StrUtil; import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.*; +import io.netty.channel.ChannelInitializer; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; @@ -10,7 +9,6 @@ import io.netty.handler.logging.LoggingHandler; import lombok.extern.slf4j.Slf4j; import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig; import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler; -import org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelServer; import org.dromara.neutrinoproxy.server.proxy.security.HttpVisitorSecurityChannelHandler; import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler; import org.noear.solon.annotation.Component; @@ -31,7 +29,7 @@ public class HttpProxy implements EventListener { @Override public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable { if (null == proxyConfig.getServer().getTcp().getHttpProxyPort()) { - log.info("no config domain name,nonsupport http proxy."); + log.info("no config http proxy port, nonsupport http proxy."); return; } this.start(); diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java index d7b7bff7..478cb722 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java @@ -33,6 +33,10 @@ public class HttpsProxy implements EventListener { @Override public void onEvent(AppLoadEndEvent appLoadEndEvent) { + if (null == proxyConfig.getServer().getTcp().getHttpsProxyPort()) { + log.info("no config https proxy port, nonsupport http proxy."); + return; + } this.start(); } diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml index 44045e4b..e5d6be64 100644 --- a/neutrino-proxy-server/src/main/resources/app.yml +++ b/neutrino-proxy-server/src/main/resources/app.yml @@ -54,9 +54,9 @@ neutrino: # 线程池相关配置，用于技术调优，可忽略 boss-thread-count: 5 work-thread-count: 20 - # http代理端口，默认80 + # http代理端口，默认80（不配置不支持） http-proxy-port: ${HTTP_PROXY_PORT:80} - # https代理端口，默认443 （需要配置域名、证书） + # https代理端口，默认443 （不配置不支持，同时需要配置域名、证书） https-proxy-port: ${HTTPS_PROXY_PORT:443} # 是否开启代理服务报文日志(日志级别为debug时开启才有效) transfer-log-enable: ${SERVER_LOG:false}