diff --git a/neutrino-proxy-client/pom.xml b/neutrino-proxy-client/pom.xml index ecb56fd1..7bd9b744 100644 --- a/neutrino-proxy-client/pom.xml +++ b/neutrino-proxy-client/pom.xml @@ -23,6 +23,13 @@ org.noear solon-lib + + + + org.noear + solon.aot + + diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/NeutrinoClientRuntimeNativeRegistrar.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/NeutrinoClientRuntimeNativeRegistrar.java new file mode 100644 index 00000000..c9f84ef8 --- /dev/null +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/NeutrinoClientRuntimeNativeRegistrar.java @@ -0,0 +1,26 @@ +package org.dromara.neutrinoproxy.client.config; + +import org.noear.solon.annotation.Component; +import org.noear.solon.aot.RuntimeNativeMetadata; +import org.noear.solon.aot.RuntimeNativeRegistrar; +import org.noear.solon.aot.hint.MemberCategory; +import org.noear.solon.core.AppContext; + +/** + * @author songyinyin + * @since 2023/10/21 22:50 + */ +@Component +public class NeutrinoClientRuntimeNativeRegistrar implements RuntimeNativeRegistrar { + @Override + public void register(AppContext context, RuntimeNativeMetadata metadata) { + metadata.registerResourceInclude("test.jks"); + + metadata.registerReflection(ProxyConfig.Protocol.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS); + metadata.registerReflection(ProxyConfig.Client.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS); + metadata.registerReflection(ProxyConfig.Tunnel.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS); + metadata.registerReflection(ProxyConfig.Tcp.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS); + metadata.registerReflection(ProxyConfig.Udp.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS); + metadata.registerReflection(ProxyConfig.Reconnection.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS); + } +} diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java index 17b8fd36..bb4d1d6e 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java @@ -130,7 +130,7 @@ public class ProxyConfiguration implements LifecycleBean { } @Bean("udpProxyTunnelBootstrap") - private Bootstrap udpProxyTunnelBootstrap(@Inject ProxyConfig proxyConfig, + public Bootstrap udpProxyTunnelBootstrap(@Inject ProxyConfig proxyConfig, @Inject("tunnelWorkGroup") NioEventLoopGroup tunnelWorkGroup) { Bootstrap bootstrap = new Bootstrap(); bootstrap.group(tunnelWorkGroup); diff --git a/neutrino-proxy-client/src/main/resources/app.yml b/neutrino-proxy-client/src/main/resources/app.yml index 33923186..ceb550bf 100644 --- a/neutrino-proxy-client/src/main/resources/app.yml +++ b/neutrino-proxy-client/src/main/resources/app.yml @@ -3,6 +3,7 @@ solon.logging.appender: console: pattern: "%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(${PID:-}) --- %-15([%15.15thread]) %-56(%cyan(%-40.40logger{39}%L)) : %msg%n" file: + enable: false pattern: "%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level ${PID:-} --- %-15([%15.15thread]) %-56(%-40.40logger{39}%L) : %msg%n" name: "logs/${neutrino.application.name}" rolling: "logs/${neutrino.application.name}_%d{yyyy-MM-dd}_%i.log.gz" diff --git a/neutrino-proxy-client/src/main/resources/logback.xml b/neutrino-proxy-client/src/main/resources/logback.xml deleted file mode 100644 index 76953690..00000000 --- a/neutrino-proxy-client/src/main/resources/logback.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - DEBUG - - - ${LOG_PATTERN} - - - - - - ${LOG_FILE} - - ${LOG_FILE}.%d{yyyy-MM-dd}.zip - 7 - - - ${LOG_PATTERN} - - - - - - - - - - - - diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoRuntimeNativeRegistrar.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java similarity index 98% rename from neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoRuntimeNativeRegistrar.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java index 14ebffc9..c1eb6fe7 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoRuntimeNativeRegistrar.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java @@ -54,9 +54,10 @@ import java.util.Map; * @since 2023/10/20 11:24 */ @Component -public class NeutrinoRuntimeNativeRegistrar implements RuntimeNativeRegistrar { +public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegistrar { @Override public void register(AppContext context, RuntimeNativeMetadata metadata) { + metadata.registerResourceInclude("test.jks"); // 使用 MP lambda 的类,需要注册序列化 metadata.registerLambdaSerialization(ClientConnectRecordService.class);