修改pom.xml
Change-Id: I618a580ce86b6a09aa11c726483af11849310752
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 2c23bf9..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/echo-backend.iml" filepath="$PROJECT_DIR$/echo-backend.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d12ee37..66660f7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,14 +5,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="f008fe30-0711-42e2-bb33-17dcfdbad387" name="Changes" comment="pom">
- <change afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/controller/TorrentLikesController.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/entity/TorrentLikes.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/repository/TorrentLikesRepository.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/TorrentLikesService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/echo-backend.iml" beforeDir="false" afterPath="$PROJECT_DIR$/echo-backend.iml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/echo-backend.iml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -49,36 +45,36 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent">{
- "keyToString": {
- "JUnit.UserControllerTest.executor": "Run",
- "JUnit.UserControllerTest.testUpdateUserAvatar.executor": "Run",
- "JUnit.UserControllerTest.testUploadUserAvatar.executor": "Run",
- "RequestMappingsPanelOrder0": "0",
- "RequestMappingsPanelOrder1": "1",
- "RequestMappingsPanelWidth0": "75",
- "RequestMappingsPanelWidth1": "75",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "RunOnceActivity.git.unshallow": "true",
- "Spring Boot.MyProjectApplication.executor": "Run",
- "git-widget-placeholder": "my-branch",
- "kotlin-language-version-configured": "true",
- "last_opened_file_path": "D:/PT/echo-backend/src/main/java/com/example/myproject/config",
- "node.js.detected.package.eslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
- "vue.rearranger.settings.migration": "true",
- "应用程序.MyProjectApplication.executor": "Run"
+ <component name="PropertiesComponent"><![CDATA[{
+ "keyToString": {
+ "JUnit.UserControllerTest.executor": "Run",
+ "JUnit.UserControllerTest.testUpdateUserAvatar.executor": "Run",
+ "JUnit.UserControllerTest.testUploadUserAvatar.executor": "Run",
+ "RequestMappingsPanelOrder0": "0",
+ "RequestMappingsPanelOrder1": "1",
+ "RequestMappingsPanelWidth0": "75",
+ "RequestMappingsPanelWidth1": "75",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "Spring Boot.MyProjectApplication.executor": "Run",
+ "git-widget-placeholder": "my-branch",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "D:/study/学习资源/大三下/school/pt2/echo-backend",
+ "node.js.detected.package.eslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
+ "vue.rearranger.settings.migration": "true",
+ "应用程序.MyProjectApplication.executor": "Run"
},
- "keyToStringList": {
- "DatabaseDriversLRU": [
- "mysql_aurora"
+ "keyToStringList": {
+ "DatabaseDriversLRU": [
+ "mysql_aurora"
]
}
-}</component>
+}]]></component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\PT\echo-backend\src\main\java\com\example\myproject\config" />
@@ -89,7 +85,7 @@
<recent name="D:\study\学习资源\大三下\school\echo-backend\src\main\resources\mapper" />
</key>
</component>
- <component name="RunManager" selected="Spring Boot.MyProjectApplication">
+ <component name="RunManager" selected="JUnit.TorrentControllerTest">
<configuration name="MyProjectApplication" type="Application" factoryName="Application" temporary="true">
<option name="MAIN_CLASS_NAME" value="com.example.myproject.MyProjectApplication" />
<module name="echo-backend" />
diff --git a/echo-backend.iml b/echo-backend.iml
deleted file mode 100644
index 4c33cf8..0000000
--- a/echo-backend.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
- <component name="AdditionalModuleElements">
- <content url="file://$MODULE_DIR$" dumb="true">
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- </content>
- </component>
- <component name="FacetManager">
- <facet type="jpa" name="JPA">
- <configuration>
- <setting name="validation-enabled" value="true" />
- <datasource-mapping />
- <naming-strategy-map />
- </configuration>
- </facet>
- </component>
-</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 92ca907..122744c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,90 +184,49 @@
<artifactId>mysql-connector-java</artifactId>
<version>8.0.27</version> <!-- 使用适合你的版本 -->
</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.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>groupId</groupId>
+ <artifactId>echo-backend-ttorrent-bencoding</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/libs/ttorrent-bencoding-1.3.0-SNAPSHOT.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>echo-backend-ttorrent-cli</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/libs/ttorrent-cli-1.3.0-SNAPSHOT.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>echo-backend-ttorrent-common</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/libs/ttorrent-common-1.3.0-SNAPSHOT.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>echo-backend-ttorrent-network</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/libs/ttorrent-network-1.0.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>echo-backend-ttorrent-client</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/libs/ttorrent-client-1.3.0-SNAPSHOT.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>echo-backend-ttorrent-tracker</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/libs/ttorrent-tracker-1.3.0-SNAPSHOT.jar</systemPath>
+ </dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
@@ -287,6 +246,12 @@
<artifactId>simple</artifactId>
<version>4.1.21</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope> <!-- 若在Servlet容器中运行，使用provided -->
+ </dependency>
@@ -366,20 +331,22 @@
</plugin>
</plugins>
- <!-- <resources>-->
- <!-- <resource>-->
- <!-- <directory>src/main/java</directory>-->
- <!-- <includes>-->
- <!-- <include>**/*.xml</include>-->
- <!-- </includes>-->
- <!-- </resource>-->
- <!-- <resource>-->
- <!-- <directory>libs</directory>-->
- <!-- <includes>-->
- <!-- <include>*.jar</include>-->
- <!-- </includes>-->
- <!-- </resource>-->
- <!-- </resources>-->
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ <include>**/*.yml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>libs</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </resource>
+ </resources>
</build>