diff --git a/neutrino-proxy-client/pom.xml b/neutrino-proxy-client/pom.xml index ecb56fd1..1e5d3a8a 100644 --- a/neutrino-proxy-client/pom.xml +++ b/neutrino-proxy-client/pom.xml @@ -28,6 +28,13 @@ ${project.artifactId} + + src/main/resources + true + + *.yml + + ${project.basedir}/src/main/resources false diff --git a/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/NeutrinoProxyVersion.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/NeutrinoProxyVersion.java new file mode 100644 index 00000000..d76a9034 --- /dev/null +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/NeutrinoProxyVersion.java @@ -0,0 +1,19 @@ +package org.dromara.neutrinoproxy.core.util; + +import org.noear.solon.Solon; + +/** + * @author songyinyin + * @since 2023/10/31 11:48 + */ +public class NeutrinoProxyVersion { + + /** + * 获取 NeutrinoProxy 版本号 + */ + public static String getVersion() { + return Solon.cfg().get("solon.app.version"); + } + + +} diff --git a/neutrino-proxy-server/pom.xml b/neutrino-proxy-server/pom.xml index ae178556..723be08d 100644 --- a/neutrino-proxy-server/pom.xml +++ b/neutrino-proxy-server/pom.xml @@ -61,6 +61,13 @@ ${project.artifactId} + + src/main/resources + true + + *.yml + + ${project.basedir}/src/main/resources false diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml index 91e530a3..665cfc83 100644 --- a/neutrino-proxy-server/src/main/resources/app.yml +++ b/neutrino-proxy-server/src/main/resources/app.yml @@ -5,10 +5,9 @@ server: solon: app: name: neutrino-proxy-server + version: @revision@ config: add: ./app.yml -# aot: -# jvmArguments: --add-opens java.base/java.lang=ALL-UNNAMED # 日志级别 solon.logging.appender: console: diff --git a/neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/VersionTest.java b/neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/VersionTest.java new file mode 100644 index 00000000..918b754e --- /dev/null +++ b/neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/VersionTest.java @@ -0,0 +1,19 @@ +package org.dromara.neutrinoproxy.server; + +import org.dromara.neutrinoproxy.core.util.NeutrinoProxyVersion; +import org.dromara.neutrinoproxy.server.app.AppBaseTest; +import org.junit.Assert; +import org.junit.Test; + +/** + * @author songyinyin + * @since 2023/10/31 11:51 + */ +public class VersionTest extends AppBaseTest { + + @Test + public void testVersion() { + Assert.assertNotNull(NeutrinoProxyVersion.getVersion()); + System.out.println("version: " + NeutrinoProxyVersion.getVersion()); + } +} diff --git a/neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/app/AppBaseTest.java b/neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/app/AppBaseTest.java new file mode 100644 index 00000000..39b53aa0 --- /dev/null +++ b/neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/app/AppBaseTest.java @@ -0,0 +1,15 @@ +package org.dromara.neutrinoproxy.server.app; + +import org.dromara.neutrinoproxy.server.ProxyServer; +import org.junit.runner.RunWith; +import org.noear.solon.test.SolonJUnit4ClassRunner; +import org.noear.solon.test.SolonTest; + +/** + * @author songyinyin + * @since 2023/10/31 11:56 + */ +@SolonTest(value = ProxyServer.class, properties = "server.port=18888") +@RunWith(SolonJUnit4ClassRunner.class) +public class AppBaseTest { +} diff --git a/pom.xml b/pom.xml index 418e134b..0fdde589 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.5.12-M1 + 2.5.12-M3 @@ -26,7 +26,7 @@ UTF-8 UTF-8 UTF-8 - 1.1-SNAPSHOT + 2.0.1-SNAPSHOT 0.9.28 @@ -122,8 +122,8 @@ - junit - junit + org.noear + solon-test test