From 97714e02c5ffef5048c4c9a3e702b8bdd67294f9 Mon Sep 17 00:00:00 2001
From: songyinyin <song_yinyin@163.com>
Date: Tue, 31 Oct 2023 12:02:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BA=94=E7=94=A8=E4=B8=AD?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E7=9A=84=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-client/pom.xml                 |  7 +++++++
 .../core/util/NeutrinoProxyVersion.java       | 19 +++++++++++++++++++
 neutrino-proxy-server/pom.xml                 |  7 +++++++
 .../src/main/resources/app.yml                |  3 +--
 .../neutrinoproxy/server/VersionTest.java     | 19 +++++++++++++++++++
 .../neutrinoproxy/server/app/AppBaseTest.java | 15 +++++++++++++++
 pom.xml                                       |  8 ++++----
 7 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/NeutrinoProxyVersion.java
 create mode 100644 neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/VersionTest.java
 create mode 100644 neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/app/AppBaseTest.java

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 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>*.yml</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
                 <filtering>false</filtering>
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 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>*.yml</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
                 <filtering>false</filtering>
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 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.5.12-M1</version>
+        <version>2.5.12-M3</version>
         <relativePath />
     </parent>
 
@@ -26,7 +26,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <revision>1.1-SNAPSHOT</revision>
+        <revision>2.0.1-SNAPSHOT</revision>
 
         <native.version>0.9.28</native.version>
 
@@ -122,8 +122,8 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-test</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>