diff --git a/README.md b/README.md index ba490c6b..72104a83 100644 --- a/README.md +++ b/README.md @@ -280,11 +280,9 @@ continew-admin │ │ │ ├─ java/top/continew/admin │ │ │ │ ├─ config （配置） │ │ │ │ ├─ controller -│ │ │ │ │ ├─ auth（系统认证相关 API） │ │ │ │ │ ├─ common（通用相关 API） -│ │ │ │ │ ├─ monitor（系统监控相关 API） -│ │ │ │ │ ├─ system（系统管理相关 API） -│ │ │ │ │ └─ tool（系统工具相关 API） +│ │ │ │ │ └─ monitor（系统监控相关 API） +│ │ │ │ ├─ job （定时任务） │ │ │ │ └─ ContiNewAdminApplication.java（ContiNew Admin 启动程序） │ │ │ └─ resources │ │ │ ├─ config（核心配置目录） @@ -305,22 +303,28 @@ continew-admin │ │ ├─ main │ │ │ ├─ java/top/continew/admin │ │ │ │ ├─ auth（系统认证相关业务） +│ │ │ │ │ ├─ controller（系统认证相关 API） +│ │ │ │ │ ├─ service（系统认证相关业务接口及实现类） │ │ │ │ │ ├─ model（系统认证相关模型） │ │ │ │ │ │ ├─ query（系统认证相关查询条件） │ │ │ │ │ │ ├─ req（系统认证相关请求对象（Request）） │ │ │ │ │ │ └─ resp（系统认证相关响应对象（Response）） -│ │ │ │ │ └─ service（系统认证相关业务接口及实现类） +│ │ │ │ │ ├─ enums（系统认证相关枚举） +│ │ │ │ │ ├─ handler（系统认证相关处理器） +│ │ │ │ │ └─ config（系统认证相关配置） │ │ │ │ └─ system（系统管理相关业务） -│ │ │ │ ├─ config（系统管理相关配置） -│ │ │ │ ├─ enums（系统管理相关枚举） +│ │ │ │ ├─ controller（系统管理相关 API） +│ │ │ │ ├─ service（系统管理相关业务接口及实现类） │ │ │ │ ├─ mapper（系统管理相关 Mapper） │ │ │ │ ├─ model（系统管理相关模型） │ │ │ │ │ ├─ entity（系统管理相关实体对象） │ │ │ │ │ ├─ query（系统管理相关查询条件） │ │ │ │ │ ├─ req（系统管理相关请求对象（Request）） │ │ │ │ │ └─ resp（系统管理相关响应对象（Response）） -│ │ │ │ ├─ service（系统管理相关业务接口及实现类） -│ │ │ │ └─ util（系统管理相关工具类） +│ │ │ │ ├─ enums（系统管理相关枚举） +│ │ │ │ ├─ util（系统管理相关工具类） +│ │ │ │ ├─ validation（系统管理相关参数校验工具类） +│ │ │ │ └─ config（系统管理相关配置） │ │ │ └─ resources │ │ │ └─ mapper（系统管理相关 Mapper XML 文件目录） │ │ └─ test（测试相关代码目录） @@ -329,60 +333,74 @@ continew-admin │ ├─ continew-plugin-schedule（任务调度插件模块） │ │ ├─ src │ │ │ ├─ main/java/top/continew/admin/schedule +│ │ │ │ ├─ controller（任务调度相关 API） +│ │ │ │ ├─ service（代码生成器相关业务接口及实现类） │ │ │ │ ├─ api（任务调度中心相关 API） -│ │ │ │ ├─ config（任务调度相关配置） -│ │ │ │ ├─ constant（任务调度相关常量） -│ │ │ │ ├─ enums（任务调度相关枚举） │ │ │ │ ├─ model（任务调度相关模型） │ │ │ │ │ ├─ query（任务调度相关查询条件） │ │ │ │ │ ├─ req（任务调度相关请求对象（Request）） │ │ │ │ │ └─ resp（任务调度相关响应对象（Response）） -│ │ │ │ └─ service（代码生成器相关业务接口及实现类） +│ │ │ │ ├─ constant（任务调度相关常量） +│ │ │ │ ├─ enums（任务调度相关枚举） +│ │ │ │ ├─ exception（任务调度相关异常） +│ │ │ │ └─ config（任务调度相关配置） │ │ │ └─ test（测试相关代码目录） │ │ └─ pom.xml │ ├─ continew-plugin-open（能力开放插件模块） │ │ ├─ src │ │ │ ├─ main/java/top/continew/admin/open -│ │ │ │ ├─ mapper（代码生成器相关 Mapper） +│ │ │ │ ├─ controller（能力开放相关 API） +│ │ │ │ ├─ service（能力开放相关业务接口及实现类） +│ │ │ │ ├─ mapper（能力开放相关 Mapper） │ │ │ │ ├─ model（能力开放相关模型） │ │ │ │ │ ├─ entity（能力开放相关实体对象） │ │ │ │ │ ├─ query（能力开放相关查询条件） │ │ │ │ │ ├─ req（能力开放相关请求对象（Request）） │ │ │ │ │ └─ resp（能力开放相关响应对象（Response）） -│ │ │ │ └─ service（能力开放相关业务接口及实现类） +│ │ │ │ ├─ util（能力开放相关工具类） +│ │ │ │ └─ config（能力开放相关配置） │ │ │ └─ test（测试相关代码目录） │ │ └─ pom.xml │ ├─ continew-plugin-generator（代码生成器插件模块） │ │ ├─ src │ │ │ ├─ main │ │ │ │ ├─ java/top/continew/admin/generator -│ │ │ │ │ ├─ config（代码生成器相关配置） -│ │ │ │ │ ├─ enums（代码生成器相关枚举） +│ │ │ │ │ ├─ controller（代码生成器相关 API） +│ │ │ │ │ ├─ service（代码生成器相关业务接口及实现类） │ │ │ │ │ ├─ mapper（代码生成器相关 Mapper） │ │ │ │ │ ├─ model（代码生成器相关模型） │ │ │ │ │ │ ├─ entity（代码生成器相关实体对象） │ │ │ │ │ │ ├─ query（代码生成器相关查询条件） │ │ │ │ │ │ ├─ req（代码生成器相关请求对象（Request）） │ │ │ │ │ │ └─ resp（代码生成器相关响应对象（Response）） -│ │ │ │ │ └─ service（代码生成器相关业务接口及实现类） +│ │ │ │ │ ├─ enums（代码生成器相关枚举） +│ │ │ │ │ └─ config（代码生成器相关配置） │ │ │ │ └─ resources -│ │ │ │ ├─ templates/generator（代码生成相关模板目录） -│ │ │ │ ├─ application.yml（代码生成配置文件） -│ │ │ │ └─ generator.properties（代码生成类型映射配置文件） +│ │ │ │ └─ templates（代码生成相关模板目录） +│ │ │ │ ├─ backend（后端模板目录） +│ │ │ │ └─ frontend（前端模板目录） │ │ │ └─ test（测试相关代码目录） │ │ └─ pom.xml │ └─ pom.xml ├─ continew-common（公共模块，存放公共工具类，公共配置等） │ ├─ src │ │ ├─ main/java/top/continew/admin/common -│ │ │ ├─ config（公共配置） -│ │ │ ├─ constant（公共常量） -│ │ │ ├─ enums（公共枚举） +│ │ │ ├─ controller（控制器基类） +│ │ │ ├─ service（公共服务接口） │ │ │ ├─ model（公共模型） │ │ │ │ ├─ dto（公共 DTO（Data Transfer Object）） │ │ │ │ ├─ req（公共请求对象（Request）） │ │ │ │ └─ resp（公共响应对象（Response）） -│ │ │ └─ util（公共工具类） +│ │ │ ├─ context（公共上下文） +│ │ │ ├─ constant（公共常量） +│ │ │ ├─ enums（公共枚举） +│ │ │ ├─ util（公共工具类） +│ │ │ └─ config（公共配置） +│ │ │ ├─ mybatis（MyBatis Plus 配置） +│ │ │ ├─ websocket（Websocket 配置） +│ │ │ ├─ doc（接口文档配置） +│ │ │ ├─ excel（Excel 配置） +│ │ │ └─ exception（全局异常处理） │ │ └─ test（测试相关代码目录） │ └─ pom.xml ├─ continew-extension（扩展模块） @@ -408,7 +426,7 @@ continew-admin ├─ .idea │ └─ icon.png（IDEA 项目图标，实际开发时直接删除） ├─ .image（截图目录，实际开发时直接删除） -├─ .style（代码格式、License文件头相关配置目录，实际开发时根据需要取舍，删除时注意删除 spotless 插件配置） +├─ .style（代码格式、License文件头相关配置目录，实际开发时根据需要取舍，删除时注意删除 /pom.xml 中的 spotless 插件配置） ├─ .gitignore（Git 忽略文件相关配置文件） ├─ docker（项目部署相关配置目录，实际开发时可备份后直接删除） ├─ LICENSE（开源协议文件） diff --git a/continew-common/pom.xml b/continew-common/pom.xml index 716b7a33..7d2f3cf5 100644 --- a/continew-common/pom.xml +++ b/continew-common/pom.xml @@ -150,5 +150,11 @@ top.continew continew-starter-json-jackson + + + + top.continew + continew-starter-log-interceptor + \ No newline at end of file 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 new file mode 100644 index 00000000..36a1b8b8 --- /dev/null +++ b/continew-common/src/main/java/top/continew/admin/common/config/doc/GlobalSpringDocConfiguration.java @@ -0,0 +1,43 @@ +package top.continew.admin.common.config.doc; + +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 全局接口文档配置 + * + * @author Charles7c + * @since 2025/6/14 21:22 + */ +@Configuration +public class GlobalSpringDocConfiguration { + + @Bean + public GroupedOpenApi allApi() { + return GroupedOpenApi.builder() + .group("all") + .displayName("全部接口") + .pathsToMatch("/**") + .packagesToExclude("/error") + .build(); + } + + @Bean + public GroupedOpenApi commonApi() { + return GroupedOpenApi.builder() + .group("common") + .displayName("通用接口") + .pathsToMatch("/common/**") + .build(); + } + + @Bean + public GroupedOpenApi monitorApi() { + return GroupedOpenApi.builder() + .group("monitor") + .displayName("系统监控") + .pathsToMatch("/monitor/**") + .build(); + } +} diff --git a/continew-plugin/continew-plugin-generator/pom.xml b/continew-plugin/continew-plugin-generator/pom.xml index 5d21435f..ad373fea 100644 --- a/continew-plugin/continew-plugin-generator/pom.xml +++ b/continew-plugin/continew-plugin-generator/pom.xml @@ -14,4 +14,12 @@ ${project.artifactId} 代码生成器插件 + + + + + top.continew + continew-system + + \ No newline at end of file diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/config/CodeConfiguration.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/config/CodeConfiguration.java new file mode 100644 index 00000000..e74ce965 --- /dev/null +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/config/CodeConfiguration.java @@ -0,0 +1,27 @@ +package top.continew.admin.generator.config; + +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 代码生成配置 + * + * @author Charles7c + * @since 2025/6/14 21:22 + */ +@Configuration +public class CodeConfiguration { + + /** + * API 文档分组配置 + */ + @Bean + public GroupedOpenApi codeApi() { + return GroupedOpenApi.builder() + .group("code") + .displayName("代码生成") + .pathsToMatch("/code/**") + .build(); + } +} diff --git a/continew-server/src/main/java/top/continew/admin/controller/code/GeneratorController.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/controller/GeneratorController.java similarity index 99% rename from continew-server/src/main/java/top/continew/admin/controller/code/GeneratorController.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/controller/GeneratorController.java index 600c0955..5903b956 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/code/GeneratorController.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/controller/GeneratorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.code; +package top.continew.admin.generator.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/config/OpenConfiguration.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/config/OpenConfiguration.java new file mode 100644 index 00000000..d4982145 --- /dev/null +++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/config/OpenConfiguration.java @@ -0,0 +1,27 @@ +package top.continew.admin.open.config; + +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 能力开放配置 + * + * @author Charles7c + * @since 2025/6/14 21:22 + */ +@Configuration +public class OpenConfiguration { + + /** + * API 文档分组配置 + */ + @Bean + public GroupedOpenApi openApi() { + return GroupedOpenApi.builder() + .group("open") + .displayName("能力开放") + .pathsToMatch("/open/**") + .build(); + } +} diff --git a/continew-server/src/main/java/top/continew/admin/controller/open/AppController.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/controller/AppController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/open/AppController.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/controller/AppController.java index cd49abf7..1fbc1c6e 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/open/AppController.java +++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/controller/AppController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.open; +package top.continew.admin.open.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/ScheduleConfiguration.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/ScheduleConfiguration.java new file mode 100644 index 00000000..238bc0a0 --- /dev/null +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/ScheduleConfiguration.java @@ -0,0 +1,27 @@ +package top.continew.admin.schedule.config; + +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 任务调度配置 + * + * @author Charles7c + * @since 2025/6/14 21:22 + */ +@Configuration +public class ScheduleConfiguration { + + /** + * API 文档分组配置 + */ + @Bean + public GroupedOpenApi scheduleApi() { + return GroupedOpenApi.builder() + .group("schedule") + .displayName("任务调度") + .pathsToMatch("/schedule/**") + .build(); + } +} diff --git a/continew-server/src/main/java/top/continew/admin/controller/schedule/JobController.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/schedule/JobController.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobController.java index 61fd2d85..144264db 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/schedule/JobController.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.schedule; +package top.continew.admin.schedule.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-server/src/main/java/top/continew/admin/controller/schedule/JobLogController.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobLogController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/schedule/JobLogController.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobLogController.java index 4301572e..934c854d 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/schedule/JobLogController.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/controller/JobLogController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.schedule; +package top.continew.admin.schedule.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-server/pom.xml b/continew-server/pom.xml index 1a6a0e68..be9e099a 100644 --- a/continew-server/pom.xml +++ b/continew-server/pom.xml @@ -52,12 +52,6 @@ continew-plugin-generator - - - top.continew - continew-starter-log-interceptor - - top.continew diff --git a/continew-server/src/main/resources/config/application.yml b/continew-server/src/main/resources/config/application.yml index 9e8090ca..6fc73694 100644 --- a/continew-server/src/main/resources/config/application.yml +++ b/continew-server/src/main/resources/config/application.yml @@ -114,33 +114,6 @@ springdoc: # 设置对象型参数的展示形式（设为 true 表示将对象型参数平展开，即对象内的属性直接作为参数展示而不是嵌套在对象内，默认 false） # 如果不添加该全局配置，可以在需要如此处理的对象参数类上使用 @ParameterObject default-flat-param-object: true - # 分组配置 - group-configs: - - group: all - paths-to-match: /** - paths-to-exclude: - - /error - - group: auth - display-name: 系统认证 - packages-to-scan: ${project.base-package}.controller.auth - - group: common - display-name: 通用接口 - packages-to-scan: ${project.base-package}.controller.common - - group: system - display-name: 系统管理 - packages-to-scan: ${project.base-package}.controller.system - - group: monitor - display-name: 系统监控 - packages-to-scan: ${project.base-package}.controller.monitor - - group: schedule - display-name: 任务调度 - packages-to-scan: ${project.base-package}.controller.schedule - - group: open - display-name: 能力开放 - packages-to-scan: ${project.base-package}.controller.open - - group: code - display-name: 代码生成 - packages-to-scan: ${project.base-package}.controller.code ## 组件配置 components: # 鉴权配置 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 new file mode 100644 index 00000000..069a359e --- /dev/null +++ b/continew-system/src/main/java/top/continew/admin/auth/config/AuthConfiguration.java @@ -0,0 +1,27 @@ +package top.continew.admin.auth.config; + +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 系统认证配置 + * + * @author Charles7c + * @since 2025/6/14 21:22 + */ +@Configuration +public class AuthConfiguration { + + /** + * API 文档分组配置 + */ + @Bean + public GroupedOpenApi authApi() { + return GroupedOpenApi.builder() + .group("auth") + .displayName("系统认证") + .pathsToMatch("/auth/**") + .build(); + } +} diff --git a/continew-server/src/main/java/top/continew/admin/controller/auth/AuthController.java b/continew-system/src/main/java/top/continew/admin/auth/controller/AuthController.java similarity index 99% rename from continew-server/src/main/java/top/continew/admin/controller/auth/AuthController.java rename to continew-system/src/main/java/top/continew/admin/auth/controller/AuthController.java index a199c8b6..5bd5a695 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/auth/AuthController.java +++ b/continew-system/src/main/java/top/continew/admin/auth/controller/AuthController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.auth; +package top.continew.admin.auth.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.stp.StpUtil; diff --git a/continew-system/src/main/java/top/continew/admin/system/config/SystemConfiguration.java b/continew-system/src/main/java/top/continew/admin/system/config/SystemConfiguration.java new file mode 100644 index 00000000..d7b584cd --- /dev/null +++ b/continew-system/src/main/java/top/continew/admin/system/config/SystemConfiguration.java @@ -0,0 +1,27 @@ +package top.continew.admin.system.config; + +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 系统管理配置 + * + * @author Charles7c + * @since 2025/6/14 21:22 + */ +@Configuration +public class SystemConfiguration { + + /** + * API 文档分组配置 + */ + @Bean + public GroupedOpenApi systemApi() { + return GroupedOpenApi.builder() + .group("system") + .displayName("系统管理") + .pathsToMatch("/system/**") + .build(); + } +} diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/ClientController.java b/continew-system/src/main/java/top/continew/admin/system/controller/ClientController.java similarity index 97% rename from continew-server/src/main/java/top/continew/admin/controller/system/ClientController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/ClientController.java index 61f03080..b12cc3ac 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/ClientController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/ClientController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/DeptController.java b/continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java similarity index 97% rename from continew-server/src/main/java/top/continew/admin/controller/system/DeptController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java index ec8c362a..50efa0ba 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/DeptController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/DictController.java b/continew-system/src/main/java/top/continew/admin/system/controller/DictController.java similarity index 97% rename from continew-server/src/main/java/top/continew/admin/controller/system/DictController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/DictController.java index eed46154..59dd7979 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/DictController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/DictController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/DictItemController.java b/continew-system/src/main/java/top/continew/admin/system/controller/DictItemController.java similarity index 97% rename from continew-server/src/main/java/top/continew/admin/controller/system/DictItemController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/DictItemController.java index 797fef2a..b6434084 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/DictItemController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/DictItemController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/FileController.java b/continew-system/src/main/java/top/continew/admin/system/controller/FileController.java similarity index 99% rename from continew-server/src/main/java/top/continew/admin/controller/system/FileController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/FileController.java index 03db9d3e..c6011ed4 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/FileController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/FileController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/LogController.java b/continew-system/src/main/java/top/continew/admin/system/controller/LogController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/system/LogController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/LogController.java index 5d7f32a0..80201d80 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/LogController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/LogController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.feiniaojin.gracefulresponse.api.ExcludeFromGracefulResponse; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/MenuController.java b/continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/system/MenuController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java index f11fe8ba..72354b45 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/MenuController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/NoticeController.java b/continew-system/src/main/java/top/continew/admin/system/controller/NoticeController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/system/NoticeController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/NoticeController.java index b1dd718c..bbc21dd9 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/NoticeController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/NoticeController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import cn.hutool.core.collection.CollUtil; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/OptionController.java b/continew-system/src/main/java/top/continew/admin/system/controller/OptionController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/system/OptionController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/OptionController.java index 0e985a81..5a577537 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/OptionController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/OptionController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/RoleController.java b/continew-system/src/main/java/top/continew/admin/system/controller/RoleController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/system/RoleController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/RoleController.java index a9b70b21..2139ad02 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/RoleController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/RoleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/SmsConfigController.java b/continew-system/src/main/java/top/continew/admin/system/controller/SmsConfigController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/system/SmsConfigController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/SmsConfigController.java index a170b3c6..16e11c72 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/SmsConfigController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/SmsConfigController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/SmsLogController.java b/continew-system/src/main/java/top/continew/admin/system/controller/SmsLogController.java similarity index 97% rename from continew-server/src/main/java/top/continew/admin/controller/system/SmsLogController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/SmsLogController.java index eb750c81..9117bbdf 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/SmsLogController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/SmsLogController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/StorageController.java b/continew-system/src/main/java/top/continew/admin/system/controller/StorageController.java similarity index 98% rename from continew-server/src/main/java/top/continew/admin/controller/system/StorageController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/StorageController.java index 51c88ea6..04f26bc2 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/StorageController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/StorageController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/UserController.java b/continew-system/src/main/java/top/continew/admin/system/controller/UserController.java similarity index 99% rename from continew-server/src/main/java/top/continew/admin/controller/system/UserController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/UserController.java index dd628adf..863a4362 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/UserController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/UserController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ReUtil; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/UserMessageController.java b/continew-system/src/main/java/top/continew/admin/system/controller/UserMessageController.java similarity index 99% rename from continew-server/src/main/java/top/continew/admin/controller/system/UserMessageController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/UserMessageController.java index 916ecb56..a3af0860 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/UserMessageController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/UserMessageController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/continew-server/src/main/java/top/continew/admin/controller/system/UserProfileController.java b/continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java similarity index 99% rename from continew-server/src/main/java/top/continew/admin/controller/system/UserProfileController.java rename to continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java index 3787796a..d1bb8879 100644 --- a/continew-server/src/main/java/top/continew/admin/controller/system/UserProfileController.java +++ b/continew-system/src/main/java/top/continew/admin/system/controller/UserProfileController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.controller.system; +package top.continew.admin.system.controller; import com.xkcoding.justauth.autoconfigure.JustAuthProperties; import io.swagger.v3.oas.annotations.Operation;