From 08f45b5f4da37c1d17f98f704c684a2438239486 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 17 Jul 2025 22:39:32 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20CommonController=20=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E8=87=B3=20system=20=E6=A8=A1=E5=9D=97=E3=80=81Online?= =?UTF-8?q?UserController=20=E8=BF=81=E7=A7=BB=E8=87=B3=20system/auth=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/config/doc/GlobalSpringDocConfiguration.java | 7 +------ .../continew/admin/tenant/config/TenantConfiguration.java | 2 +- .../admin/controller/{common => }/CaptchaController.java | 2 +- .../admin/controller/{common => }/DashboardController.java | 2 +- .../top/continew/admin/auth/config/AuthConfiguration.java | 2 +- .../admin/auth/controller}/OnlineUserController.java | 2 +- .../admin/system/controller}/CommonController.java | 6 +++--- 7 files changed, 9 insertions(+), 14 deletions(-) rename continew-server/src/main/java/top/continew/admin/controller/{common => }/CaptchaController.java (99%) rename continew-server/src/main/java/top/continew/admin/controller/{common => }/DashboardController.java (99%) rename {continew-server/src/main/java/top/continew/admin/controller/monitor => continew-system/src/main/java/top/continew/admin/auth/controller}/OnlineUserController.java (98%) rename {continew-server/src/main/java/top/continew/admin/controller/common => continew-system/src/main/java/top/continew/admin/system/controller}/CommonController.java (97%) diff --git a/continew-common/src/main/java/top/continew/admin/common/config/doc/GlobalSpringDocConfiguration.java b/continew-common/src/main/java/top/continew/admin/common/config/doc/GlobalSpringDocConfiguration.java index 7708fe48..f3eabbb9 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/doc/GlobalSpringDocConfiguration.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/doc/GlobalSpringDocConfiguration.java @@ -44,12 +44,7 @@ public class GlobalSpringDocConfiguration { return GroupedOpenApi.builder() .group("common") .displayName("通用接口") - .pathsToMatch("/common/**", "/captcha/**", "/dashboard/**") + .pathsToMatch("/captcha/**", "/dashboard/**") .build(); } - - @Bean - public GroupedOpenApi monitorApi() { - return GroupedOpenApi.builder().group("monitor").displayName("系统监控").pathsToMatch("/monitor/**").build(); - } } diff --git a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/config/TenantConfiguration.java b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/config/TenantConfiguration.java index 0af78499..e516c3bd 100644 --- a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/config/TenantConfiguration.java +++ b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/config/TenantConfiguration.java @@ -34,6 +34,6 @@ public class TenantConfiguration { */ @Bean public GroupedOpenApi tenantApi() { - return GroupedOpenApi.builder().group("tenant").displayName("租户").pathsToMatch("/tenant/**").build(); + return GroupedOpenApi.builder().group("tenant").displayName("租户管理").pathsToMatch("/tenant/**").build(); } } diff --git a/continew-server/src/main/java/top/continew/admin/controller/common/CaptchaController.java b/continew-server/src/main/java/top/continew/admin/controller/CaptchaController.java similarity index 99% rename from continew-server/src/main/java/top/continew/admin/controller/common/CaptchaController.java rename to continew-server/src/main/java/top/continew/admin/controller/CaptchaController.java index 610bab74..398f1015 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/common/CaptchaController.java +++ b/continew-server/src/main/java/top/continew/admin/controller/CaptchaController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.common; +package top.continew.admin.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.LocalDateTimeUtil; diff --git a/continew-server/src/main/java/top/continew/admin/controller/common/DashboardController.java b/continew-server/src/main/java/top/continew/admin/controller/DashboardController.java similarity index 99% rename from continew-server/src/main/java/top/continew/admin/controller/common/DashboardController.java rename to continew-server/src/main/java/top/continew/admin/controller/DashboardController.java index 846057ef..51bd2516 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/common/DashboardController.java +++ b/continew-server/src/main/java/top/continew/admin/controller/DashboardController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.common; +package top.continew.admin.controller; import com.alicp.jetcache.anno.CachePenetrationProtect; import com.alicp.jetcache.anno.CacheRefresh; diff --git a/continew-system/src/main/java/top/continew/admin/auth/config/AuthConfiguration.java b/continew-system/src/main/java/top/continew/admin/auth/config/AuthConfiguration.java index 70c1ac8c..e773376e 100644 --- a/continew-system/src/main/java/top/continew/admin/auth/config/AuthConfiguration.java +++ b/continew-system/src/main/java/top/continew/admin/auth/config/AuthConfiguration.java @@ -34,6 +34,6 @@ public class AuthConfiguration { */ @Bean public GroupedOpenApi authApi() { - return GroupedOpenApi.builder().group("auth").displayName("系统认证").pathsToMatch("/auth/**").build(); + return GroupedOpenApi.builder().group("auth").displayName("系统认证").pathsToMatch("/auth/**", "/monitor/online/**").build(); } } diff --git a/continew-server/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java b/continew-system/src/main/java/top/continew/admin/auth/controller/OnlineUserController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java rename to continew-system/src/main/java/top/continew/admin/auth/controller/OnlineUserController.java index 64fae8e6..15d0730b 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java +++ b/continew-system/src/main/java/top/continew/admin/auth/controller/OnlineUserController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.monitor; +package top.continew.admin.auth.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.stp.StpUtil; diff --git a/continew-server/src/main/java/top/continew/admin/controller/common/CommonController.java b/continew-system/src/main/java/top/continew/admin/system/controller/CommonController.java similarity index 97% rename from continew-server/src/main/java/top/continew/admin/controller/common/CommonController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/CommonController.java index e1f39905..605a4e97 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/common/CommonController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/CommonController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.common; +package top.continew.admin.system.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.lang.tree.Tree; @@ -53,9 +53,9 @@ import java.util.List; @Tag(name = "公共 API") @Log(ignore = true) @Validated -@RestController +@RestController("systemCommonController") @RequiredArgsConstructor -@RequestMapping("/common") +@RequestMapping("/system/common") public class CommonController { private final FileService fileService;