From d017e2bb64e91d4041351ffc09f6cb2eb891471f Mon Sep 17 00:00:00 2001
From: likanug <likanug.g@qq.com>
Date: Wed, 4 Jun 2025 19:08:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0AgileBootConfigTest?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/agileboot/admin/config/AgileBootConfigTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/agileboot-admin/src/test/java/com/agileboot/admin/config/AgileBootConfigTest.java b/agileboot-admin/src/test/java/com/agileboot/admin/config/AgileBootConfigTest.java
index 52dd503..f739664 100644
--- a/agileboot-admin/src/test/java/com/agileboot/admin/config/AgileBootConfigTest.java
+++ b/agileboot-admin/src/test/java/com/agileboot/admin/config/AgileBootConfigTest.java
@@ -24,9 +24,9 @@ public class AgileBootConfigTest {
         String fileBaseDir = "D:\\agileboot\\profile";
 
         Assertions.assertEquals("AgileBoot", config.getName());
-        Assertions.assertEquals("1.0.0", config.getVersion());
+        Assertions.assertEquals("1.8.0", config.getVersion());
         Assertions.assertEquals("2022", config.getCopyrightYear());
-        Assertions.assertTrue(config.isDemoEnabled());
+        Assertions.assertFalse(config.isDemoEnabled());
         Assertions.assertEquals(fileBaseDir, AgileBootConfig.getFileBaseDir());
         Assertions.assertFalse(AgileBootConfig.isAddressEnabled());
         Assertions.assertEquals("math", AgileBootConfig.getCaptchaType());

From 2fa20aaaf348a65230dabb37ac9bb09ce4499b96 Mon Sep 17 00:00:00 2001
From: likanug <likanug.g@qq.com>
Date: Wed, 4 Jun 2025 20:09:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0junit=E7=9A=84=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BE=9D=E8=B5=96=E5=8F=8A=E7=89=88=E6=9C=AC=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dadmin=E6=A8=A1=E5=9D=97=E4=B8=ADmaven=20test?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=B7=91=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agileboot-admin/pom.xml  |  9 +++++++++
 agileboot-common/pom.xml |  5 -----
 pom.xml                  | 33 ++++++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/agileboot-admin/pom.xml b/agileboot-admin/pom.xml
index dfe4c01..d53826a 100644
--- a/agileboot-admin/pom.xml
+++ b/agileboot-admin/pom.xml
@@ -55,6 +55,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven.surefire.plugin.version}</version>
+                <!-- 想跑test的话  设置成false  -->
+                <configuration>
+                    <skipTests>false</skipTests>
+                </configuration>
+            </plugin>
 
         </plugins>
     </build>
diff --git a/agileboot-common/pom.xml b/agileboot-common/pom.xml
index b831f74..0f18a23 100644
--- a/agileboot-common/pom.xml
+++ b/agileboot-common/pom.xml
@@ -141,11 +141,6 @@
             <artifactId>ip2region</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>it.ozimov</groupId>
             <artifactId>embedded-redis</artifactId>
diff --git a/pom.xml b/pom.xml
index b832226..01074f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,6 @@
         <lombok.version>1.18.30</lombok.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <mybatis-plus-generator.version>3.5.1</mybatis-plus-generator.version>
-        <mockito.version>1.10.19</mockito.version>
         <it.ozimov.version>0.7.3</it.ozimov.version>
         <io.swagger.version>1.6.8</io.swagger.version>
         <org.lionsoul.version>2.6.5</org.lionsoul.version>
@@ -45,8 +44,13 @@
         <mysql-connector-java>8.0.31</mysql-connector-java>
         <spring.boot.version>2.7.10</spring.boot.version>
         <maven.compiler.plugin.version>3.1</maven.compiler.plugin.version>
-        <maven.surefire.plugin.version>2.5</maven.surefire.plugin.version>
+        <!-- 升级版本以支持junit5 -->
+        <maven.surefire.plugin.version>3.0.0-M7</maven.surefire.plugin.version>
         <maven.war.plugin.version>3.1.0</maven.war.plugin.version>
+        <!-- JUnit Jupiter 版本 -->
+        <junit.jupiter.version>5.9.2</junit.jupiter.version>
+        <!-- Mockito 版本（或直接用 mockito-inline）-->
+        <mockito.version>4.11.0</mockito.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -217,13 +221,36 @@
                 <scope>provided</scope>
             </dependency>
 
+            <!-- JUnit 5 -->
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <!-- Mockito -->
             <dependency>
                 <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
+                <artifactId>mockito-core</artifactId>
                 <version>${mockito.version}</version>
                 <scope>test</scope>
             </dependency>
 
+            <!-- 如果有需要 mock final/静态 -->
+            <dependency>
+              <groupId>org.mockito</groupId>
+              <artifactId>mockito-inline</artifactId>
+              <version>${mockito.version}</version>
+              <scope>test</scope>
+            </dependency>
+
             <!-- 获取系统信息 -->
             <dependency>
                 <groupId>it.ozimov</groupId>