Revert "注册登录，用户等级，社交，动态，新手任务"
This reverts commit 1c359108ca33d46271920ee0cd57dddcb7012937.
Reason for revert: <冲突>
Change-Id: Ie586267169acac99130b1fadf4a5f433441c4b8c
diff --git a/pom.xml b/pom.xml
index f9987ac..20b8e71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?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"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
@@ -10,14 +10,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.6.0</version>
- <relativePath/> <!-- lookup parent from repository -->
+ <version>2.6.0</version> <!-- 使用你希望的Spring Boot版本 -->
+ <relativePath /> <!-- lookup parent from repository -->
</parent>
-
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>
@@ -78,6 +78,16 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+ <version>4.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>2.0.1.Final</version>
+ </dependency>
<!-- Spring Web MVC -->
<dependency>
<groupId>org.springframework</groupId>
@@ -108,11 +118,17 @@
<version>1.18.30</version> <!-- 确保使用的是最新版本 -->
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
+ <version>1.4.7</version>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.30</version> <!-- 版本可以根据需要调整 -->
+ <version>1.7.32</version> <!-- 版本可以根据需要调整 -->
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -120,7 +136,6 @@
<version>1.2.3</version> <!-- 版本可以根据需要调整 -->
</dependency>
<dependency>
-
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.4</version>
@@ -130,11 +145,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
- <dependency>
- <groupId>com.baidubce</groupId>
- <artifactId>qianfan</artifactId>
- <version>0.1.1</version>
- </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
@@ -145,16 +156,68 @@
<version>4.12</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.turn</groupId>
+ <artifactId>ttorrent-common</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- ttorrent -->
+ <dependency>
+ <groupId>com.turn</groupId>
+ <artifactId>ttorrent-client</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.turn</groupId>
+ <artifactId>ttorrent-cli</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.turn</groupId>
+ <artifactId>ttorrent-network</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.turn</groupId>
+ <artifactId>ttorrent-test-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.turn</groupId>
+ <artifactId>ttorrent-bencoding</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.turn</groupId>
+ <artifactId>ttorrent-tests</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.turn</groupId>
+ <artifactId>ttorrent-tracker</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+ <version>4.5.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-boot-starter</artifactId>
+ <version>${sa-token.version}</version>
+ </dependency>
+
+
+
<dependency>
<groupId>jakarta.persistence</groupId>
@@ -162,29 +225,6 @@
<version>3.1.0</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jakarta.transaction</groupId>
- <artifactId>jakarta.transaction-api</artifactId>
- <version>2.0.0</version> <!-- 使用最新版本 -->
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>5.6.7.Final</version> <!-- 与 Jakarta 兼容的版本 -->
- </dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>8.0.27</version> <!-- 使用适合你的版本 -->
- </dependency>
-
</dependencies>
@@ -232,7 +272,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<configuration>
- <!--suppress UnresolvedMavenProperty -->
+ <!--suppress
+ UnresolvedMavenProperty -->
<argLine>${surefireArgLine}</argLine>
<skipTests>false</skipTests>
<includes>
@@ -251,14 +292,22 @@
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
+<!-- <resources>-->
+<!-- <resource>-->
+<!-- <directory>src/main/java</directory>-->
+<!-- <includes>-->
+<!-- <include>**/*.xml</include>-->
+<!-- </includes>-->
+<!-- </resource>-->
+<!-- <resource>-->
+<!-- <directory>libs</directory>-->
+<!-- <includes>-->
+<!-- <include>*.jar</include>-->
+<!-- </includes>-->
+<!-- </resource>-->
+<!-- </resources>-->
+
+
</build>
</project>
\ No newline at end of file