From 6c3d195afc246146acf19c3c80d5b982a9759986 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Thu, 14 Dec 2023 14:18:35 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E5=8E=9F=E7=94=9F?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=202=E3=80=81=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VLog.md | 2 ++ .../neutrinoproxy/client/ProxyClient.java | 4 ++- .../src/main/resources/app.yml | 2 +- .../neutrinoproxy/server/ProxyServer.java | 1 + .../NeutrinoServerRuntimeNativeRegistrar.java | 29 +++++-------------- .../src/main/resources/app.yml | 2 +- 6 files changed, 15 insertions(+), 25 deletions(-) diff --git a/VLog.md b/VLog.md index c9deeda5..2df6776c 100644 --- a/VLog.md +++ b/VLog.md @@ -77,3 +77,5 @@ - jdk版本升级为21 - native部署，后台新增提交到后端，数据库乱码问题 - 解决HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题 +- [ ] 支持被代理服务获取访问者真实ip +- [ ] 支持对用户、license限速 diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java index ba044973..fd7eaa2a 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java @@ -28,7 +28,9 @@ public class ProxyClient { setAlias("neutrino.proxy.tunnel.jks-path", "jksPath"); setAlias("neutrino.proxy.tunnel.key-store-password", "keyStorePassword"); setAlias("neutrino.proxy.tunnel.license-key", "licenseKey"); - }); + + log.info("NeutrinoProxy Client ：{}", app.cfg().get("solon.app.version")); + }); } /** diff --git a/neutrino-proxy-client/src/main/resources/app.yml b/neutrino-proxy-client/src/main/resources/app.yml index c513862e..a122416c 100644 --- a/neutrino-proxy-client/src/main/resources/app.yml +++ b/neutrino-proxy-client/src/main/resources/app.yml @@ -3,7 +3,7 @@ solon: add: ./app.yml app: name: neutrino-proxy-client - version: @revision@ + version: 2.0.1 # 日志级别 solon.logging.appender: console: diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java index e31f257b..080c02f1 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java @@ -26,6 +26,7 @@ public class ProxyServer { if (Utils.isNotEmpty(loglevel)) { app.cfg().put("solon.logging.logger.root.level", loglevel); } + log.info("NeutrinoProxy Server ：{}", app.cfg().get("solon.app.version")); }); } } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java index 894c0868..cf2b0359 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java @@ -3,28 +3,8 @@ package org.dromara.neutrinoproxy.server.base; import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig; import org.dromara.neutrinoproxy.server.base.rest.ResponseBody; import org.dromara.neutrinoproxy.server.controller.res.report.HomeDataView; -import org.dromara.neutrinoproxy.server.dal.ClientConnectRecordMapper; -import org.dromara.neutrinoproxy.server.dal.FlowReportDayMapper; -import org.dromara.neutrinoproxy.server.dal.FlowReportHourMapper; -import org.dromara.neutrinoproxy.server.dal.FlowReportMinuteMapper; -import org.dromara.neutrinoproxy.server.dal.FlowReportMonthMapper; -import org.dromara.neutrinoproxy.server.dal.JobInfoMapper; -import org.dromara.neutrinoproxy.server.dal.LicenseMapper; -import org.dromara.neutrinoproxy.server.dal.PortMappingMapper; -import org.dromara.neutrinoproxy.server.dal.PortPoolMapper; -import org.dromara.neutrinoproxy.server.dal.UserLoginRecordMapper; -import org.dromara.neutrinoproxy.server.dal.UserMapper; -import org.dromara.neutrinoproxy.server.dal.UserTokenMapper; -import org.dromara.neutrinoproxy.server.service.ClientConnectRecordService; -import org.dromara.neutrinoproxy.server.service.JobInfoService; -import org.dromara.neutrinoproxy.server.service.JobLogService; -import org.dromara.neutrinoproxy.server.service.LicenseService; -import org.dromara.neutrinoproxy.server.service.PortGroupService; -import org.dromara.neutrinoproxy.server.service.PortMappingService; -import org.dromara.neutrinoproxy.server.service.PortPoolService; -import org.dromara.neutrinoproxy.server.service.ReportService; -import org.dromara.neutrinoproxy.server.service.UserLoginRecordService; -import org.dromara.neutrinoproxy.server.service.UserService; +import org.dromara.neutrinoproxy.server.dal.*; +import org.dromara.neutrinoproxy.server.service.*; import org.dromara.solonplugins.job.JobBean; import org.noear.solon.annotation.Component; import org.noear.solon.aot.RuntimeNativeMetadata; @@ -56,6 +36,8 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist metadata.registerLambdaSerialization(ReportService.class); metadata.registerLambdaSerialization(UserLoginRecordService.class); metadata.registerLambdaSerialization(UserService.class); + metadata.registerLambdaSerialization(SecurityGroupService.class); + metadata.registerLambdaSerialization(LicenseMapper.class); metadata.registerLambdaSerialization(ClientConnectRecordMapper.class); @@ -69,6 +51,9 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist metadata.registerLambdaSerialization(UserLoginRecordMapper.class); metadata.registerLambdaSerialization(UserMapper.class); metadata.registerLambdaSerialization(UserTokenMapper.class); + metadata.registerLambdaSerialization(SecurityGroupMapper.class); + metadata.registerLambdaSerialization(SecurityRuleMapper.class); + metadata.registerReflection(HomeDataView.class, MemberCategory.DECLARED_FIELDS); metadata.registerReflection(HomeDataView.Last7dFlow.class, MemberCategory.DECLARED_FIELDS); diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml index 665cfc83..c62aa9d0 100644 --- a/neutrino-proxy-server/src/main/resources/app.yml +++ b/neutrino-proxy-server/src/main/resources/app.yml @@ -5,7 +5,7 @@ server: solon: app: name: neutrino-proxy-server - version: @revision@ + version: 2.0.1 config: add: ./app.yml # 日志级别