解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index f147ecc..4944c97 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -10,11 +10,9 @@
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId>
-
<description>
web服务入口
</description>
-
<dependencies>
<!-- spring-boot-devtools -->
@@ -35,13 +33,60 @@
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.frostwire</groupId>
+ <artifactId>jlibtorrent</artifactId>
+ <version>1.2.0.9-RC5</version>
+ </dependency>
- <!--mybatis-plus的springboot支持-->
-<!-- <dependency>-->
-<!-- <groupId> 导入冲突 com.baomidou</groupId>-->
-<!-- <artifactId>mybatis-plus-boot-starter</artifactId>-->
-<!-- <version>3.5.10.1</version>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>com.turn</groupId>
+ <artifactId>ttorrent-core</artifactId>
+ <version>1.5</version>
+ </dependency>
+
+ <!-- WebFlux 用于处理 tracker 接口 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-webflux</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.dampcake</groupId>
+ <artifactId>bencode</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <!-- Apache Commons Codec -->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.15</version>
+ </dependency>
+ <!-- Jackson for JSON handling -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.13.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>2.13.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>com.turn.ttorrent</groupId>
@@ -81,6 +126,144 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.11.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+ <version>4.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.flywaydb</groupId>
+ <artifactId>flyway-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.flywaydb</groupId>
+ <artifactId>flyway-mysql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+ <version>3.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
+ <version>1.4.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>${fastjson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.8.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.dampcake</groupId>
+ <artifactId>bencode</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+
+ <!-- https://mvnrepository.com/artifact/com.github.axet/kaptcha -->
+ <dependency>
+ <groupId>com.github.axet</groupId>
+ <artifactId>kaptcha</artifactId>
+ <version>0.0.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.houbb</groupId>
+ <artifactId>sensitive-word</artifactId>
+ <version>0.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.data</groupId>
+ <artifactId>spring-data-redis</artifactId>
+ </dependency>
+
+ <!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-boot3-starter</artifactId>
+ <version>1.38.0</version>
+ </dependency>
+ <!-- Sa-Token 整合 SpringAOP 实现注解鉴权 -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-aop</artifactId>
+ <version>1.38.0</version>
+ </dependency>
+
+ <!-- Sa-Token 整合 jwt -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-jwt</artifactId>
+ <version>1.38.0</version>
+ </dependency>
+ <!-- Sa-Token 整合 Redis （使用 jackson 序列化方式） -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-redis-jackson</artifactId>
+ <version>1.38.0</version>
+ </dependency>
+ <!-- 提供Redis连接池 -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.warrenstrange</groupId>
+ <artifactId>googleauth</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.seancfoley</groupId>
+ <artifactId>ipaddress</artifactId>
+ <version>5.5.0</version>
+ </dependency>
<!-- 测试依赖 -->
<dependency>
@@ -88,22 +271,16 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>5.5.0</version> <!-- 改为父项目的版本 -->
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
+ <version>5.5.0</version> <!-- 改为父项目的版本 -->
<scope>test</scope>
</dependency>
@@ -127,10 +304,10 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.5.15</version>
- <configuration>
- <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
- </configuration>
+ <version>3.3.0</version> <!-- 改为父项目的版本 -->
+<!-- <configuration>-->
+<!-- <fork>true</fork>-->
+<!-- </configuration>-->
<executions>
<execution>
<goals>