Revert "注册登录,用户等级,社交,动态,新手任务"

This reverts commit 1c359108ca33d46271920ee0cd57dddcb7012937.

Reason for revert: <冲突>

Change-Id: Ie586267169acac99130b1fadf4a5f433441c4b8c
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index f63801c..8994d0a 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,29 +1,58 @@
-com\example\myproject\repository\CommentRepository.class
-com\example\myproject\entity\GroupPost.class
-com\example\myproject\repository\PostRepository.class
-com\example\myproject\repository\GroupMembersRepository.class
-com\example\myproject\utils\Result.class
-com\example\myproject\service\PostService.class
-com\example\myproject\entity\Group.class
-com\example\myproject\entity\Collections.class
-com\example\myproject\config\GlobalCorsConfig.class
-com\example\myproject\service\CommentService.class
-com\example\myproject\MyProjectApplication.class
-com\example\myproject\entity\Post.class
-com\example\myproject\entity\GroupMembers.class
-com\example\myproject\entity\Users.class
-com\example\myproject\config\GlobalCorsConfig$1.class
-com\example\myproject\controller\CommentController.class
-com\example\myproject\entity\GroupComments.class
-com\example\myproject\service\GroupService.class
-com\example\myproject\controller\GroupController.class
-com\example\myproject\repository\UserRepository.class
-com\example\myproject\controller\PostController.class
-com\example\myproject\entity\Comments.class
-com\example\myproject\repository\GroupPostRepository.class
-com\example\myproject\repository\LikesRepository.class
+com\example\myproject\common\Constants$FinishStatus.class
+com\example\myproject\config\MyMetaObjectHandler.class
+com\example\myproject\service\serviceImpl\UserServiceImpl.class
+com\example\myproject\controller\UserController.class
+com\example\myproject\dto\vo\TorrentVO.class
+com\example\myproject\dto\PromotionCreateDTO.class
+com\example\myproject\controller\TorrentController.class
+com\example\myproject\service\UserService.class
+com\example\myproject\common\Constants$Order.class
+com\example\myproject\entity\UserDetails.class
+com\example\myproject\common\base\Result.class
+com\example\myproject\entity\Promotion.class
+com\example\myproject\common\base\ResPage.class
+com\example\myproject\mapper\TorrentMapper.class
 com\example\myproject\config\SecurityConfig.class
