refactor: 移动 SaToken 配置到 webapi 模块

continew-org · Jul 1, 2024 · d733b7f · d733b7f
1 parent 44811fc
commit d733b7f
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 29 deletions.
diff --git 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/...nfig/satoken/LoginPasswordProperties.java → ...nfig/satoken/LoginPasswordProperties.java b/...nfig/satoken/LoginPasswordProperties.java → ...nfig/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/.../config/satoken/SaTokenConfiguration.java → .../config/satoken/SaTokenConfiguration.java b/.../config/satoken/SaTokenConfiguration.java → .../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/...config/satoken/SaTokenPermissionImpl.java → ...config/satoken/SaTokenPermissionImpl.java b/...config/satoken/SaTokenPermissionImpl.java → ...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/...new/admin/webapi/auth/AuthController.java → ...admin/controller/auth/AuthController.java b/...new/admin/webapi/auth/AuthController.java → ...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/...min/webapi/auth/SocialAuthController.java → ...controller/auth/SocialAuthController.java b/...min/webapi/auth/SocialAuthController.java → ...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/...dmin/webapi/common/CaptchaController.java → .../controller/common/CaptchaController.java b/...dmin/webapi/common/CaptchaController.java → .../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/...admin/webapi/common/CommonController.java → ...n/controller/common/CommonController.java b/...admin/webapi/common/CommonController.java → ...n/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/...in/webapi/common/DashboardController.java → ...ontroller/common/DashboardController.java b/...in/webapi/common/DashboardController.java → ...ontroller/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/.../webapi/monitor/OnlineUserController.java → ...troller/monitor/OnlineUserController.java b/.../webapi/monitor/OnlineUserController.java → ...troller/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/...w/admin/webapi/system/DeptController.java → ...min/controller/system/DeptController.java b/...w/admin/webapi/system/DeptController.java → ...min/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/...w/admin/webapi/system/DictController.java → ...min/controller/system/DictController.java b/...w/admin/webapi/system/DictController.java → ...min/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/...min/webapi/system/DictItemController.java → ...controller/system/DictItemController.java b/...min/webapi/system/DictItemController.java → ...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/...w/admin/webapi/system/FileController.java → ...min/controller/system/FileController.java b/...w/admin/webapi/system/FileController.java → ...min/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/...ew/admin/webapi/system/LogController.java → ...dmin/controller/system/LogController.java b/...ew/admin/webapi/system/LogController.java → ...dmin/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/...w/admin/webapi/system/MenuController.java → ...min/controller/system/MenuController.java b/...w/admin/webapi/system/MenuController.java → ...min/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/...dmin/webapi/system/MessageController.java → .../controller/system/MessageController.java b/...dmin/webapi/system/MessageController.java → .../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/...admin/webapi/system/NoticeController.java → ...n/controller/system/NoticeController.java b/...admin/webapi/system/NoticeController.java → ...n/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/...admin/webapi/system/OptionController.java → ...n/controller/system/OptionController.java b/...admin/webapi/system/OptionController.java → ...n/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/...w/admin/webapi/system/RoleController.java → ...min/controller/system/RoleController.java b/...w/admin/webapi/system/RoleController.java → ...min/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/...dmin/webapi/system/StorageController.java → .../controller/system/StorageController.java b/...dmin/webapi/system/StorageController.java → .../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/...n/webapi/system/UserCenterController.java → ...ntroller/system/UserCenterController.java b/...n/webapi/system/UserCenterController.java → ...ntroller/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/...w/admin/webapi/system/UserController.java → ...min/controller/system/UserController.java b/...w/admin/webapi/system/UserController.java → ...min/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/...dmin/webapi/tool/GeneratorController.java → .../controller/tool/GeneratorController.java b/...dmin/webapi/tool/GeneratorController.java → .../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
@@ -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:
     # 鉴权配置