From 3ffba1744fab01c4b481c7241662ba0455f96365 Mon Sep 17 00:00:00 2001 From: xiaojie <550345579@qq.com> Date: Fri, 1 Mar 2024 17:34:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neutrino-proxy-admin/config/dev.env.js | 2 +- neutrino-proxy-admin/package.json | 4 ++-- neutrino-proxy-client/src/main/resources/app.yml | 2 +- .../dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java | 3 ++- .../server/proxy/enhance/HttpVisitorChannelHandler.java | 2 +- .../neutrinoproxy/server/proxy/enhance/HttpsProxy.java | 3 ++- .../proxy/security/HttpVisitorSecurityChannelHandler.java | 1 + neutrino-proxy-server/src/main/resources/app.yml | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/neutrino-proxy-admin/config/dev.env.js b/neutrino-proxy-admin/config/dev.env.js index 03fd65b0..799ec796 100644 --- a/neutrino-proxy-admin/config/dev.env.js +++ b/neutrino-proxy-admin/config/dev.env.js @@ -1,7 +1,7 @@ module.exports = { NODE_ENV: '"development"', ENV_CONFIG: '"dev"', - BASE_API: '"https://neutrino-proxy.asgc.fun/neutrino-proxy-server"', + BASE_API: '"https://server.com"', USER_NAME: '"visitor"', USER_PWD: '"123456"' } diff --git a/neutrino-proxy-admin/package.json b/neutrino-proxy-admin/package.json index d2bdb819..3fafb115 100644 --- a/neutrino-proxy-admin/package.json +++ b/neutrino-proxy-admin/package.json @@ -36,7 +36,7 @@ "showdown": "1.8.5", "simplemde": "1.11.2", "sortablejs": "1.7.0", - "vue": "2.5.10", + "vue": "2.5.17", "vue-count-to": "1.0.13", "vue-i18n": "7.3.2", "vue-multiselect": "2.0.8", @@ -88,7 +88,7 @@ "url-loader": "0.6.2", "vue-loader": "13.5.0", "vue-style-loader": "3.0.3", - "vue-template-compiler": "2.5.10", + "vue-template-compiler": "2.5.17", "webpack": "3.10.0", "webpack-bundle-analyzer": "2.9.1", "webpack-dev-server": "2.9.7", diff --git a/neutrino-proxy-client/src/main/resources/app.yml b/neutrino-proxy-client/src/main/resources/app.yml index a122416c..8099182a 100644 --- a/neutrino-proxy-client/src/main/resources/app.yml +++ b/neutrino-proxy-client/src/main/resources/app.yml @@ -44,7 +44,7 @@ neutrino: # 是否启用SSL(注意：该配置必须和server-port对应上) ssl-enable: ${SSL_ENABLE:true} # 客户端连接唯一凭证 - license-key: ${LICENSE_KEY:} + license-key: ${LICENSE_KEY:ce554b47de80495b9d1996cd62084973} # 客户端唯一身份标识（可忽略，若不设置首次启动会自动生成） client-id: ${CLIENT_ID:} # 是否开启隧道传输报文日志(日志级别为debug时开启才有效) 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 ce1197db..1782d004 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 @@ -19,7 +19,8 @@ import org.noear.solon.core.event.AppLoadEndEvent; import org.noear.solon.core.event.EventListener; /** - * HTTP代理 + * 应用加载完成事件（即启动完成）- 判断是否配置域名-配置了域名则启动HTTP代理 + * 默认端口 80 * @author: aoshiguchen * @date: 2023/4/2 */ diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpVisitorChannelHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpVisitorChannelHandler.java index 40a18a0f..3ec2f8d0 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpVisitorChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpVisitorChannelHandler.java @@ -19,6 +19,7 @@ import org.noear.solon.Solon; import java.net.InetSocketAddress; /** + * HTTP 访客处理器 * @author: aoshiguchen * @date: 2023/5/27 */ @@ -54,7 +55,6 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler