From 47ef4d02e56594268ba6022a84f485b12fce3b0e Mon Sep 17 00:00:00 2001
From: yulinling <2712495353@qq.com>
Date: Sat, 21 Jun 2025 00:29:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20-=20=E4=BC=98=E5=8C=96pom=20-=20?=
 =?UTF-8?q?=E5=B0=86Junit4=E6=9B=B4=E6=96=B0=E4=B8=BAJunit5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 235 +++++++++++-------
 src/main/resources/application.properties     |  28 ++-
 .../asia/yulinling/workflow/PasswordTest.java |   2 +-
 .../yulinling/workflow/WorkFlowMainTests.java |   8 +-
 .../workflow/mapper/UserMapperTest.java       |  18 +-
 .../workflow/service/EmailServiceTest.java    |   4 +-
 .../workflow/service/UserServiceTest.java     |  10 +-
 .../yulinling/workflow/utils/JwtUtilTest.java |   2 +-
 .../yulinling/workflow/utils/RedisTest.java   |   2 +-
 9 files changed, 186 insertions(+), 123 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6ed663a..f6a0c10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,164 +1,207 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
+    <!-- 父项目 -->
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.5.0</version>
         <relativePath/>
     </parent>
+
     <groupId>asia.yulinling</groupId>
     <artifactId>workflow</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>workflow</name>
     <description>Demo project for Spring Boot</description>
-    <url/>
-    <licenses>
-        <license/>
-    </licenses>
-    <developers>
-        <developer/>
-    </developers>
-    <scm>
-        <connection/>
-        <developerConnection/>
-        <tag/>
-        <url/>
-    </scm>
+
+    <!-- 项目属性配置 -->
     <properties>
         <java.version>17</java.version>
-        <jjwt.veersion>0.9.1</jjwt.veersion>
+        <jjwt.version>0.11.5</jjwt.version>
+        <jasypt.version>3.0.5</jasypt.version>
+        <mysql.version>8.3.0</mysql.version>
+        <mybatis-plus.version>3.5.12</mybatis-plus.version>
+        <hutool.version>5.8.38</hutool.version>
+        <druid-version>1.2.25</druid-version>
     </properties>
+
+    <!-- 项目依赖 -->
     <dependencies>
