From d733b7f1661a5f0df2b6f12b33ba69da8810e0aa Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 1 Jul 2024 22:08:02 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=20SaToken=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=B0=20webapi=20=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- .../admin}/config/satoken/LoginPasswordProperties.java | 2 +- .../admin}/config/satoken/SaTokenConfiguration.java | 2 +- .../admin}/config/satoken/SaTokenPermissionImpl.java | 2 +- .../admin/{webapi => controller}/auth/AuthController.java | 2 +- .../{webapi => controller}/auth/SocialAuthController.java | 2 +- .../{webapi => controller}/common/CaptchaController.java | 2 +- .../{webapi => controller}/common/CommonController.java | 2 +- .../common/DashboardController.java | 2 +- .../monitor/OnlineUserController.java | 2 +- .../{webapi => controller}/system/DeptController.java | 2 +- .../{webapi => controller}/system/DictController.java | 2 +- .../{webapi => controller}/system/DictItemController.java | 2 +- .../{webapi => controller}/system/FileController.java | 2 +- .../{webapi => controller}/system/LogController.java | 2 +- .../{webapi => controller}/system/MenuController.java | 2 +- .../{webapi => controller}/system/MessageController.java | 2 +- .../{webapi => controller}/system/NoticeController.java | 2 +- .../{webapi => controller}/system/OptionController.java | 2 +- .../{webapi => controller}/system/RoleController.java | 2 +- .../{webapi => controller}/system/StorageController.java | 2 +- .../system/UserCenterController.java | 2 +- .../{webapi => controller}/system/UserController.java | 2 +- .../{webapi => controller}/tool/GeneratorController.java | 2 +- .../src/main/resources/config/application.yml | 8 ++++---- 25 files changed, 29 insertions(+), 29 deletions(-) rename {continew-admin-system/src/main/java/top/continew/admin/auth => continew-admin-webapi/src/main/java/top/continew/admin}/config/satoken/LoginPasswordProperties.java (95%) rename {continew-admin-system/src/main/java/top/continew/admin/auth => continew-admin-webapi/src/main/java/top/continew/admin}/config/satoken/SaTokenConfiguration.java (97%) rename {continew-admin-system/src/main/java/top/continew/admin/auth => continew-admin-webapi/src/main/java/top/continew/admin}/config/satoken/SaTokenPermissionImpl.java (96%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/auth/AuthController.java (99%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/auth/SocialAuthController.java (98%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/common/CaptchaController.java (99%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/common/CommonController.java (99%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/common/DashboardController.java (98%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/monitor/OnlineUserController.java (98%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/DeptController.java (97%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/DictController.java (97%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/DictItemController.java (97%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/FileController.java (97%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/LogController.java (98%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/MenuController.java (98%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/MessageController.java (98%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/NoticeController.java (98%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/OptionController.java (98%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/RoleController.java (97%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/StorageController.java (97%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/UserCenterController.java (99%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/system/UserController.java (99%) rename continew-admin-webapi/src/main/java/top/continew/admin/{webapi => controller}/tool/GeneratorController.java (99%) diff --git a/README.md b/README.md index a66e90a5..49837b77 100644 --- a/README.md +++ b/README.md @@ -271,7 +271,8 @@ continew-admin │ ├─ src │ │ ├─ main │ │ │ ├─ java/top/continew/admin -│ │ │ │ ├─ webapi +│ │ │ │ ├─ config （配置） +│ │ │ │ ├─ controller │ │ │ │ │ ├─ auth（系统认证相关 API） │ │ │ │ │ ├─ common（通用相关 API） │ │ │ │ │ ├─ monitor（系统监控相关 API） @@ -297,7 +298,6 @@ continew-admin │ │ ├─ main │ │ │ ├─ java/top/continew/admin │ │ │ │ ├─ auth（系统认证相关业务） -│ │ │ │ │ ├─ config（系统认证相关配置） │ │ │ │ │ ├─ model（系统认证相关模型） │ │ │ │ │ │ ├─ query（系统认证相关查询条件） │ │ │ │ │ │ ├─ req（系统认证相关请求对象（Request）） diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/LoginPasswordProperties.java b/continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/LoginPasswordProperties.java similarity index 95% rename from continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/LoginPasswordProperties.java rename to continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/LoginPasswordProperties.java index 27b849f1..88ff3060 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/LoginPasswordProperties.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/LoginPasswordProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.config.satoken; +package top.continew.admin.config.satoken; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenConfiguration.java b/continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java similarity index 97% rename from continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenConfiguration.java rename to continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java index 5f6ba3aa..5525c391 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenConfiguration.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.config.satoken; +package top.continew.admin.config.satoken; import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java b/continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenPermissionImpl.java similarity index 96% rename from continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java rename to continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenPermissionImpl.java index 9c9afa08..2bc6aee7 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenPermissionImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.auth.config.satoken; +package top.continew.admin.config.satoken; import cn.dev33.satoken.stp.StpInterface; import top.continew.admin.common.model.dto.LoginUser; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/AuthController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/AuthController.java similarity index 99% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/AuthController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/AuthController.java index 52c4d435..19368d06 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/AuthController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/AuthController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.auth; +package top.continew.admin.controller.auth; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.stp.StpUtil; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/SocialAuthController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/SocialAuthController.java similarity index 98% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/SocialAuthController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/SocialAuthController.java index 0e500dd6..2a28e0aa 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/SocialAuthController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/SocialAuthController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.auth; +package top.continew.admin.controller.auth; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.stp.StpUtil; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/common/CaptchaController.java similarity index 99% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CaptchaController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/common/CaptchaController.java index 24ea7c21..164f095c 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CaptchaController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/common/CaptchaController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.common; +package top.continew.admin.controller.common; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.LocalDateTimeUtil; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java similarity index 99% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java index 66818646..091ce40b 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.common; +package top.continew.admin.controller.common; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.lang.tree.Tree; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/DashboardController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/common/DashboardController.java similarity index 98% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/DashboardController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/common/DashboardController.java index 7dbe9f09..291b4e32 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/DashboardController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/common/DashboardController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.common; +package top.continew.admin.controller.common; import com.alicp.jetcache.anno.CachePenetrationProtect; import com.alicp.jetcache.anno.CacheRefresh; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/monitor/OnlineUserController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java similarity index 98% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/monitor/OnlineUserController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java index 85e89a06..61e66edd 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/monitor/OnlineUserController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.monitor; +package top.continew.admin.controller.monitor; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DeptController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java similarity index 97% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DeptController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java index 49420760..31d397e7 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DeptController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DictController.java similarity index 97% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DictController.java index d2d2b586..1474278e 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DictController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictItemController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java similarity index 97% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictItemController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java index 7d17a3de..7de271af 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/DictItemController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/FileController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/FileController.java similarity index 97% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/FileController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/FileController.java index 3eb25ecf..e7fb2112 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/FileController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/FileController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/LogController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/LogController.java similarity index 98% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/LogController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/LogController.java index bba40228..0aad2834 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/LogController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/LogController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MenuController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java similarity index 98% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MenuController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java index c99088d7..e7429812 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MenuController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MessageController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/MessageController.java similarity index 98% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MessageController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/MessageController.java index eaa9e97f..397b7783 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MessageController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/MessageController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java similarity index 98% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java index 3f616401..f76f6a5b 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/OptionController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/OptionController.java similarity index 98% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/OptionController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/OptionController.java index 1961c0f7..2d8b8181 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/OptionController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/OptionController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/RoleController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java similarity index 97% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/RoleController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java index 394fff0d..8110d514 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/RoleController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/StorageController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java similarity index 97% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/StorageController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java index 3cd17f47..02af5b25 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/StorageController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java similarity index 99% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserCenterController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java index 6a8bd8ca..41991b67 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import com.xkcoding.justauth.AuthRequestFactory; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserController.java similarity index 99% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserController.java index c4a184f8..80e75825 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.system; +package top.continew.admin.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ReUtil; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/tool/GeneratorController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java similarity index 99% rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/tool/GeneratorController.java rename to continew-admin-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java index d3da0c7b..bf34f254 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/tool/GeneratorController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.webapi.tool; +package top.continew.admin.controller.tool; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-admin-webapi/src/main/resources/config/application.yml b/continew-admin-webapi/src/main/resources/config/application.yml index f1cc7ba5..ef4ac2ca 100644 --- a/continew-admin-webapi/src/main/resources/config/application.yml +++ b/continew-admin-webapi/src/main/resources/config/application.yml @@ -61,16 +61,16 @@ springdoc: - /error - group: auth display-name: 系统认证 - packages-to-scan: ${project.base-package}.webapi.auth + packages-to-scan: ${project.base-package}.controller.auth - group: common display-name: 通用接口 - packages-to-scan: ${project.base-package}.webapi.common + packages-to-scan: ${project.base-package}.controller.common - group: system display-name: 系统管理 - packages-to-scan: ${project.base-package}.webapi.system + packages-to-scan: ${project.base-package}.controller.system - group: monitor display-name: 系统监控 - packages-to-scan: ${project.base-package}.webapi.monitor + packages-to-scan: ${project.base-package}.controller.monitor ## 组件配置 components: # 鉴权配置