Revert "用户"
This reverts commit f6824511ca617c9421633c44830c938b862e75df.
Reason for revert: <撤销>
Change-Id: Ie4ee5bc5d3fa26981f61c52408ecf2d0a8e45243
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5c215cb..ae3ef3f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,44 +5,38 @@
</component>
<component name="ChangeListManager">
<list default="true" id="f008fe30-0711-42e2-bb33-17dcfdbad387" name="Changes" comment="">
- <change afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/entity/UserInviteCode.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/repository/UserInviteCodeRepository.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/dbnavigator.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dbnavigator.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/create.sql" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/MyProjectApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/MyProjectApplication.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/common/base/Result.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/common/base/Result.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/config/MyMetaObjectHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/config/MyMetaObjectHandler.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/controller/InviteController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/controller/UserController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/entity/Users.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/entity/Users.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/repository/UserRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/repository/UserRepository.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/dto/param/InviteParam.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/dto/param/TorrentUploadParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/dto/param/TorrentUploadParam.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/entity/EntityBase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/entity/EntityBase.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/entity/InvitationEntity.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/entity/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/entity/User.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/mapper/InvitationMapper.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/mapper/UserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/mapper/UserMapper.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/InvitationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/InvitationService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/UserService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/serviceImpl/UserDetailsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/serviceImpl/UserDetailsServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/serviceImpl/UserServiceImpl.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/serviceImpl/InvitationServiceImpl.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/serviceImpl/TorrentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/serviceImpl/TorrentServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/PromotionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/PromotionMapper.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/test/java/com/example/myproject/controller/TorrentControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/example/myproject/controller/TorrentControllerTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/com/example/myproject/controller/UserControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/example/myproject/controller/UserControllerTest.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/MyProjectApplication.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/MyProjectApplication.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/controller/UserController$EmailRequest.class" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/controller/UserController$VerificationRequest.class" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/controller/UserController$EmailRequest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/controller/UserController$EmailRequest.class" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/controller/UserController$VerificationRequest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/controller/UserController$VerificationRequest.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/controller/UserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/controller/UserController.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/service/UserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/service/UserService.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/service/serviceImpl/UserDetailsServiceImpl.class" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/service/serviceImpl/UserServiceImpl.class" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/files/files.torrent" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/mapper/FavoriteMapper.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/mapper/PromotionMapper.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/mapper/TorrentMapper.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/mapper/UserMapper.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/mapper/VerificationTokenMapper.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/output/valid.torrent" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/echo-backend-1.0-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/echo-backend-1.0-SNAPSHOT.jar" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/echo-backend-1.0-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/echo-backend-1.0-SNAPSHOT.jar.original" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/test-classes/classpath.index" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/test-classes/com/example/myproject/controller/UserControllerTest$1.class" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/test-classes/com/example/myproject/controller/UserControllerTest.class" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/entity/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/entity/User.class" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/mapper/UserMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/mapper/UserMapper.class" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/utils/Result.class" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -58,13 +52,19 @@
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- <option name="ROOT_SYNC" value="SYNC" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
+ <component name="MavenImportPreferences">
+ <option name="importingSettings">
+ <MavenImportingSettings>
+ <option name="workspaceImportEnabled" value="true" />
+ </MavenImportingSettings>
+ </option>
+ </component>
<component name="ProblemsViewState">
- <option name="selectedTabId" value="ProjectErrors" />
+ <option name="selectedTabId" value="CurrentFile" />
</component>
<component name="ProjectId" id="2vZNfNTEFyHApdxmHZ7Y0rlJjKB" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -72,32 +72,19 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "JUnit.UserControllerTest.executor": "Run",
- "RequestMappingsPanelOrder0": "0",
- "RequestMappingsPanelOrder1": "1",
- "RequestMappingsPanelWidth0": "75",
- "RequestMappingsPanelWidth1": "75",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "Spring Boot.MyProjectApplication.executor": "Run",
- "git-widget-placeholder": "master",
- "last_opened_file_path": "D:/PT/echo-backend/src/main/java/com/example/myproject/service",
- "node.js.selected.package.tslint": "(autodetect)",
- "应用程序.MyProjectApplication.executor": "Run"
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "last_opened_file_path": "D:/study/学习资源/大三下/zy1"
}
-}]]></component>
+}</component>
<component name="RecentsManager">
- <key name="CopyFile.RECENT_KEYS">
- <recent name="D:\PT\echo-backend\src\main\java\com\example\myproject\service" />
- <recent name="D:\PT\echo-backend\src\main\java\com\example\myproject\controller" />
- </key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\study\学习资源\大三下\school\echo-backend\src\main\resources\mapper" />
</key>
</component>
- <component name="RunManager" selected="JUnit.UserControllerTest">
+ <component name="RunManager" selected="应用程序.MyProjectApplication">
<configuration name="BtClient" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.example.myproject.client.BtClient" />
<module name="echo-backend" />
@@ -165,31 +152,8 @@
<option name="Make" enabled="true" />
</method>
</configuration>
- <configuration name="UserControllerTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
- <module name="echo-backend" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="com.example.myproject.controller.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <option name="PACKAGE_NAME" value="com.example.myproject.controller" />
- <option name="MAIN_CLASS_NAME" value="com.example.myproject.controller.UserControllerTest" />
- <option name="TEST_OBJECT" value="class" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="MyProjectApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
- <module name="echo-backend" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.example.myproject.MyProjectApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
<recent_temporary>
<list>
- <item itemvalue="JUnit.UserControllerTest" />
<item itemvalue="应用程序.MyProjectApplication" />
<item itemvalue="JUnit.TorrentControllerTest" />
</list>
@@ -206,15 +170,4 @@
</task>
<servers />
</component>
- <component name="Vcs.Log.Tabs.Properties">
- <option name="TAB_STATES">
- <map>
- <entry key="MAIN">
- <value>
- <State />
- </value>
- </entry>
- </map>
- </option>
- </component>
</project>
\ No newline at end of file