+
+        <!-- Spring Boot 核心 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.github.ulisesbocchio</groupId>
-            <artifactId>jasypt-spring-boot-starter</artifactId>
-            <version>3.0.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <version>8.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
+
+        <!-- Spring Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+        <!-- Spring Security -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <!-- 数据库相关 -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>${mysql.version}</version>
+        </dependency>
+
+        <!-- 数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>${druid-version}</version>
+        </dependency>
+
+        <!-- MyBatis Plus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <version>${mybatis-plus.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
+            <version>${mybatis-plus.version}</version>
+        </dependency>
+
+        <!-- Redis -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
+        <!-- 邮件 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+
+        <!-- Thymeleaf 模板 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+
+        <!-- AOP -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <!-- 工具类 -->
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.38</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
+            <version>${hutool.version}</version>
         </dependency>
+
+        <!-- Lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!-- 安全配置相关 -->
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-            <version>3.5.12</version>
+            <groupId>com.github.ulisesbocchio</groupId>
+            <artifactId>jasypt-spring-boot-starter</artifactId>
+            <version>${jasypt.version}</version>
+        </dependency>
+
+        <!-- JWT -->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>${jjwt.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter-test</artifactId>
-            <version>3.5.12</version>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>${jjwt.version}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-jsqlparser</artifactId>
-            <version>3.5.12</version>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>${jjwt.version}</version>
+            <scope>runtime</scope>
         </dependency>
+
+        <!-- 测试相关 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <!-- JWT 工具：jjwt -->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-api</artifactId>
-            <version>0.11.5</version>
-        </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-impl</artifactId>
-            <version>0.11.5</version>
-        </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-jackson</artifactId>
-            <version>0.11.5</version>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter-test</artifactId>
+            <version>${mybatis-plus.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- 开发工具 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Lombok 注解处理支持 -->
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
+
+        <!-- 校验工具 -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <!-- 对象池，使用redis时必须引入 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version>
         </dependency>
+
     </dependencies>
 
+    <!-- 插件配置 -->
     <build>
         <plugins>
+            <!-- 编译插件 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.projectlombok</groupId>
@@ -167,6 +210,8 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+
+            <!-- Spring Boot 打包插件 -->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -179,7 +224,13 @@
                     </excludes>
                 </configuration>
             </plugin>
+
+            <!-- Maven Wrapper 插件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-wrapper-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4d518b6..7674057 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -11,14 +11,26 @@ spring.sql.init.continue-on-error=true
 spring.sql.init.schema-locations=classpath:db/schema.sql
 spring.sql.init.data-locations=classpath:db/data.sql
 # 连接池配置
-spring.datasource.hikari.minimum-idle=5
-spring.datasource.hikari.connection-test-query=SELECT 1
-spring.datasource.hikari.maximum-pool-size=20
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.idle-timeout=30000
-spring.datasource.hikari.pool-name=MyAppHikariCP
-spring.datasource.hikari.max-lifetime=300000
-spring.datasource.hikari.connection-timeout=30000
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.druid.pool.initial-size=5
+spring.datasource.druid.pool.min-idle=5
+spring.datasource.druid.pool.max-active=20
+spring.datasource.druid.pool.max-wait-millis=30000
+spring.datasource.druid.pool.test-while-idle=true
+spring.datasource.druid.pool.test-on-borrow=false
+spring.datasource.druid.pool.test-on-return=false
+spring.datasource.druid.pool.validation-query=SELECT 1
+spring.datasource.druid.pool.time-between-eviction-runs-millis=60000
+spring.datasource.druid.pool.min-evictable-idle-time-millis=300000
+#spring.datasource.hikari.minimum-idle=5
+#spring.datasource.hikari.connection-test-query=SELECT 1
+#spring.datasource.hikari.maximum-pool-size=20
+#spring.datasource.hikari.auto-commit=true
+#spring.datasource.hikari.idle-timeout=30000
+#spring.datasource.hikari.pool-name=MyAppHikariCP
+#spring.datasource.hikari.max-lifetime=300000
+#spring.datasource.hikari.connection-timeout=30000
+#spring.datasource.
 # Redis配置
 spring.data.redis.host=122.152.201.90
 spring.data.redis.port=6379
diff --git a/src/test/java/asia/yulinling/workflow/PasswordTest.java b/src/test/java/asia/yulinling/workflow/PasswordTest.java
index 93e4c23..a6475e6 100644
--- a/src/test/java/asia/yulinling/workflow/PasswordTest.java
+++ b/src/test/java/asia/yulinling/workflow/PasswordTest.java
@@ -1,7 +1,7 @@
 package asia.yulinling.workflow;
 
 import org.jasypt.encryption.StringEncryptor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
diff --git a/src/test/java/asia/yulinling/workflow/WorkFlowMainTests.java b/src/test/java/asia/yulinling/workflow/WorkFlowMainTests.java
index b503a75..b4bf3a2 100644
--- a/src/test/java/asia/yulinling/workflow/WorkFlowMainTests.java
+++ b/src/test/java/asia/yulinling/workflow/WorkFlowMainTests.java
@@ -1,12 +1,12 @@
 package asia.yulinling.workflow;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 public class WorkFlowMainTests {
 
diff --git a/src/test/java/asia/yulinling/workflow/mapper/UserMapperTest.java b/src/test/java/asia/yulinling/workflow/mapper/UserMapperTest.java
index 3af8861..263403d 100644
--- a/src/test/java/asia/yulinling/workflow/mapper/UserMapperTest.java
+++ b/src/test/java/asia/yulinling/workflow/mapper/UserMapperTest.java
@@ -7,13 +7,13 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.test.autoconfigure.MybatisPlusTest;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -29,7 +29,7 @@ import static org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTest
  * @since 2025/6/4
  */
 @MybatisPlusTest
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @AutoConfigureTestDatabase(replace = NONE)
 @Slf4j
 public class UserMapperTest {
@@ -39,7 +39,7 @@ public class UserMapperTest {
     @Test
     public void selectAllUser2() {
         List<User> users = userMapper.selectList(null);
-        Assert.assertTrue(CollUtil.isNotEmpty(users));
+        Assertions.assertTrue(CollUtil.isNotEmpty(users));
         log.info("users={}", users);
     }
 
@@ -47,7 +47,7 @@ public class UserMapperTest {
     public void selectUserById() {
 //        User user = userMapper.selectUserById(1L);
         User user = userMapper.selectById(1);
-        Assert.assertNotNull(user);
+        Assertions.assertNotNull(user);
         log.info("user={}", user);
     }
 
@@ -69,7 +69,7 @@ public class UserMapperTest {
 
 //        int i = userMapper.saveUser(user);
         int i = userMapper.insert(user);
-        Assert.assertEquals(1, i);
+        Assertions.assertEquals(1, i);
     }
 
     @Test
@@ -78,6 +78,6 @@ public class UserMapperTest {
     public void deleteById() {
 //        int i = userMapper.deleteById(1L);
         int i = userMapper.deleteById(1);
-        Assert.assertEquals(1, i);
+        Assertions.assertEquals(1, i);
     }
 }
diff --git a/src/test/java/asia/yulinling/workflow/service/EmailServiceTest.java b/src/test/java/asia/yulinling/workflow/service/EmailServiceTest.java
index 7c9c1f7..ad9149f 100644
--- a/src/test/java/asia/yulinling/workflow/service/EmailServiceTest.java
+++ b/src/test/java/asia/yulinling/workflow/service/EmailServiceTest.java
@@ -3,11 +3,11 @@ package asia.yulinling.workflow.service;
 import asia.yulinling.workflow.WorkFlowMainTests;
 import cn.hutool.core.io.resource.ResourceUtil;
 import jakarta.mail.MessagingException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.thymeleaf.context.Context;
 import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.context.Context;
 import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
 
 import java.net.URL;
diff --git a/src/test/java/asia/yulinling/workflow/service/UserServiceTest.java b/src/test/java/asia/yulinling/workflow/service/UserServiceTest.java
index ac88ad5..5df81f9 100644
--- a/src/test/java/asia/yulinling/workflow/service/UserServiceTest.java
+++ b/src/test/java/asia/yulinling/workflow/service/UserServiceTest.java
@@ -2,11 +2,11 @@ package asia.yulinling.workflow.service;
 
 import asia.yulinling.workflow.WorkFlowMainTests;
 import asia.yulinling.workflow.dto.request.PageParam;
-import asia.yulinling.workflow.model.ApiResponse;
 import asia.yulinling.workflow.dto.response.PageResult;
+import asia.yulinling.workflow.model.ApiResponse;
 import asia.yulinling.workflow.model.vo.user.UserVO;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -24,7 +24,7 @@ public class UserServiceTest extends WorkFlowMainTests {
     @Test
     public void getUserList() {
         ApiResponse<PageResult<UserVO>> users = userService.getUserList();
-        Assert.assertEquals(200, users.getCode().intValue());
+        Assertions.assertEquals(200, users.getCode().intValue());
     }
 
     @Test
@@ -32,6 +32,6 @@ public class UserServiceTest extends WorkFlowMainTests {
         PageParam pageParam = new PageParam();
         ApiResponse<PageResult<UserVO>> users = userService.getUserListByPage(pageParam);
 
-        Assert.assertEquals(200, users.getCode().intValue());
+        Assertions.assertEquals(200, users.getCode().intValue());
     }
 }
diff --git a/src/test/java/asia/yulinling/workflow/utils/JwtUtilTest.java b/src/test/java/asia/yulinling/workflow/utils/JwtUtilTest.java
index f4ac805..f94e5f5 100644
--- a/src/test/java/asia/yulinling/workflow/utils/JwtUtilTest.java
+++ b/src/test/java/asia/yulinling/workflow/utils/JwtUtilTest.java
@@ -1,8 +1,8 @@
 package asia.yulinling.workflow.utils;
 
 import io.jsonwebtoken.Claims;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
diff --git a/src/test/java/asia/yulinling/workflow/utils/RedisTest.java b/src/test/java/asia/yulinling/workflow/utils/RedisTest.java
index 9a33865..e4e061c 100644
--- a/src/test/java/asia/yulinling/workflow/utils/RedisTest.java
+++ b/src/test/java/asia/yulinling/workflow/utils/RedisTest.java
@@ -3,7 +3,7 @@ package asia.yulinling.workflow.utils;
 import asia.yulinling.workflow.WorkFlowMainTests;
 import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;