Timi
22e415dd7b
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# pom.xml
# src/main/java/com/imyeyu/api/annotation/EnableSetting.java
# src/main/java/com/imyeyu/api/annotation/EnableSettingInterceptor.java
# src/main/java/com/imyeyu/api/modules/blog/util/UserToken.java
# src/main/java/com/imyeyu/api/modules/common/bean/SettingModule.java
# src/main/java/com/imyeyu/api/modules/common/controller/CommentController.java
# src/main/java/com/imyeyu/api/modules/common/controller/CommonController.java
# src/main/java/com/imyeyu/api/modules/common/controller/UserController.java
# src/main/java/com/imyeyu/api/modules/common/entity/Setting.java
# src/main/java/com/imyeyu/api/modules/common/mapper/SettingMapper.java
# src/main/java/com/imyeyu/api/modules/common/service/SettingService.java
# src/main/java/com/imyeyu/api/modules/common/service/implement/MultilingualServiceImplement.java
# src/main/java/com/imyeyu/api/modules/common/service/implement/SettingServiceImplement.java
# src/main/java/com/imyeyu/api/modules/common/service/implement/TempFileServiceImplement.java
# src/main/java/com/imyeyu/api/modules/common/task/MultilingualTranslateTask.java
# src/main/java/com/imyeyu/api/modules/git/bean/gitea/GiteaAPI.java
# src/main/java/com/imyeyu/api/modules/git/controller/DeveloperController.java
# src/main/java/com/imyeyu/api/modules/git/service/implement/RepositoryServiceImplement.java
# src/main/java/com/imyeyu/api/modules/journal/controller/JournalController.java
# src/main/java/com/imyeyu/api/modules/journal/controller/ToolController.java
# src/main/java/com/imyeyu/api/modules/journal/util/JournalAPIInterceptor.java
# src/main/java/com/imyeyu/api/modules/minecraft/annotation/RequiredFMCServerTokenInterceptor.java
# src/main/java/com/imyeyu/api/modules/minecraft/controller/MinecraftController.java
# src/main/java/com/imyeyu/api/modules/minecraft/controller/PlayerController.java
# src/main/java/com/imyeyu/api/modules/minecraft/service/implement/PlayerServiceImplement.java
# src/main/java/com/imyeyu/api/modules/music/runner/ControllerBootstrapRunner.java
# src/main/java/com/imyeyu/api/modules/music/runner/PlayerBootstrapRunner.java
# src/main/java/com/imyeyu/api/modules/system/bean/ServerFile.java
# src/main/java/com/imyeyu/api/modules/system/controller/FileController.java
# src/main/java/com/imyeyu/api/modules/system/controller/SystemController.java
# src/main/java/com/imyeyu/api/modules/system/service/implement/FileServiceImplement.java
# src/main/java/com/imyeyu/api/modules/system/service/implement/StatusServiceImplement.java
# src/main/java/com/imyeyu/api/modules/system/service/implement/TerminalServiceImplement.java
# src/main/java/com/imyeyu/api/modules/system/task/ServerStatusTask.java
# src/main/java/com/imyeyu/api/modules/system/task/TerminalTask.java
# src/main/java/com/imyeyu/api/modules/system/task/status/AbstractDequeStatusCollector.java
# src/main/java/com/imyeyu/api/modules/system/task/status/collector/NetworkStatusCollector.java
# src/main/java/com/imyeyu/api/modules/system/util/SystemAPIInterceptor.java
# src/main/java/com/imyeyu/api/util/InitApplication.java