diff --git a/src/main/java/com/label/module/user/controller/AuthController.java b/src/main/java/com/label/controller/AuthController.java similarity index 98% rename from src/main/java/com/label/module/user/controller/AuthController.java rename to src/main/java/com/label/controller/AuthController.java index 52df9aa..521eb8d 100644 --- a/src/main/java/com/label/module/user/controller/AuthController.java +++ b/src/main/java/com/label/controller/AuthController.java @@ -1,4 +1,4 @@ -package com.label.module.user.controller; +package com.label.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; diff --git a/src/main/java/com/label/module/export/controller/ExportController.java b/src/main/java/com/label/controller/ExportController.java similarity index 98% rename from src/main/java/com/label/module/export/controller/ExportController.java rename to src/main/java/com/label/controller/ExportController.java index 99768e5..5ae1c92 100644 --- a/src/main/java/com/label/module/export/controller/ExportController.java +++ b/src/main/java/com/label/controller/ExportController.java @@ -1,4 +1,4 @@ -package com.label.module.export.controller; +package com.label.controller; import com.label.common.result.PageResult; import com.label.common.result.Result; diff --git a/src/main/java/com/label/module/annotation/controller/ExtractionController.java b/src/main/java/com/label/controller/ExtractionController.java similarity index 98% rename from src/main/java/com/label/module/annotation/controller/ExtractionController.java rename to src/main/java/com/label/controller/ExtractionController.java index dee5d46..0ef3400 100644 --- a/src/main/java/com/label/module/annotation/controller/ExtractionController.java +++ b/src/main/java/com/label/controller/ExtractionController.java @@ -1,4 +1,4 @@ -package com.label.module.annotation.controller; +package com.label.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; diff --git a/src/main/java/com/label/module/annotation/controller/QaController.java b/src/main/java/com/label/controller/QaController.java similarity index 98% rename from src/main/java/com/label/module/annotation/controller/QaController.java rename to src/main/java/com/label/controller/QaController.java index 887afb4..6641ffe 100644 --- a/src/main/java/com/label/module/annotation/controller/QaController.java +++ b/src/main/java/com/label/controller/QaController.java @@ -1,4 +1,4 @@ -package com.label.module.annotation.controller; +package com.label.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; diff --git a/src/main/java/com/label/module/source/controller/SourceController.java b/src/main/java/com/label/controller/SourceController.java similarity index 98% rename from src/main/java/com/label/module/source/controller/SourceController.java rename to src/main/java/com/label/controller/SourceController.java index ac6e1fd..e4abfa6 100644 --- a/src/main/java/com/label/module/source/controller/SourceController.java +++ b/src/main/java/com/label/controller/SourceController.java @@ -1,4 +1,4 @@ -package com.label.module.source.controller; +package com.label.controller; import com.label.common.result.PageResult; import com.label.common.result.Result; diff --git a/src/main/java/com/label/module/config/controller/SysConfigController.java b/src/main/java/com/label/controller/SysConfigController.java similarity index 98% rename from src/main/java/com/label/module/config/controller/SysConfigController.java rename to src/main/java/com/label/controller/SysConfigController.java index d81db75..c632453 100644 --- a/src/main/java/com/label/module/config/controller/SysConfigController.java +++ b/src/main/java/com/label/controller/SysConfigController.java @@ -1,4 +1,4 @@ -package com.label.module.config.controller; +package com.label.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; diff --git a/src/main/java/com/label/module/task/controller/TaskController.java b/src/main/java/com/label/controller/TaskController.java similarity index 99% rename from src/main/java/com/label/module/task/controller/TaskController.java rename to src/main/java/com/label/controller/TaskController.java index 86fdbea..99f15a6 100644 --- a/src/main/java/com/label/module/task/controller/TaskController.java +++ b/src/main/java/com/label/controller/TaskController.java @@ -1,4 +1,4 @@ -package com.label.module.task.controller; +package com.label.controller; import com.label.common.result.PageResult; import com.label.common.result.Result; diff --git a/src/main/java/com/label/module/user/controller/UserController.java b/src/main/java/com/label/controller/UserController.java similarity index 98% rename from src/main/java/com/label/module/user/controller/UserController.java rename to src/main/java/com/label/controller/UserController.java index f47dcb1..4b61a2e 100644 --- a/src/main/java/com/label/module/user/controller/UserController.java +++ b/src/main/java/com/label/controller/UserController.java @@ -1,4 +1,4 @@ -package com.label.module.user.controller; +package com.label.controller; import java.util.Map; diff --git a/src/main/java/com/label/module/video/controller/VideoController.java b/src/main/java/com/label/controller/VideoController.java similarity index 99% rename from src/main/java/com/label/module/video/controller/VideoController.java rename to src/main/java/com/label/controller/VideoController.java index 34dbbb6..41dc239 100644 --- a/src/main/java/com/label/module/video/controller/VideoController.java +++ b/src/main/java/com/label/controller/VideoController.java @@ -1,4 +1,4 @@ -package com.label.module.video.controller; +package com.label.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; diff --git a/src/test/java/com/label/unit/OpenApiAnnotationTest.java b/src/test/java/com/label/unit/OpenApiAnnotationTest.java index e32c7c7..35c7f99 100644 --- a/src/test/java/com/label/unit/OpenApiAnnotationTest.java +++ b/src/test/java/com/label/unit/OpenApiAnnotationTest.java @@ -1,19 +1,19 @@ package com.label.unit; -import com.label.module.annotation.controller.ExtractionController; -import com.label.module.annotation.controller.QaController; -import com.label.module.config.controller.SysConfigController; -import com.label.module.export.controller.ExportController; -import com.label.module.source.controller.SourceController; +import com.label.controller.AuthController; +import com.label.controller.ExportController; +import com.label.controller.ExtractionController; +import com.label.controller.QaController; +import com.label.controller.SourceController; +import com.label.controller.SysConfigController; +import com.label.controller.TaskController; +import com.label.controller.UserController; +import com.label.controller.VideoController; import com.label.dto.SourceResponse; -import com.label.module.task.controller.TaskController; import com.label.dto.TaskResponse; -import com.label.module.user.controller.AuthController; -import com.label.module.user.controller.UserController; import com.label.dto.LoginRequest; import com.label.dto.LoginResponse; import com.label.dto.UserInfoResponse; -import com.label.module.video.controller.VideoController; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/test/java/com/label/unit/PackageStructureMigrationTest.java b/src/test/java/com/label/unit/PackageStructureMigrationTest.java index 13b6fba..627ca7e 100644 --- a/src/test/java/com/label/unit/PackageStructureMigrationTest.java +++ b/src/test/java/com/label/unit/PackageStructureMigrationTest.java @@ -81,6 +81,23 @@ class PackageStructureMigrationTest { } } + @Test + @DisplayName("控制器类已迁移到扁平 controller 目录") + void controllerTypesMoved() { + for (String fqcn : java.util.List.of( + "com.label.controller.AuthController", + "com.label.controller.UserController", + "com.label.controller.SourceController", + "com.label.controller.TaskController", + "com.label.controller.ExtractionController", + "com.label.controller.QaController", + "com.label.controller.ExportController", + "com.label.controller.SysConfigController", + "com.label.controller.VideoController")) { + assertClassExists(fqcn); + } + } + private static void assertClassExists(String fqcn) { assertThatCode(() -> Class.forName(fqcn)).doesNotThrowAnyException(); }