From 46df9001d4df7ca8c6540c9a09284c2d814057bc Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Tue, 25 Mar 2025 10:16:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../{ => configuration}/ConfigurationController.java | 4 ++-- .../{ => configuration}/EmailTemplateController.java | 4 ++-- .../{ => configuration}/EmailUsersController.java | 4 ++-- .../controller/{ => configuration}/I18nController.java | 4 ++-- .../controller/{ => configuration}/I18nTypeController.java | 4 ++-- .../controller/{ => configuration}/MenuIconController.java | 4 ++-- .../controller/{ => log}/UserLoginLogController.java | 4 ++-- .../controller/{ => message}/MessageController.java | 4 ++-- .../controller/{ => message}/MessageReceivedController.java | 4 ++-- .../controller/{ => message}/MessageTypeController.java | 4 ++-- .../{ => schedule}/ScheduleExecuteLogController.java | 4 ++-- .../controller/{ => schedule}/SchedulersController.java | 4 ++-- .../{ => schedule}/SchedulersGroupController.java | 4 ++-- .../services/controller/{ => system}/DeptController.java | 4 ++-- .../services/controller/{ => system}/FilesController.java | 4 ++-- .../services/controller/{ => system}/PowerController.java | 4 ++-- .../services/controller/{ => system}/RoleController.java | 4 ++-- .../controller/{ => system}/RolePowerController.java | 4 ++-- .../services/controller/{ => system}/RouterController.java | 4 ++-- .../controller/{ => system}/RouterRoleController.java | 4 ++-- .../services/controller/{ => system}/UserController.java | 4 ++-- .../controller/{ => system}/UserRoleController.java | 4 ++-- .../bunny/services/security/config/WebSecurityConfig.java | 2 +- .../services/security/filter/TokenLoginFilterService.java | 2 +- .../service/{ => configuration}/ConfigurationService.java | 2 +- .../service/{ => configuration}/EmailTemplateService.java | 2 +- .../service/{ => configuration}/EmailUsersService.java | 2 +- .../services/service/{ => configuration}/I18nService.java | 2 +- .../service/{ => configuration}/I18nTypeService.java | 2 +- .../service/{ => configuration}/MenuIconService.java | 2 +- .../{ => configuration}/impl/ConfigurationServiceImpl.java | 4 ++-- .../{ => configuration}/impl/EmailTemplateServiceImpl.java | 4 ++-- .../{ => configuration}/impl/EmailUsersServiceImpl.java | 4 ++-- .../service/{ => configuration}/impl/I18nServiceImpl.java | 4 ++-- .../{ => configuration}/impl/I18nTypeServiceImpl.java | 4 ++-- .../{ => configuration}/impl/MenuIconServiceImpl.java | 4 ++-- .../services/service/{ => log}/UserLoginLogService.java | 2 +- .../service/{ => log}/impl/UserLoginLogServiceImpl.java | 4 ++-- .../service/{ => message}/MessageReceivedService.java | 2 +- .../services/service/{ => message}/MessageService.java | 2 +- .../services/service/{ => message}/MessageTypeService.java | 2 +- .../{ => message}/impl/MessageReceivedServiceImpl.java | 4 ++-- .../service/{ => message}/impl/MessageServiceImpl.java | 6 +++--- .../service/{ => message}/impl/MessageTypeServiceImpl.java | 4 ++-- .../service/{ => schedule}/ScheduleExecuteLogService.java | 2 +- .../service/{ => schedule}/SchedulersGroupService.java | 2 +- .../services/service/{ => schedule}/SchedulersService.java | 2 +- .../{ => schedule}/impl/ScheduleExecuteLogServiceImpl.java | 4 ++-- .../{ => schedule}/impl/SchedulersGroupServiceImpl.java | 4 ++-- .../service/{ => schedule}/impl/SchedulersServiceImpl.java | 4 ++-- .../cn/bunny/services/service/{ => system}/DeptService.java | 2 +- .../bunny/services/service/{ => system}/FilesService.java | 2 +- .../bunny/services/service/{ => system}/PowerService.java | 2 +- .../services/service/{ => system}/RolePowerService.java | 2 +- .../cn/bunny/services/service/{ => system}/RoleService.java | 2 +- .../services/service/{ => system}/RouterRoleService.java | 2 +- .../bunny/services/service/{ => system}/RouterService.java | 2 +- .../services/service/{ => system}/UserDeptService.java | 2 +- .../services/service/{ => system}/UserRoleService.java | 2 +- .../cn/bunny/services/service/{ => system}/UserService.java | 4 ++-- .../services/service/{ => system}/impl/DeptServiceImpl.java | 4 ++-- .../service/{ => system}/impl/FilesServiceImpl.java | 4 ++-- .../service/{ => system}/impl/PowerServiceImpl.java | 4 ++-- .../service/{ => system}/impl/RolePowerServiceImpl.java | 4 ++-- .../services/service/{ => system}/impl/RoleServiceImpl.java | 4 ++-- .../service/{ => system}/impl/RouterRoleServiceImpl.java | 4 ++-- .../service/{ => system}/impl/RouterServiceImpl.java | 4 ++-- .../service/{ => system}/impl/UserDeptServiceImpl.java | 4 ++-- .../service/{ => system}/impl/UserRoleServiceImpl.java | 4 ++-- .../services/service/{ => system}/impl/UserServiceImpl.java | 6 +++--- 71 files changed, 120 insertions(+), 120 deletions(-) rename service/src/main/java/cn/bunny/services/controller/{ => configuration}/ConfigurationController.java (93%) rename service/src/main/java/cn/bunny/services/controller/{ => configuration}/EmailTemplateController.java (96%) rename service/src/main/java/cn/bunny/services/controller/{ => configuration}/EmailUsersController.java (97%) rename service/src/main/java/cn/bunny/services/controller/{ => configuration}/I18nController.java (96%) rename service/src/main/java/cn/bunny/services/controller/{ => configuration}/I18nTypeController.java (95%) rename service/src/main/java/cn/bunny/services/controller/{ => configuration}/MenuIconController.java (96%) rename service/src/main/java/cn/bunny/services/controller/{ => log}/UserLoginLogController.java (96%) rename service/src/main/java/cn/bunny/services/controller/{ => message}/MessageController.java (97%) rename service/src/main/java/cn/bunny/services/controller/{ => message}/MessageReceivedController.java (97%) rename service/src/main/java/cn/bunny/services/controller/{ => message}/MessageTypeController.java (96%) rename service/src/main/java/cn/bunny/services/controller/{ => schedule}/ScheduleExecuteLogController.java (95%) rename service/src/main/java/cn/bunny/services/controller/{ => schedule}/SchedulersController.java (97%) rename service/src/main/java/cn/bunny/services/controller/{ => schedule}/SchedulersGroupController.java (96%) rename service/src/main/java/cn/bunny/services/controller/{ => system}/DeptController.java (96%) rename service/src/main/java/cn/bunny/services/controller/{ => system}/FilesController.java (98%) rename service/src/main/java/cn/bunny/services/controller/{ => system}/PowerController.java (97%) rename service/src/main/java/cn/bunny/services/controller/{ => system}/RoleController.java (96%) rename service/src/main/java/cn/bunny/services/controller/{ => system}/RolePowerController.java (93%) rename service/src/main/java/cn/bunny/services/controller/{ => system}/RouterController.java (97%) rename service/src/main/java/cn/bunny/services/controller/{ => system}/RouterRoleController.java (95%) rename service/src/main/java/cn/bunny/services/controller/{ => system}/UserController.java (98%) rename service/src/main/java/cn/bunny/services/controller/{ => system}/UserRoleController.java (92%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/ConfigurationService.java (89%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/EmailTemplateService.java (96%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/EmailUsersService.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/I18nService.java (96%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/I18nTypeService.java (95%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/MenuIconService.java (96%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/impl/ConfigurationServiceImpl.java (95%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/impl/EmailTemplateServiceImpl.java (98%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/impl/EmailUsersServiceImpl.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/impl/I18nServiceImpl.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/impl/I18nTypeServiceImpl.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => configuration}/impl/MenuIconServiceImpl.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => log}/UserLoginLogService.java (96%) rename service/src/main/java/cn/bunny/services/service/{ => log}/impl/UserLoginLogServiceImpl.java (96%) rename service/src/main/java/cn/bunny/services/service/{ => message}/MessageReceivedService.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => message}/MessageService.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => message}/MessageTypeService.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => message}/impl/MessageReceivedServiceImpl.java (98%) rename service/src/main/java/cn/bunny/services/service/{ => message}/impl/MessageServiceImpl.java (98%) rename service/src/main/java/cn/bunny/services/service/{ => message}/impl/MessageTypeServiceImpl.java (96%) rename service/src/main/java/cn/bunny/services/service/{ => schedule}/ScheduleExecuteLogService.java (95%) rename service/src/main/java/cn/bunny/services/service/{ => schedule}/SchedulersGroupService.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => schedule}/SchedulersService.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => schedule}/impl/ScheduleExecuteLogServiceImpl.java (93%) rename service/src/main/java/cn/bunny/services/service/{ => schedule}/impl/SchedulersGroupServiceImpl.java (96%) rename service/src/main/java/cn/bunny/services/service/{ => schedule}/impl/SchedulersServiceImpl.java (98%) rename service/src/main/java/cn/bunny/services/service/{ => system}/DeptService.java (96%) rename service/src/main/java/cn/bunny/services/service/{ => system}/FilesService.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => system}/PowerService.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => system}/RolePowerService.java (94%) rename service/src/main/java/cn/bunny/services/service/{ => system}/RoleService.java (96%) rename service/src/main/java/cn/bunny/services/service/{ => system}/RouterRoleService.java (95%) rename service/src/main/java/cn/bunny/services/service/{ => system}/RouterService.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => system}/UserDeptService.java (86%) rename service/src/main/java/cn/bunny/services/service/{ => system}/UserRoleService.java (93%) rename service/src/main/java/cn/bunny/services/service/{ => system}/UserService.java (98%) rename service/src/main/java/cn/bunny/services/service/{ => system}/impl/DeptServiceImpl.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => system}/impl/FilesServiceImpl.java (98%) rename service/src/main/java/cn/bunny/services/service/{ => system}/impl/PowerServiceImpl.java (98%) rename service/src/main/java/cn/bunny/services/service/{ => system}/impl/RolePowerServiceImpl.java (96%) rename service/src/main/java/cn/bunny/services/service/{ => system}/impl/RoleServiceImpl.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => system}/impl/RouterRoleServiceImpl.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => system}/impl/RouterServiceImpl.java (98%) rename service/src/main/java/cn/bunny/services/service/{ => system}/impl/UserDeptServiceImpl.java (80%) rename service/src/main/java/cn/bunny/services/service/{ => system}/impl/UserRoleServiceImpl.java (97%) rename service/src/main/java/cn/bunny/services/service/{ => system}/impl/UserServiceImpl.java (99%) diff --git a/pom.xml b/pom.xml index 0667940..7f78efc 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.2 + 3.4.3 cn.bunny @@ -88,7 +88,7 @@ dynamic-datasource-spring-boot3-starter ${dynamic.datasource.version} - + com.github.xiaoymin knife4j-openapi3-jakarta-spring-boot-starter diff --git a/service/src/main/java/cn/bunny/services/controller/ConfigurationController.java b/service/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java similarity index 93% rename from service/src/main/java/cn/bunny/services/controller/ConfigurationController.java rename to service/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java index d0ca3b5..317d997 100644 --- a/service/src/main/java/cn/bunny/services/controller/ConfigurationController.java +++ b/service/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java @@ -1,10 +1,10 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.configuration; import cn.bunny.dao.dto.system.configuration.WebConfigurationDto; import cn.bunny.dao.entity.configuration.WebConfiguration; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; -import cn.bunny.services.service.ConfigurationService; +import cn.bunny.services.service.configuration.ConfigurationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java b/service/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java similarity index 96% rename from service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java rename to service/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java index da8dcf1..d08d74e 100644 --- a/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java +++ b/service/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.configuration; import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; @@ -8,7 +8,7 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailTemplateVo; -import cn.bunny.services.service.EmailTemplateService; +import cn.bunny.services.service.configuration.EmailTemplateService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java b/service/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java similarity index 97% rename from service/src/main/java/cn/bunny/services/controller/EmailUsersController.java rename to service/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java index 8e37ec8..8742c7f 100644 --- a/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java +++ b/service/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.configuration; import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto; import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto; @@ -9,7 +9,7 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailUsersVo; -import cn.bunny.services.service.EmailUsersService; +import cn.bunny.services.service.configuration.EmailUsersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/I18nController.java b/service/src/main/java/cn/bunny/services/controller/configuration/I18nController.java similarity index 96% rename from service/src/main/java/cn/bunny/services/controller/I18nController.java rename to service/src/main/java/cn/bunny/services/controller/configuration/I18nController.java index 11891b6..2af3159 100644 --- a/service/src/main/java/cn/bunny/services/controller/I18nController.java +++ b/service/src/main/java/cn/bunny/services/controller/configuration/I18nController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.configuration; import cn.bunny.dao.dto.i18n.I18nAddDto; import cn.bunny.dao.dto.i18n.I18nDto; @@ -8,7 +8,7 @@ import cn.bunny.dao.vo.i18n.I18nVo; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; -import cn.bunny.services.service.I18nService; +import cn.bunny.services.service.configuration.I18nService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java b/service/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java similarity index 95% rename from service/src/main/java/cn/bunny/services/controller/I18nTypeController.java rename to service/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java index 193540c..0e2a000 100644 --- a/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java +++ b/service/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.configuration; import cn.bunny.dao.dto.i18n.I18nTypeAddDto; import cn.bunny.dao.dto.i18n.I18nTypeDto; @@ -6,7 +6,7 @@ import cn.bunny.dao.dto.i18n.I18nTypeUpdateDto; import cn.bunny.dao.vo.i18n.I18nTypeVo; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; -import cn.bunny.services.service.I18nTypeService; +import cn.bunny.services.service.configuration.I18nTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/controller/MenuIconController.java b/service/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java similarity index 96% rename from service/src/main/java/cn/bunny/services/controller/MenuIconController.java rename to service/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java index df93e3e..b7217e4 100644 --- a/service/src/main/java/cn/bunny/services/controller/MenuIconController.java +++ b/service/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.configuration; import cn.bunny.dao.dto.system.menuIcon.MenuIconAddDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconDto; @@ -8,7 +8,7 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.MenuIconVo; -import cn.bunny.services.service.MenuIconService; +import cn.bunny.services.service.configuration.MenuIconService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java b/service/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java similarity index 96% rename from service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java rename to service/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java index ce961c7..512c190 100644 --- a/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.log; import cn.bunny.dao.dto.log.UserLoginLogDto; import cn.bunny.dao.entity.log.UserLoginLog; @@ -7,7 +7,7 @@ import cn.bunny.dao.vo.log.UserLoginLogVo; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; -import cn.bunny.services.service.UserLoginLogService; +import cn.bunny.services.service.log.UserLoginLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/MessageController.java b/service/src/main/java/cn/bunny/services/controller/message/MessageController.java similarity index 97% rename from service/src/main/java/cn/bunny/services/controller/MessageController.java rename to service/src/main/java/cn/bunny/services/controller/message/MessageController.java index 9da9ccc..8bab4be 100644 --- a/service/src/main/java/cn/bunny/services/controller/MessageController.java +++ b/service/src/main/java/cn/bunny/services/controller/message/MessageController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.message; import cn.bunny.dao.dto.system.message.MessageAddDto; import cn.bunny.dao.dto.system.message.MessageDto; @@ -10,7 +10,7 @@ import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.message.MessageDetailVo; import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo; import cn.bunny.dao.vo.system.message.MessageVo; -import cn.bunny.services.service.MessageService; +import cn.bunny.services.service.message.MessageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java b/service/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java similarity index 97% rename from service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java rename to service/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java index 2395d4f..0ff5344 100644 --- a/service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java +++ b/service/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.message; import cn.bunny.dao.dto.system.message.MessageReceivedDto; import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto; @@ -9,7 +9,7 @@ import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo; import cn.bunny.dao.vo.system.message.MessageUserVo; -import cn.bunny.services.service.MessageReceivedService; +import cn.bunny.services.service.message.MessageReceivedService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/MessageTypeController.java b/service/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java similarity index 96% rename from service/src/main/java/cn/bunny/services/controller/MessageTypeController.java rename to service/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java index 8f13c5d..f25cfd0 100644 --- a/service/src/main/java/cn/bunny/services/controller/MessageTypeController.java +++ b/service/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.message; import cn.bunny.dao.dto.system.message.MessageTypeAddDto; import cn.bunny.dao.dto.system.message.MessageTypeDto; @@ -8,7 +8,7 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.message.MessageTypeVo; -import cn.bunny.services.service.MessageTypeService; +import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java b/service/src/main/java/cn/bunny/services/controller/schedule/ScheduleExecuteLogController.java similarity index 95% rename from service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java rename to service/src/main/java/cn/bunny/services/controller/schedule/ScheduleExecuteLogController.java index c4509f4..e403af9 100644 --- a/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/schedule/ScheduleExecuteLogController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.schedule; import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; import cn.bunny.dao.entity.log.ScheduleExecuteLog; @@ -6,7 +6,7 @@ import cn.bunny.dao.vo.log.QuartzExecuteLogVo; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; -import cn.bunny.services.service.ScheduleExecuteLogService; +import cn.bunny.services.service.schedule.ScheduleExecuteLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/SchedulersController.java b/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java similarity index 97% rename from service/src/main/java/cn/bunny/services/controller/SchedulersController.java rename to service/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java index 035d2b1..a9bff81 100644 --- a/service/src/main/java/cn/bunny/services/controller/SchedulersController.java +++ b/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.schedule; import cn.bunny.dao.dto.quartz.SchedulersOperationDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersAddDto; @@ -9,7 +9,7 @@ import cn.bunny.dao.vo.quartz.SchedulersVo; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; -import cn.bunny.services.service.SchedulersService; +import cn.bunny.services.service.schedule.SchedulersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java b/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java similarity index 96% rename from service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java rename to service/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java index 1540ac6..fce2d21 100644 --- a/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java +++ b/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.schedule; import cn.bunny.dao.dto.quartz.group.SchedulersGroupAddDto; import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; @@ -8,7 +8,7 @@ import cn.bunny.dao.vo.quartz.SchedulersGroupVo; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; -import cn.bunny.services.service.SchedulersGroupService; +import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/DeptController.java b/service/src/main/java/cn/bunny/services/controller/system/DeptController.java similarity index 96% rename from service/src/main/java/cn/bunny/services/controller/DeptController.java rename to service/src/main/java/cn/bunny/services/controller/system/DeptController.java index 84974f9..944adc9 100644 --- a/service/src/main/java/cn/bunny/services/controller/DeptController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/DeptController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.dept.DeptAddDto; import cn.bunny.dao.dto.system.dept.DeptDto; @@ -8,7 +8,7 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.DeptVo; -import cn.bunny.services.service.DeptService; +import cn.bunny.services.service.system.DeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/FilesController.java b/service/src/main/java/cn/bunny/services/controller/system/FilesController.java similarity index 98% rename from service/src/main/java/cn/bunny/services/controller/FilesController.java rename to service/src/main/java/cn/bunny/services/controller/system/FilesController.java index 5790c79..70b7dee 100644 --- a/service/src/main/java/cn/bunny/services/controller/FilesController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/FilesController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.system; import cn.bunny.dao.constant.MinioConstant; import cn.bunny.dao.dto.system.files.FileUploadDto; @@ -11,7 +11,7 @@ import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.files.FileInfoVo; import cn.bunny.dao.vo.system.files.FilesVo; -import cn.bunny.services.service.FilesService; +import cn.bunny.services.service.system.FilesService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/PowerController.java b/service/src/main/java/cn/bunny/services/controller/system/PowerController.java similarity index 97% rename from service/src/main/java/cn/bunny/services/controller/PowerController.java rename to service/src/main/java/cn/bunny/services/controller/system/PowerController.java index 48d8436..cb07c08 100644 --- a/service/src/main/java/cn/bunny/services/controller/PowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/PowerController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto; import cn.bunny.dao.dto.system.rolePower.power.PowerDto; @@ -9,7 +9,7 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.rolePower.PowerVo; -import cn.bunny.services.service.PowerService; +import cn.bunny.services.service.system.PowerService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/RoleController.java b/service/src/main/java/cn/bunny/services/controller/system/RoleController.java similarity index 96% rename from service/src/main/java/cn/bunny/services/controller/RoleController.java rename to service/src/main/java/cn/bunny/services/controller/system/RoleController.java index 75df222..874ffb0 100644 --- a/service/src/main/java/cn/bunny/services/controller/RoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/RoleController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto; import cn.bunny.dao.dto.system.rolePower.role.RoleDto; @@ -8,7 +8,7 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.rolePower.RoleVo; -import cn.bunny.services.service.RoleService; +import cn.bunny.services.service.system.RoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/RolePowerController.java b/service/src/main/java/cn/bunny/services/controller/system/RolePowerController.java similarity index 93% rename from service/src/main/java/cn/bunny/services/controller/RolePowerController.java rename to service/src/main/java/cn/bunny/services/controller/system/RolePowerController.java index d8b549f..9aa43ab 100644 --- a/service/src/main/java/cn/bunny/services/controller/RolePowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/RolePowerController.java @@ -1,8 +1,8 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto; import cn.bunny.dao.vo.result.Result; -import cn.bunny.services.service.RolePowerService; +import cn.bunny.services.service.system.RolePowerService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/controller/RouterController.java b/service/src/main/java/cn/bunny/services/controller/system/RouterController.java similarity index 97% rename from service/src/main/java/cn/bunny/services/controller/RouterController.java rename to service/src/main/java/cn/bunny/services/controller/system/RouterController.java index 08d1209..e8b306f 100644 --- a/service/src/main/java/cn/bunny/services/controller/RouterController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/RouterController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.router.RouterAddDto; import cn.bunny.dao.dto.system.router.RouterManageDto; @@ -10,7 +10,7 @@ import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.router.RouterManageVo; import cn.bunny.dao.vo.system.router.UserRouterVo; -import cn.bunny.services.service.RouterService; +import cn.bunny.services.service.system.RouterService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/RouterRoleController.java b/service/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java similarity index 95% rename from service/src/main/java/cn/bunny/services/controller/RouterRoleController.java rename to service/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java index 7c5723b..55b6a81 100644 --- a/service/src/main/java/cn/bunny/services/controller/RouterRoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java @@ -1,8 +1,8 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto; import cn.bunny.dao.vo.result.Result; -import cn.bunny.services.service.RouterRoleService; +import cn.bunny.services.service.system.RouterRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/cn/bunny/services/controller/UserController.java b/service/src/main/java/cn/bunny/services/controller/system/UserController.java similarity index 98% rename from service/src/main/java/cn/bunny/services/controller/UserController.java rename to service/src/main/java/cn/bunny/services/controller/system/UserController.java index 850fcd5..4b1e40d 100644 --- a/service/src/main/java/cn/bunny/services/controller/UserController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/UserController.java @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.user.*; import cn.bunny.dao.entity.system.AdminUser; @@ -6,7 +6,7 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.*; -import cn.bunny.services.service.UserService; +import cn.bunny.services.service.system.UserService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/UserRoleController.java b/service/src/main/java/cn/bunny/services/controller/system/UserRoleController.java similarity index 92% rename from service/src/main/java/cn/bunny/services/controller/UserRoleController.java rename to service/src/main/java/cn/bunny/services/controller/system/UserRoleController.java index 411fcab..b1c1a87 100644 --- a/service/src/main/java/cn/bunny/services/controller/UserRoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/UserRoleController.java @@ -1,8 +1,8 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.user.AssignRolesToUsersDto; import cn.bunny.dao.vo.result.Result; -import cn.bunny.services.service.UserRoleService; +import cn.bunny.services.service.system.UserRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java b/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java index 3cfac3e..fb45663 100644 --- a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java +++ b/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java @@ -7,7 +7,7 @@ import cn.bunny.services.security.custom.CustomAuthorizationManagerServiceImpl; import cn.bunny.services.security.filter.TokenLoginFilterService; import cn.bunny.services.security.handelr.SecurityAccessDeniedHandler; import cn.bunny.services.security.handelr.SecurityAuthenticationEntryPoint; -import cn.bunny.services.service.UserService; +import cn.bunny.services.service.system.UserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java index 9d5a8ed..4894d7d 100644 --- a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java +++ b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java @@ -6,7 +6,7 @@ import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.security.handelr.SecurityAuthenticationFailureHandler; import cn.bunny.services.security.handelr.SecurityAuthenticationSuccessHandler; -import cn.bunny.services.service.UserService; +import cn.bunny.services.service.system.UserService; import cn.bunny.services.utils.ResponseUtil; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.FilterChain; diff --git a/service/src/main/java/cn/bunny/services/service/ConfigurationService.java b/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java similarity index 89% rename from service/src/main/java/cn/bunny/services/service/ConfigurationService.java rename to service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java index 38d3162..d7812c6 100644 --- a/service/src/main/java/cn/bunny/services/service/ConfigurationService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.configuration; import cn.bunny.dao.dto.system.configuration.WebConfigurationDto; import cn.bunny.dao.entity.configuration.WebConfiguration; diff --git a/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java b/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/EmailTemplateService.java rename to service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java index ec2962e..a1e4974 100644 --- a/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.configuration; import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; diff --git a/service/src/main/java/cn/bunny/services/service/EmailUsersService.java b/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/EmailUsersService.java rename to service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java index 2add2eb..d6ef608 100644 --- a/service/src/main/java/cn/bunny/services/service/EmailUsersService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.configuration; import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto; import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto; diff --git a/service/src/main/java/cn/bunny/services/service/I18nService.java b/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/I18nService.java rename to service/src/main/java/cn/bunny/services/service/configuration/I18nService.java index e4a0a59..6ae7bed 100644 --- a/service/src/main/java/cn/bunny/services/service/I18nService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.configuration; import cn.bunny.dao.dto.i18n.I18nAddDto; import cn.bunny.dao.dto.i18n.I18nDto; diff --git a/service/src/main/java/cn/bunny/services/service/I18nTypeService.java b/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java similarity index 95% rename from service/src/main/java/cn/bunny/services/service/I18nTypeService.java rename to service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java index 449dfc0..3338048 100644 --- a/service/src/main/java/cn/bunny/services/service/I18nTypeService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.configuration; import cn.bunny.dao.dto.i18n.I18nTypeAddDto; import cn.bunny.dao.dto.i18n.I18nTypeDto; diff --git a/service/src/main/java/cn/bunny/services/service/MenuIconService.java b/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/MenuIconService.java rename to service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java index 0da1442..ef6b2d7 100644 --- a/service/src/main/java/cn/bunny/services/service/MenuIconService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.configuration; import cn.bunny.dao.dto.system.menuIcon.MenuIconAddDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconDto; diff --git a/service/src/main/java/cn/bunny/services/service/impl/ConfigurationServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java similarity index 95% rename from service/src/main/java/cn/bunny/services/service/impl/ConfigurationServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java index befe577..a3b6def 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/ConfigurationServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java @@ -1,11 +1,11 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.configuration.impl; import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.dto.system.configuration.WebConfigurationDto; import cn.bunny.dao.entity.configuration.WebConfiguration; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; -import cn.bunny.services.service.ConfigurationService; +import cn.bunny.services.service.configuration.ConfigurationService; import com.alibaba.fastjson2.JSON; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java similarity index 98% rename from service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java index b60c0ab..f482691 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.configuration.impl; import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; @@ -10,7 +10,7 @@ import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailTemplateVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.EmailTemplateMapper; -import cn.bunny.services.service.EmailTemplateService; +import cn.bunny.services.service.configuration.EmailTemplateService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java index ffc884d..a5b23ea 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.configuration.impl; import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto; import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto; @@ -10,7 +10,7 @@ import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailUsersVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.EmailUsersMapper; -import cn.bunny.services.service.EmailUsersService; +import cn.bunny.services.service.configuration.EmailUsersService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java index 6e31717..1165e3c 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.configuration.impl; import cn.bunny.dao.dto.i18n.I18nAddDto; import cn.bunny.dao.dto.i18n.I18nDto; @@ -11,7 +11,7 @@ import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.I18nMapper; import cn.bunny.services.mapper.I18nTypeMapper; -import cn.bunny.services.service.I18nService; +import cn.bunny.services.service.configuration.I18nService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java index b6abdb4..7efb1fd 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.configuration.impl; import cn.bunny.dao.dto.i18n.I18nTypeAddDto; import cn.bunny.dao.dto.i18n.I18nTypeDto; @@ -8,7 +8,7 @@ import cn.bunny.dao.vo.i18n.I18nTypeVo; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.I18nTypeMapper; -import cn.bunny.services.service.I18nTypeService; +import cn.bunny.services.service.configuration.I18nTypeService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.BeanUtils; diff --git a/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java index 6207d5b..23ff8ce 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.configuration.impl; import cn.bunny.dao.dto.system.menuIcon.MenuIconAddDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconDto; @@ -9,7 +9,7 @@ import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.MenuIconVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.MenuIconMapper; -import cn.bunny.services.service.MenuIconService; +import cn.bunny.services.service.configuration.MenuIconService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/UserLoginLogService.java b/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/UserLoginLogService.java rename to service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java index c637c61..57085a9 100644 --- a/service/src/main/java/cn/bunny/services/service/UserLoginLogService.java +++ b/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.log; import cn.bunny.dao.dto.log.UserLoginLogDto; import cn.bunny.dao.entity.log.UserLoginLog; diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java index 4d7689a..82fd503 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.log.impl; import cn.bunny.dao.dto.log.UserLoginLogDto; import cn.bunny.dao.entity.log.UserLoginLog; @@ -7,7 +7,7 @@ import cn.bunny.dao.vo.log.UserLoginLogVo; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.services.context.BaseContext; import cn.bunny.services.mapper.UserLoginLogMapper; -import cn.bunny.services.service.UserLoginLogService; +import cn.bunny.services.service.log.UserLoginLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/MessageReceivedService.java b/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/MessageReceivedService.java rename to service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java index 5d6eb29..e5c7c2b 100644 --- a/service/src/main/java/cn/bunny/services/service/MessageReceivedService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.message; import cn.bunny.dao.dto.system.message.MessageReceivedDto; import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto; diff --git a/service/src/main/java/cn/bunny/services/service/MessageService.java b/service/src/main/java/cn/bunny/services/service/message/MessageService.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/MessageService.java rename to service/src/main/java/cn/bunny/services/service/message/MessageService.java index 81b09f9..3c89e85 100644 --- a/service/src/main/java/cn/bunny/services/service/MessageService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.message; import cn.bunny.dao.dto.system.message.MessageAddDto; import cn.bunny.dao.dto.system.message.MessageDto; diff --git a/service/src/main/java/cn/bunny/services/service/MessageTypeService.java b/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/MessageTypeService.java rename to service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java index 963302d..fdfcec7 100644 --- a/service/src/main/java/cn/bunny/services/service/MessageTypeService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.message; import cn.bunny.dao.dto.system.message.MessageTypeAddDto; import cn.bunny.dao.dto.system.message.MessageTypeDto; diff --git a/service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java similarity index 98% rename from service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java index 29120d1..97039e4 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.message.impl; import cn.bunny.dao.dto.system.message.MessageReceivedDto; import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto; @@ -12,7 +12,7 @@ import cn.bunny.dao.vo.system.message.MessageUserVo; import cn.bunny.services.context.BaseContext; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.MessageReceivedMapper; -import cn.bunny.services.service.MessageReceivedService; +import cn.bunny.services.service.message.MessageReceivedService; import cn.bunny.services.utils.UserUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java similarity index 98% rename from service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java index ef79867..b323a71 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.message.impl; import cn.bunny.dao.dto.system.message.MessageAddDto; import cn.bunny.dao.dto.system.message.MessageDto; @@ -17,8 +17,8 @@ import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.MessageMapper; import cn.bunny.services.mapper.MessageReceivedMapper; import cn.bunny.services.mapper.UserMapper; -import cn.bunny.services.service.MessageReceivedService; -import cn.bunny.services.service.MessageService; +import cn.bunny.services.service.message.MessageReceivedService; +import cn.bunny.services.service.message.MessageService; import cn.bunny.services.utils.UserUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/impl/MessageTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/impl/MessageTypeServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java index 9d6b1af..e83b207 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MessageTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.message.impl; import cn.bunny.dao.dto.system.message.MessageTypeAddDto; import cn.bunny.dao.dto.system.message.MessageTypeDto; @@ -7,7 +7,7 @@ import cn.bunny.dao.entity.system.MessageType; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.message.MessageTypeVo; import cn.bunny.services.mapper.MessageTypeMapper; -import cn.bunny.services.service.MessageTypeService; +import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/ScheduleExecuteLogService.java b/service/src/main/java/cn/bunny/services/service/schedule/ScheduleExecuteLogService.java similarity index 95% rename from service/src/main/java/cn/bunny/services/service/ScheduleExecuteLogService.java rename to service/src/main/java/cn/bunny/services/service/schedule/ScheduleExecuteLogService.java index d7b0d4e..ca6ae7c 100644 --- a/service/src/main/java/cn/bunny/services/service/ScheduleExecuteLogService.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/ScheduleExecuteLogService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.schedule; import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; import cn.bunny.dao.entity.log.ScheduleExecuteLog; diff --git a/service/src/main/java/cn/bunny/services/service/SchedulersGroupService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/SchedulersGroupService.java rename to service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java index 8c8bbda..04e0780 100644 --- a/service/src/main/java/cn/bunny/services/service/SchedulersGroupService.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.schedule; import cn.bunny.dao.dto.quartz.group.SchedulersGroupAddDto; import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; diff --git a/service/src/main/java/cn/bunny/services/service/SchedulersService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/SchedulersService.java rename to service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java index d723de1..7a31c75 100644 --- a/service/src/main/java/cn/bunny/services/service/SchedulersService.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.schedule; import cn.bunny.dao.dto.quartz.SchedulersOperationDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersAddDto; diff --git a/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/ScheduleExecuteLogServiceImpl.java similarity index 93% rename from service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/schedule/impl/ScheduleExecuteLogServiceImpl.java index 5791bc3..7abd217 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/ScheduleExecuteLogServiceImpl.java @@ -1,11 +1,11 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.schedule.impl; import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; import cn.bunny.dao.entity.log.ScheduleExecuteLog; import cn.bunny.dao.vo.log.QuartzExecuteLogVo; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.services.mapper.ScheduleExecuteLogMapper; -import cn.bunny.services.service.ScheduleExecuteLogService; +import cn.bunny.services.service.schedule.ScheduleExecuteLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java index a461c5c..99e986b 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.schedule.impl; import cn.bunny.dao.dto.quartz.group.SchedulersGroupAddDto; import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; @@ -7,7 +7,7 @@ import cn.bunny.dao.entity.quartz.SchedulersGroup; import cn.bunny.dao.vo.quartz.SchedulersGroupVo; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.services.mapper.SchedulersGroupMapper; -import cn.bunny.services.service.SchedulersGroupService; +import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java similarity index 98% rename from service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java index dbb8f54..cc67fd7 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.schedule.impl; import cn.bunny.dao.dto.quartz.SchedulersOperationDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersAddDto; @@ -12,7 +12,7 @@ import cn.bunny.services.aop.AnnotationScanner; import cn.bunny.services.aop.annotation.QuartzSchedulers; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.SchedulersMapper; -import cn.bunny.services.service.SchedulersService; +import cn.bunny.services.service.schedule.SchedulersService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/DeptService.java b/service/src/main/java/cn/bunny/services/service/system/DeptService.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/DeptService.java rename to service/src/main/java/cn/bunny/services/service/system/DeptService.java index 9a6212d..ab81428 100644 --- a/service/src/main/java/cn/bunny/services/service/DeptService.java +++ b/service/src/main/java/cn/bunny/services/service/system/DeptService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.dept.DeptAddDto; import cn.bunny.dao.dto.system.dept.DeptDto; diff --git a/service/src/main/java/cn/bunny/services/service/FilesService.java b/service/src/main/java/cn/bunny/services/service/system/FilesService.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/FilesService.java rename to service/src/main/java/cn/bunny/services/service/system/FilesService.java index 79e5315..dadaf8a 100644 --- a/service/src/main/java/cn/bunny/services/service/FilesService.java +++ b/service/src/main/java/cn/bunny/services/service/system/FilesService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.files.FileUploadDto; import cn.bunny.dao.dto.system.files.FilesAddDto; diff --git a/service/src/main/java/cn/bunny/services/service/PowerService.java b/service/src/main/java/cn/bunny/services/service/system/PowerService.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/PowerService.java rename to service/src/main/java/cn/bunny/services/service/system/PowerService.java index 0969700..46056ca 100644 --- a/service/src/main/java/cn/bunny/services/service/PowerService.java +++ b/service/src/main/java/cn/bunny/services/service/system/PowerService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto; import cn.bunny.dao.dto.system.rolePower.power.PowerDto; diff --git a/service/src/main/java/cn/bunny/services/service/RolePowerService.java b/service/src/main/java/cn/bunny/services/service/system/RolePowerService.java similarity index 94% rename from service/src/main/java/cn/bunny/services/service/RolePowerService.java rename to service/src/main/java/cn/bunny/services/service/system/RolePowerService.java index c96ac0e..9f05c6a 100644 --- a/service/src/main/java/cn/bunny/services/service/RolePowerService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RolePowerService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto; import cn.bunny.dao.entity.system.RolePower; diff --git a/service/src/main/java/cn/bunny/services/service/RoleService.java b/service/src/main/java/cn/bunny/services/service/system/RoleService.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/RoleService.java rename to service/src/main/java/cn/bunny/services/service/system/RoleService.java index 9ce7d40..1899c83 100644 --- a/service/src/main/java/cn/bunny/services/service/RoleService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RoleService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto; import cn.bunny.dao.dto.system.rolePower.role.RoleDto; diff --git a/service/src/main/java/cn/bunny/services/service/RouterRoleService.java b/service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java similarity index 95% rename from service/src/main/java/cn/bunny/services/service/RouterRoleService.java rename to service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java index d34ed19..0d6569c 100644 --- a/service/src/main/java/cn/bunny/services/service/RouterRoleService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto; import cn.bunny.dao.entity.system.RouterRole; diff --git a/service/src/main/java/cn/bunny/services/service/RouterService.java b/service/src/main/java/cn/bunny/services/service/system/RouterService.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/RouterService.java rename to service/src/main/java/cn/bunny/services/service/system/RouterService.java index c9f58ed..161b90c 100644 --- a/service/src/main/java/cn/bunny/services/service/RouterService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RouterService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.router.RouterAddDto; import cn.bunny.dao.dto.system.router.RouterManageDto; diff --git a/service/src/main/java/cn/bunny/services/service/UserDeptService.java b/service/src/main/java/cn/bunny/services/service/system/UserDeptService.java similarity index 86% rename from service/src/main/java/cn/bunny/services/service/UserDeptService.java rename to service/src/main/java/cn/bunny/services/service/system/UserDeptService.java index f10ffff..7f26018 100644 --- a/service/src/main/java/cn/bunny/services/service/UserDeptService.java +++ b/service/src/main/java/cn/bunny/services/service/system/UserDeptService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.system; import cn.bunny.dao.entity.system.UserDept; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/UserRoleService.java b/service/src/main/java/cn/bunny/services/service/system/UserRoleService.java similarity index 93% rename from service/src/main/java/cn/bunny/services/service/UserRoleService.java rename to service/src/main/java/cn/bunny/services/service/system/UserRoleService.java index 5a278cd..d2e1018 100644 --- a/service/src/main/java/cn/bunny/services/service/UserRoleService.java +++ b/service/src/main/java/cn/bunny/services/service/system/UserRoleService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.user.AssignRolesToUsersDto; import cn.bunny.dao.entity.system.UserRole; diff --git a/service/src/main/java/cn/bunny/services/service/UserService.java b/service/src/main/java/cn/bunny/services/service/system/UserService.java similarity index 98% rename from service/src/main/java/cn/bunny/services/service/UserService.java rename to service/src/main/java/cn/bunny/services/service/system/UserService.java index 0dacce1..ebfc0c2 100644 --- a/service/src/main/java/cn/bunny/services/service/UserService.java +++ b/service/src/main/java/cn/bunny/services/service/system/UserService.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service; +package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.user.*; import cn.bunny.dao.entity.system.AdminUser; @@ -21,7 +21,7 @@ import java.util.List; * @since 2024-09-26 */ public interface UserService extends IService { - + /** * 前台用户登录接口 * diff --git a/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java index 6af3c06..e26b2cd 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.system.impl; import cn.bunny.dao.dto.system.dept.DeptAddDto; import cn.bunny.dao.dto.system.dept.DeptDto; @@ -10,7 +10,7 @@ import cn.bunny.dao.vo.system.DeptVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.DeptMapper; import cn.bunny.services.mapper.UserDeptMapper; -import cn.bunny.services.service.DeptService; +import cn.bunny.services.service.system.DeptService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java similarity index 98% rename from service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java index abda9c7..fdb71ab 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.system.impl; import cn.bunny.dao.dto.system.files.FileUploadDto; import cn.bunny.dao.dto.system.files.FilesAddDto; @@ -13,7 +13,7 @@ import cn.bunny.dao.vo.system.files.FilesVo; import cn.bunny.services.context.BaseContext; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.FilesMapper; -import cn.bunny.services.service.FilesService; +import cn.bunny.services.service.system.FilesService; import cn.bunny.services.utils.FileUtil; import cn.bunny.services.utils.minio.MinioProperties; import cn.bunny.services.utils.minio.MinioUtil; diff --git a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java similarity index 98% rename from service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java index d5e7e4d..58d680d 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.system.impl; import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto; import cn.bunny.dao.dto.system.rolePower.power.PowerDto; @@ -11,7 +11,7 @@ import cn.bunny.dao.vo.system.rolePower.PowerVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.PowerMapper; import cn.bunny.services.mapper.RolePowerMapper; -import cn.bunny.services.service.PowerService; +import cn.bunny.services.service.system.PowerService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RolePowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/impl/RolePowerServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java index 25fed3e..1dd1300 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RolePowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.system.impl; import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto; import cn.bunny.dao.entity.system.AdminUser; @@ -7,7 +7,7 @@ import cn.bunny.dao.entity.system.UserRole; import cn.bunny.services.mapper.RolePowerMapper; import cn.bunny.services.mapper.UserMapper; import cn.bunny.services.mapper.UserRoleMapper; -import cn.bunny.services.service.RolePowerService; +import cn.bunny.services.service.system.RolePowerService; import cn.bunny.services.utils.RoleUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java index 6188dae..458d02d 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.system.impl; import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto; import cn.bunny.dao.dto.system.rolePower.role.RoleDto; @@ -13,7 +13,7 @@ import cn.bunny.services.mapper.RoleMapper; import cn.bunny.services.mapper.RolePowerMapper; import cn.bunny.services.mapper.RouterRoleMapper; import cn.bunny.services.mapper.UserRoleMapper; -import cn.bunny.services.service.RoleService; +import cn.bunny.services.service.system.RoleService; import cn.bunny.services.utils.RoleUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java index 5b2c8d1..ac06655 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java @@ -1,11 +1,11 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.system.impl; import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto; import cn.bunny.dao.entity.system.RouterRole; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.RouterRoleMapper; -import cn.bunny.services.service.RouterRoleService; +import cn.bunny.services.service.system.RouterRoleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java similarity index 98% rename from service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java index 31439ce..0db2bc6 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.system.impl; import cn.bunny.dao.dto.system.router.RouterAddDto; import cn.bunny.dao.dto.system.router.RouterManageDto; @@ -19,7 +19,7 @@ import cn.bunny.services.mapper.RoleMapper; import cn.bunny.services.mapper.RolePowerMapper; import cn.bunny.services.mapper.RouterMapper; import cn.bunny.services.mapper.RouterRoleMapper; -import cn.bunny.services.service.RouterService; +import cn.bunny.services.service.system.RouterService; import cn.bunny.services.utils.RoleUtil; import cn.bunny.services.utils.RouterServiceUtil; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserDeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java similarity index 80% rename from service/src/main/java/cn/bunny/services/service/impl/UserDeptServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java index a0f129b..9a598b7 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserDeptServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java @@ -1,8 +1,8 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.system.impl; import cn.bunny.dao.entity.system.UserDept; import cn.bunny.services.mapper.UserDeptMapper; -import cn.bunny.services.service.UserDeptService; +import cn.bunny.services.service.system.UserDeptService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java similarity index 97% rename from service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java index 339687c..732fceb 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.system.impl; import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.dto.system.user.AssignRolesToUsersDto; @@ -10,7 +10,7 @@ import cn.bunny.services.context.BaseContext; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.UserMapper; import cn.bunny.services.mapper.UserRoleMapper; -import cn.bunny.services.service.UserRoleService; +import cn.bunny.services.service.system.UserRoleService; import cn.bunny.services.utils.UserUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java similarity index 99% rename from service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java index c426e9e..b90ea5a 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.impl; +package cn.bunny.services.service.system.impl; import cn.bunny.dao.constant.MinioConstant; import cn.bunny.dao.constant.RedisUserConstant; @@ -18,8 +18,8 @@ import cn.bunny.dao.vo.system.user.*; import cn.bunny.services.context.BaseContext; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.*; -import cn.bunny.services.service.FilesService; -import cn.bunny.services.service.UserService; +import cn.bunny.services.service.system.FilesService; +import cn.bunny.services.service.system.UserService; import cn.bunny.services.utils.JwtHelper; import cn.bunny.services.utils.UserUtil; import cn.bunny.services.utils.email.ConcreteSenderEmailTemplate;