-com\example\myproject\entity\Likes.class
-com\example\myproject\repository\GroupCommentsRepository.class
-com\example\myproject\repository\GroupRepository.class
-com\example\myproject\repository\CollectionsRepository.class
+com\example\myproject\service\InvitationService.class
+com\example\myproject\service\serviceImpl\TorrentServiceImpl.class
+com\example\myproject\mapper\VerificationTokenMapper.class
+com\example\myproject\entity\TorrentEntity.class
+com\example\myproject\entity\EntityBase.class
+com\example\myproject\dto\param\TorrentParam.class
+com\example\myproject\service\serviceImpl\UserDetailsServiceImpl.class
+com\example\myproject\service\UserDetailsService.class
+com\example\myproject\service\TorrentService.class
+com\example\myproject\common\base\I18nMessage.class
+com\example\myproject\common\Constants.class
+com\example\myproject\entity\VerificationToken.class
+com\example\myproject\mapper\InvitationMapper.class
+com\example\myproject\common\base\OrderPageParam.class
+com\example\myproject\service\serviceImpl\InvitationServiceImpl.class
+com\example\myproject\config\GlobalCorsConfig.class
+com\example\myproject\mapper\UserMapper.class
+com\example\myproject\MyProjectApplication.class
+com\example\myproject\config\TrackerConfig.class
+com\example\myproject\mapper\FavoriteMapper.class
+com\example\myproject\common\Constants$Source.class
+com\example\myproject\common\ResultStatus.class
+com\example\myproject\dto\TorrentUpdateDTO.class
+com\example\myproject\common\base\PageUtil.class
+com\example\myproject\config\GlobalCorsConfig$1.class
+com\example\myproject\common\Constants$Announce.class
+com\example\myproject\common\CommonResultStatus.class
+com\example\myproject\controller\UserController$VerificationRequest.class
+com\example\myproject\service\serviceImpl\EmailServiceImpl.class
+com\example\myproject\controller\UserController$EmailRequest.class
+com\example\myproject\service\serviceImpl\PromotionServiceImpl.class
+com\example\myproject\common\base\Status.class
+com\example\myproject\common\base\PageParam.class
+com\example\myproject\mapper\PromotionMapper.class
+com\example\myproject\common\exception\RocketPTException.class
+com\example\myproject\entity\User.class
+com\example\myproject\utils\VerifyCode.class
+com\example\myproject\dto\param\InviteParam.class
+com\example\myproject\dto\param\TorrentUploadParam.class
+com\example\myproject\entity\InvitationEntity.class
+com\example\myproject\service\EmailService.class
+com\example\myproject\service\PromotionService.class
+com\example\myproject\entity\FavoriteEntity.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 3444337..15f2807 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,40 +1,52 @@
-D:\PT\echo-backend\src\main\java\com\example\myproject\controller\CommentController.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\service\CommentService.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\repository\LikesRepository.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\service\serviceImpl\EmailServiceImpl.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\repository\GroupMembersRepository.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\Comments.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\MyProjectApplication.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\config\GlobalCorsConfig.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\User.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\service\serviceImpl\UserServiceImpl.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\config\SecurityConfig.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\mapper\VerificationTokenMapper.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\Group.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\Collections.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\controller\PostController.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\Post.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\utils\Result.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\GroupMembers.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\GroupPost.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\repository\CommentRepository.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\service\PostService.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\mapper\UserMapper.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\repository\GroupCommentsRepository.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\controller\GroupController.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\Users.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\utils\VerifyCode.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\UserDetails.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\repository\GroupRepository.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\repository\PostRepository.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\service\serviceImpl\UserDetailsServiceImpl.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\service\UserDetailsService.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\Likes.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\repository\UserRepository.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\service\GroupService.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\GroupComments.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\entity\VerificationToken.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\repository\GroupPostRepository.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\repository\CollectionsRepository.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\service\EmailService.java
-D:\PT\echo-backend\src\main\java\com\example\myproject\service\UserService.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\serviceImpl\InvitationServiceImpl.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\CommonResultStatus.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\config\SecurityConfig.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\dto\TorrentUpdateDTO.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\mapper\UserMapper.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\base\PageParam.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\entity\EntityBase.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\UserDetailsService.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\exception\RocketPTException.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\mapper\FavoriteMapper.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\dto\param\TorrentParam.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\mapper\PromotionMapper.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\entity\FavoriteEntity.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\entity\TorrentEntity.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\mapper\VerificationTokenMapper.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\controller\UserController.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\dto\param\InviteParam.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\base\I18nMessage.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\dto\param\TorrentUploadParam.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\base\OrderPageParam.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\entity\Promotion.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\entity\InvitationEntity.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\InvitationService.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\serviceImpl\TorrentServiceImpl.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\ResultStatus.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\serviceImpl\EmailServiceImpl.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\Constants.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\config\TrackerConfig.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\base\ResPage.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\PromotionService.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\serviceImpl\UserServiceImpl.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\serviceImpl\UserDetailsServiceImpl.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\EmailService.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\base\Status.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\utils\VerifyCode.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\MyProjectApplication.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\mapper\TorrentMapper.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\entity\UserDetails.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\UserService.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\entity\User.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\base\PageUtil.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\common\base\Result.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\dto\vo\TorrentVO.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\mapper\InvitationMapper.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\TorrentService.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\config\MyMetaObjectHandler.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\entity\VerificationToken.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\service\serviceImpl\PromotionServiceImpl.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\controller\InviteController.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\config\GlobalCorsConfig.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\dto\PromotionCreateDTO.java
+D:\study\学习资源\大三下\echo-backend\src\main\java\com\example\myproject\controller\TorrentController.java
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
index 1e7d8dd..bac235b 100644
--- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@@ -1,2 +1,2 @@
-com\example\myproject\controller\CommentControllerTest.class
-com\example\myproject\controller\PostControllerTest.class
+com\example\myproject\controller\UserControllerTest$1.class
+com\example\myproject\controller\UserControllerTest.class
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
index ec652b0..188dce8 100644
--- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -1,4 +1,2 @@
-D:\PT\echo-backend\src\test\java\com\example\myproject\controller\UserControllerTest.java
-D:\PT\echo-backend\src\test\java\com\example\myproject\controller\GroupControllerTest.java
-D:\PT\echo-backend\src\test\java\com\example\myproject\controller\CommentControllerTest.java
-D:\PT\echo-backend\src\test\java\com\example\myproject\controller\PostControllerTest.java
+D:\study\学习资源\大三下\echo-backend\src\test\java\com\example\myproject\controller\UserControllerTest.java
+D:\study\学习资源\大三下\echo-backend\src\test\java\com\example\myproject\controller\TorrentControllerTest.java