diff --git a/auth-system/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java b/auth-system/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java index 89cd30d..1e3958d 100644 --- a/auth-system/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java +++ b/auth-system/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java @@ -3,7 +3,7 @@ package cn.bunny.services.aop.aspect; import cn.bunny.domain.common.constant.LocalDateTimeConstant; import cn.bunny.domain.common.enums.JobEnums; import cn.bunny.domain.common.model.dto.quartz.ScheduleExecuteLogJson; -import cn.bunny.domain.log.entity.ScheduleExecuteLog; +import cn.bunny.domain.model.log.entity.ScheduleExecuteLog; import cn.bunny.services.mapper.log.ScheduleExecuteLogMapper; import com.alibaba.fastjson2.JSON; import jakarta.annotation.Resource; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java index 26c6eb2..e24b502 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java @@ -3,8 +3,8 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.configuration.dto.WebConfigurationDto; -import cn.bunny.domain.configuration.entity.WebConfiguration; +import cn.bunny.domain.model.configuration.dto.WebConfigurationDto; +import cn.bunny.domain.model.configuration.entity.WebConfiguration; import cn.bunny.services.service.configuration.ConfigurationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java index ed729c9..4fb656d 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java @@ -5,9 +5,9 @@ import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.configuration.dto.EmailTemplateDto; -import cn.bunny.domain.configuration.entity.EmailTemplate; -import cn.bunny.domain.configuration.vo.EmailTemplateVo; +import cn.bunny.domain.model.configuration.dto.EmailTemplateDto; +import cn.bunny.domain.model.configuration.entity.EmailTemplate; +import cn.bunny.domain.model.configuration.vo.EmailTemplateVo; import cn.bunny.services.service.configuration.EmailTemplateService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java index 2fdf7c8..8dd3da1 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java @@ -5,9 +5,9 @@ import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.configuration.dto.EmailUsersDto; -import cn.bunny.domain.configuration.entity.EmailUsers; -import cn.bunny.domain.configuration.vo.EmailUsersVo; +import cn.bunny.domain.model.configuration.dto.EmailUsersDto; +import cn.bunny.domain.model.configuration.entity.EmailUsers; +import cn.bunny.domain.model.configuration.vo.EmailUsersVo; import cn.bunny.services.service.configuration.EmailUsersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nController.java index 60853a6..bbedcc5 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nController.java @@ -5,10 +5,10 @@ import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.configuration.dto.I18nDto; -import cn.bunny.domain.configuration.dto.I18nUpdateByFileDto; -import cn.bunny.domain.configuration.entity.I18n; -import cn.bunny.domain.configuration.vo.I18nVo; +import cn.bunny.domain.model.configuration.dto.I18nDto; +import cn.bunny.domain.model.configuration.dto.I18nUpdateByFileDto; +import cn.bunny.domain.model.configuration.entity.I18n; +import cn.bunny.domain.model.configuration.vo.I18nVo; import cn.bunny.services.service.configuration.I18nService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java index 48ee0b9..ca9628e 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java @@ -4,8 +4,8 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.configuration.dto.I18nTypeDto; -import cn.bunny.domain.configuration.vo.I18nTypeVo; +import cn.bunny.domain.model.configuration.dto.I18nTypeDto; +import cn.bunny.domain.model.configuration.vo.I18nTypeVo; import cn.bunny.services.service.configuration.I18nTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java index ec72a82..9c7aac4 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java @@ -5,9 +5,9 @@ import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.configuration.dto.MenuIconDto; -import cn.bunny.domain.configuration.entity.MenuIcon; -import cn.bunny.domain.configuration.vo.MenuIconVo; +import cn.bunny.domain.model.configuration.dto.MenuIconDto; +import cn.bunny.domain.model.configuration.entity.MenuIcon; +import cn.bunny.domain.model.configuration.vo.MenuIconVo; import cn.bunny.services.service.configuration.MenuIconService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/file/FilesController.java b/auth-system/src/main/java/cn/bunny/services/controller/file/FilesController.java index c2a18bd..bc2e67b 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/file/FilesController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/file/FilesController.java @@ -6,12 +6,12 @@ import cn.bunny.domain.common.constant.FileStorageConstant; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.files.dto.FileUploadDto; -import cn.bunny.domain.files.dto.FilesCreateOrUpdateDto; -import cn.bunny.domain.files.dto.FilesDto; -import cn.bunny.domain.files.entity.Files; -import cn.bunny.domain.files.vo.FileInfoVo; -import cn.bunny.domain.files.vo.FilesVo; +import cn.bunny.domain.model.files.dto.FileUploadDto; +import cn.bunny.domain.model.files.dto.FilesCreateOrUpdateDto; +import cn.bunny.domain.model.files.dto.FilesDto; +import cn.bunny.domain.model.files.entity.Files; +import cn.bunny.domain.model.files.vo.FileInfoVo; +import cn.bunny.domain.model.files.vo.FilesVo; import cn.bunny.services.service.file.FilesService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java b/auth-system/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java index a753280..0279b1a 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java @@ -4,9 +4,9 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.files.dto.FilesParDetailDto; -import cn.bunny.domain.files.entity.FilesParDetail; -import cn.bunny.domain.files.vo.FilesParDetailVo; +import cn.bunny.domain.model.files.dto.FilesParDetailDto; +import cn.bunny.domain.model.files.entity.FilesParDetail; +import cn.bunny.domain.model.files.vo.FilesParDetailVo; import cn.bunny.services.service.file.FilesParDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java b/auth-system/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java index 71074dd..780e390 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java @@ -4,9 +4,9 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.log.dto.ScheduleExecuteLogDto; -import cn.bunny.domain.log.entity.ScheduleExecuteLog; -import cn.bunny.domain.log.vo.ScheduleExecuteLogVo; +import cn.bunny.domain.model.log.dto.ScheduleExecuteLogDto; +import cn.bunny.domain.model.log.entity.ScheduleExecuteLog; +import cn.bunny.domain.model.log.vo.ScheduleExecuteLogVo; import cn.bunny.services.service.log.ScheduleExecuteLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java b/auth-system/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java index 415b9a4..39ca005 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java @@ -4,10 +4,10 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.log.dto.UserLoginLogDto; -import cn.bunny.domain.log.entity.UserLoginLog; -import cn.bunny.domain.log.vo.UserLoginLogLocalVo; -import cn.bunny.domain.log.vo.UserLoginLogVo; +import cn.bunny.domain.model.log.dto.UserLoginLogDto; +import cn.bunny.domain.model.log.entity.UserLoginLog; +import cn.bunny.domain.model.log.vo.UserLoginLogLocalVo; +import cn.bunny.domain.model.log.vo.UserLoginLogVo; import cn.bunny.services.service.log.UserLoginLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/message/MessageController.java b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageController.java index d2b9baf..8df33b7 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/message/MessageController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageController.java @@ -5,11 +5,11 @@ import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.message.dto.MessageDto; -import cn.bunny.domain.message.entity.Message; -import cn.bunny.domain.message.vo.MessageDetailVo; -import cn.bunny.domain.message.vo.MessageReceivedWithUserVo; -import cn.bunny.domain.message.vo.MessageVo; +import cn.bunny.domain.model.message.dto.MessageDto; +import cn.bunny.domain.model.message.entity.Message; +import cn.bunny.domain.model.message.vo.MessageDetailVo; +import cn.bunny.domain.model.message.vo.MessageReceivedWithUserVo; +import cn.bunny.domain.model.message.vo.MessageVo; import cn.bunny.services.service.message.MessageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java index 87169c6..f98719e 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java @@ -4,12 +4,12 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.message.dto.MessageReceivedDto; -import cn.bunny.domain.message.dto.MessageReceivedUpdateDto; -import cn.bunny.domain.message.dto.MessageUserDto; -import cn.bunny.domain.message.entity.Message; -import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.domain.message.vo.MessageUserVo; +import cn.bunny.domain.model.message.dto.MessageReceivedDto; +import cn.bunny.domain.model.message.dto.MessageReceivedUpdateDto; +import cn.bunny.domain.model.message.dto.MessageUserDto; +import cn.bunny.domain.model.message.entity.Message; +import cn.bunny.domain.model.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.model.message.vo.MessageUserVo; import cn.bunny.services.service.message.MessageReceivedService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java index ec81234..fd21723 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java @@ -5,9 +5,9 @@ import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.message.dto.MessageTypeDto; -import cn.bunny.domain.message.entity.MessageType; -import cn.bunny.domain.message.vo.MessageTypeVo; +import cn.bunny.domain.model.message.dto.MessageTypeDto; +import cn.bunny.domain.model.message.entity.MessageType; +import cn.bunny.domain.model.message.vo.MessageTypeVo; import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java b/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java index bb1672f..0342f7c 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java @@ -6,9 +6,9 @@ import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.schedule.dto.SchedulersDto; -import cn.bunny.domain.schedule.entity.Schedulers; -import cn.bunny.domain.schedule.vo.SchedulersVo; +import cn.bunny.domain.model.schedule.dto.SchedulersDto; +import cn.bunny.domain.model.schedule.entity.Schedulers; +import cn.bunny.domain.model.schedule.vo.SchedulersVo; import cn.bunny.services.service.schedule.SchedulersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java b/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java index 481b3db..85fb878 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java @@ -5,9 +5,9 @@ import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.schedule.dto.SchedulersGroupDto; -import cn.bunny.domain.schedule.entity.SchedulersGroup; -import cn.bunny.domain.schedule.vo.SchedulersGroupVo; +import cn.bunny.domain.model.schedule.dto.SchedulersGroupDto; +import cn.bunny.domain.model.schedule.entity.SchedulersGroup; +import cn.bunny.domain.model.schedule.vo.SchedulersGroupVo; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/system/DeptController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/DeptController.java index 42c7c74..9750b2b 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/system/DeptController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/DeptController.java @@ -5,9 +5,9 @@ import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.system.dto.DeptDto; -import cn.bunny.domain.system.entity.Dept; -import cn.bunny.domain.system.vo.DeptVo; +import cn.bunny.domain.model.system.dto.DeptDto; +import cn.bunny.domain.model.system.entity.Dept; +import cn.bunny.domain.model.system.vo.DeptVo; import cn.bunny.services.service.system.DeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/system/PermissionController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/PermissionController.java index dd56cb2..fc2ccb4 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/system/PermissionController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/PermissionController.java @@ -7,10 +7,10 @@ import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.dto.scanner.ScannerControllerInfoVo; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.system.dto.PermissionDto; -import cn.bunny.domain.system.dto.PermissionUpdateBatchByParentIdDto; -import cn.bunny.domain.system.entity.Permission; -import cn.bunny.domain.system.vo.PermissionVo; +import cn.bunny.domain.model.system.dto.PermissionDto; +import cn.bunny.domain.model.system.dto.PermissionUpdateBatchByParentIdDto; +import cn.bunny.domain.model.system.entity.Permission; +import cn.bunny.domain.model.system.vo.PermissionVo; import cn.bunny.services.service.system.PermissionService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/system/RoleController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/RoleController.java index a759353..7b33c95 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/system/RoleController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/RoleController.java @@ -5,9 +5,9 @@ import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.system.dto.RoleDto; -import cn.bunny.domain.system.entity.Role; -import cn.bunny.domain.system.vo.RoleVo; +import cn.bunny.domain.model.system.dto.RoleDto; +import cn.bunny.domain.model.system.entity.Role; +import cn.bunny.domain.model.system.vo.RoleVo; import cn.bunny.services.service.system.RoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java index 0b706e9..7864fa7 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java @@ -2,7 +2,7 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.system.dto.AssignPowersToRoleDto; +import cn.bunny.domain.model.system.dto.AssignPowersToRoleDto; import cn.bunny.services.service.system.RolePermissionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/system/RouterController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/RouterController.java index 97cd514..aa11be3 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/system/RouterController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/RouterController.java @@ -4,9 +4,9 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.domain.common.ValidationGroups; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.system.dto.RouterDto; -import cn.bunny.domain.system.vo.router.RouterManageVo; -import cn.bunny.domain.system.vo.router.WebUserRouterVo; +import cn.bunny.domain.model.system.dto.RouterDto; +import cn.bunny.domain.model.system.vo.router.RouterManageVo; +import cn.bunny.domain.model.system.vo.router.WebUserRouterVo; import cn.bunny.services.service.system.RouterService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/system/UserController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/UserController.java index e1ce02f..1e011a9 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/system/UserController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/UserController.java @@ -4,12 +4,12 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.system.dto.user.AdminUserAddDto; -import cn.bunny.domain.system.dto.user.AdminUserDto; -import cn.bunny.domain.system.dto.user.AdminUserUpdateDto; -import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.vo.user.AdminUserVo; -import cn.bunny.domain.system.vo.user.UserVo; +import cn.bunny.domain.model.system.dto.user.AdminUserAddDto; +import cn.bunny.domain.model.system.dto.user.AdminUserDto; +import cn.bunny.domain.model.system.dto.user.AdminUserUpdateDto; +import cn.bunny.domain.model.system.entity.AdminUser; +import cn.bunny.domain.model.system.vo.user.AdminUserVo; +import cn.bunny.domain.model.system.vo.user.UserVo; import cn.bunny.services.service.system.UserService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/system/UserLoginController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/UserLoginController.java index 0c9f22b..1ac18c7 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/system/UserLoginController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/UserLoginController.java @@ -4,10 +4,10 @@ import cn.bunny.core.context.BaseContext; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.LoginVo; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.system.dto.user.AdminUserUpdateByLocalUserDto; -import cn.bunny.domain.system.dto.user.LoginDto; -import cn.bunny.domain.system.dto.user.RefreshTokenDto; -import cn.bunny.domain.system.vo.user.RefreshTokenVo; +import cn.bunny.domain.model.system.dto.user.AdminUserUpdateByLocalUserDto; +import cn.bunny.domain.model.system.dto.user.LoginDto; +import cn.bunny.domain.model.system.dto.user.RefreshTokenDto; +import cn.bunny.domain.model.system.vo.user.RefreshTokenVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.service.system.UserLoginService; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-system/src/main/java/cn/bunny/services/controller/system/UserRoleController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/UserRoleController.java index 00d6477..2e2503a 100644 --- a/auth-system/src/main/java/cn/bunny/services/controller/system/UserRoleController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/UserRoleController.java @@ -2,7 +2,7 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.domain.common.model.vo.result.Result; -import cn.bunny.domain.system.dto.user.AssignRolesToUsersDto; +import cn.bunny.domain.model.system.dto.user.AssignRolesToUsersDto; import cn.bunny.services.service.system.UserRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-system/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java b/auth-system/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java index 6e0ef52..983b3fb 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java +++ b/auth-system/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java @@ -1,8 +1,8 @@ package cn.bunny.services.core.cache; import cn.bunny.domain.common.constant.RedisUserConstant; -import cn.bunny.domain.system.entity.Permission; -import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.model.system.entity.Permission; +import cn.bunny.domain.model.system.entity.Role; import cn.bunny.services.mapper.system.PermissionMapper; import cn.bunny.services.mapper.system.RoleMapper; import com.alibaba.fastjson2.JSON; diff --git a/auth-system/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java b/auth-system/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java index c6b1163..1d94fb5 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java +++ b/auth-system/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java @@ -4,9 +4,9 @@ import cn.bunny.services.core.utils.RoleHelper; import cn.bunny.domain.common.constant.LocalDateTimeConstant; import cn.bunny.domain.common.constant.RedisUserConstant; import cn.bunny.domain.common.model.vo.LoginVo; -import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.entity.Permission; -import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.model.system.entity.AdminUser; +import cn.bunny.domain.model.system.entity.Permission; +import cn.bunny.domain.model.system.entity.Role; import cn.bunny.services.mapper.system.PermissionMapper; import cn.bunny.services.mapper.system.RoleMapper; import cn.bunny.core.utils.JwtTokenUtil; diff --git a/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java index d24bc37..dab3e26 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java +++ b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.event.listener.excel; import cn.bunny.domain.common.model.dto.excel.I18nExcel; -import cn.bunny.domain.configuration.entity.I18n; +import cn.bunny.domain.model.configuration.entity.I18n; import cn.bunny.services.service.configuration.I18nService; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; diff --git a/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java index 7273a1a..34cfa20 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java +++ b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.event.listener.excel; import cn.bunny.domain.common.model.dto.excel.PermissionExcel; -import cn.bunny.domain.system.entity.Permission; +import cn.bunny.domain.model.system.entity.Permission; import cn.bunny.services.service.system.PermissionService; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; diff --git a/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java index 66b2f6f..7798612 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java +++ b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java @@ -2,7 +2,7 @@ package cn.bunny.services.core.event.listener.excel; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.dto.excel.RoleExcel; -import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.model.system.entity.Role; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.service.system.RoleService; import com.alibaba.excel.context.AnalysisContext; diff --git a/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java b/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java index 74a103a..319d039 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java +++ b/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java @@ -2,7 +2,7 @@ package cn.bunny.services.core.event.listener.user; import cn.bunny.services.core.cache.UserCacheCleaner; import cn.bunny.domain.common.constant.RedisUserConstant; -import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.model.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import jakarta.annotation.Resource; import org.springframework.data.redis.core.RedisTemplate; diff --git a/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java b/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java index 8eb3491..8647e73 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java +++ b/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java @@ -6,8 +6,8 @@ import cn.bunny.services.core.event.event.UpdateUserinfoByPermissionIdsEvent; import cn.bunny.services.core.event.event.UpdateUserinfoByRoleIdsEvent; import cn.bunny.services.core.event.event.UpdateUserinfoByUserIdsEvent; import cn.bunny.domain.common.constant.RedisUserConstant; -import cn.bunny.domain.system.entity.RolePermission; -import cn.bunny.domain.system.entity.UserRole; +import cn.bunny.domain.model.system.entity.RolePermission; +import cn.bunny.domain.model.system.entity.UserRole; import cn.bunny.services.mapper.system.RolePermissionMapper; import cn.bunny.services.mapper.system.UserRoleMapper; import jakarta.annotation.Resource; diff --git a/auth-system/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java index 96ae01f..d9c5f2c 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java +++ b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.strategy.login; -import cn.bunny.domain.system.dto.user.LoginDto; -import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.model.system.dto.user.LoginDto; +import cn.bunny.domain.model.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/auth-system/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java index e1933ed..7c1da12 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java +++ b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java @@ -2,8 +2,8 @@ package cn.bunny.services.core.strategy.login; import cn.bunny.services.core.cache.EmailCacheService; import cn.bunny.domain.common.enums.ResultCodeEnum; -import cn.bunny.domain.system.dto.user.LoginDto; -import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.model.system.dto.user.LoginDto; +import cn.bunny.domain.model.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java index 8058cbc..9efb216 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java +++ b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.strategy.login; -import cn.bunny.domain.system.dto.user.LoginDto; -import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.model.system.dto.user.LoginDto; +import cn.bunny.domain.model.system.entity.AdminUser; import org.springframework.security.core.userdetails.UsernameNotFoundException; import java.util.Map; diff --git a/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java index 5849774..abea95f 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java +++ b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java @@ -1,8 +1,8 @@ package cn.bunny.services.core.strategy.login; -import cn.bunny.domain.system.dto.user.LoginDto; -import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.model.system.dto.user.LoginDto; +import cn.bunny.domain.model.system.entity.AdminUser; /** * 登录策略 diff --git a/auth-system/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java b/auth-system/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java index 288824e..8d5a6b7 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java +++ b/auth-system/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java @@ -4,8 +4,8 @@ import cn.bunny.core.config.mail.MailSenderConfiguration; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.dto.email.EmailSend; import cn.bunny.domain.common.model.dto.email.EmailSendInit; -import cn.bunny.domain.configuration.entity.EmailTemplate; -import cn.bunny.domain.configuration.entity.EmailUsers; +import cn.bunny.domain.model.configuration.entity.EmailTemplate; +import cn.bunny.domain.model.configuration.entity.EmailUsers; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailUsersMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/auth-system/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java b/auth-system/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java index db33026..0ec7b0a 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java +++ b/auth-system/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java @@ -1,6 +1,6 @@ package cn.bunny.services.core.template.email; -import cn.bunny.domain.configuration.entity.EmailTemplate; +import cn.bunny.domain.model.configuration.entity.EmailTemplate; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/auth-system/src/main/java/cn/bunny/services/core/utils/RoleHelper.java b/auth-system/src/main/java/cn/bunny/services/core/utils/RoleHelper.java index 4ed9f6d..74170f5 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/utils/RoleHelper.java +++ b/auth-system/src/main/java/cn/bunny/services/core/utils/RoleHelper.java @@ -2,7 +2,7 @@ package cn.bunny.services.core.utils; import cn.bunny.core.context.BaseContext; import cn.bunny.domain.common.constant.SecurityConfigConstant; -import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.model.system.entity.AdminUser; import java.util.List; diff --git a/auth-system/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java b/auth-system/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java index 2d7968e..3f86f53 100644 --- a/auth-system/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java +++ b/auth-system/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java @@ -1,12 +1,12 @@ package cn.bunny.services.core.utils; import cn.bunny.core.context.BaseContext; -import cn.bunny.domain.system.entity.RouterRole; -import cn.bunny.domain.system.entity.router.Router; -import cn.bunny.domain.system.entity.router.RouterMeta; -import cn.bunny.domain.system.views.ViewRolePermission; -import cn.bunny.domain.system.views.ViewRouterRole; -import cn.bunny.domain.system.vo.router.WebUserRouterVo; +import cn.bunny.domain.model.system.entity.RouterRole; +import cn.bunny.domain.model.system.entity.router.Router; +import cn.bunny.domain.model.system.entity.router.RouterMeta; +import cn.bunny.domain.model.system.views.ViewRolePermission; +import cn.bunny.domain.model.system.views.ViewRouterRole; +import cn.bunny.domain.model.system.vo.router.WebUserRouterVo; import cn.bunny.services.service.system.RouterRoleService; import com.alibaba.fastjson2.JSON; import jakarta.annotation.Resource; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java index 7f25edb..0538437 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.domain.configuration.dto.EmailTemplateDto; -import cn.bunny.domain.configuration.entity.EmailTemplate; -import cn.bunny.domain.configuration.vo.EmailTemplateVo; +import cn.bunny.domain.model.configuration.dto.EmailTemplateDto; +import cn.bunny.domain.model.configuration.entity.EmailTemplate; +import cn.bunny.domain.model.configuration.vo.EmailTemplateVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java index 8b9579e..d3c0201 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.domain.configuration.dto.EmailUsersDto; -import cn.bunny.domain.configuration.entity.EmailUsers; -import cn.bunny.domain.configuration.vo.EmailUsersVo; +import cn.bunny.domain.model.configuration.dto.EmailUsersDto; +import cn.bunny.domain.model.configuration.entity.EmailUsers; +import cn.bunny.domain.model.configuration.vo.EmailUsersVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java index c43abaf..ac870bf 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.domain.configuration.dto.I18nDto; -import cn.bunny.domain.configuration.entity.I18n; -import cn.bunny.domain.configuration.vo.I18nVo; +import cn.bunny.domain.model.configuration.dto.I18nDto; +import cn.bunny.domain.model.configuration.entity.I18n; +import cn.bunny.domain.model.configuration.vo.I18nVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java index 852dcca..dcc2fc4 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.domain.configuration.dto.I18nTypeDto; -import cn.bunny.domain.configuration.entity.I18nType; +import cn.bunny.domain.model.configuration.dto.I18nTypeDto; +import cn.bunny.domain.model.configuration.entity.I18nType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java index 2240d78..54c5df0 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.domain.configuration.dto.MenuIconDto; -import cn.bunny.domain.configuration.entity.MenuIcon; -import cn.bunny.domain.configuration.vo.MenuIconVo; +import cn.bunny.domain.model.configuration.dto.MenuIconDto; +import cn.bunny.domain.model.configuration.entity.MenuIcon; +import cn.bunny.domain.model.configuration.vo.MenuIconVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java index 8858421..f9e93dc 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.file; -import cn.bunny.domain.files.dto.FilesDto; -import cn.bunny.domain.files.entity.Files; -import cn.bunny.domain.files.vo.FilesVo; +import cn.bunny.domain.model.files.dto.FilesDto; +import cn.bunny.domain.model.files.entity.Files; +import cn.bunny.domain.model.files.vo.FilesVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java index d4d4b4d..30f5d5c 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.file; -import cn.bunny.domain.files.dto.FilesParDetailDto; -import cn.bunny.domain.files.entity.FilesParDetail; -import cn.bunny.domain.files.vo.FilesParDetailVo; +import cn.bunny.domain.model.files.dto.FilesParDetailDto; +import cn.bunny.domain.model.files.entity.FilesParDetail; +import cn.bunny.domain.model.files.vo.FilesParDetailVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java index 80b1b99..36060b9 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.log; -import cn.bunny.domain.log.dto.ScheduleExecuteLogDto; -import cn.bunny.domain.log.entity.ScheduleExecuteLog; -import cn.bunny.domain.log.vo.ScheduleExecuteLogVo; +import cn.bunny.domain.model.log.dto.ScheduleExecuteLogDto; +import cn.bunny.domain.model.log.entity.ScheduleExecuteLog; +import cn.bunny.domain.model.log.vo.ScheduleExecuteLogVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java index 174352e..1cc8920 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.log; -import cn.bunny.domain.log.dto.UserLoginLogDto; -import cn.bunny.domain.log.entity.UserLoginLog; -import cn.bunny.domain.log.vo.UserLoginLogVo; +import cn.bunny.domain.model.log.dto.UserLoginLogDto; +import cn.bunny.domain.model.log.entity.UserLoginLog; +import cn.bunny.domain.model.log.vo.UserLoginLogVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java index 0e81036..183be1d 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java @@ -1,10 +1,10 @@ package cn.bunny.services.mapper.message; -import cn.bunny.domain.message.dto.MessageDto; -import cn.bunny.domain.message.entity.Message; -import cn.bunny.domain.message.vo.MessageDetailVo; -import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.domain.message.vo.MessageReceivedWithUserVo; +import cn.bunny.domain.model.message.dto.MessageDto; +import cn.bunny.domain.model.message.entity.Message; +import cn.bunny.domain.model.message.vo.MessageDetailVo; +import cn.bunny.domain.model.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.model.message.vo.MessageReceivedWithUserVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java index 0533865..11089c9 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java @@ -1,11 +1,11 @@ package cn.bunny.services.mapper.message; -import cn.bunny.domain.message.dto.MessageReceivedDto; -import cn.bunny.domain.message.dto.MessageUserDto; -import cn.bunny.domain.message.entity.Message; -import cn.bunny.domain.message.entity.MessageReceived; -import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.domain.message.vo.MessageUserVo; +import cn.bunny.domain.model.message.dto.MessageReceivedDto; +import cn.bunny.domain.model.message.dto.MessageUserDto; +import cn.bunny.domain.model.message.entity.Message; +import cn.bunny.domain.model.message.entity.MessageReceived; +import cn.bunny.domain.model.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.model.message.vo.MessageUserVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java index c390b6b..afc30b6 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.message; -import cn.bunny.domain.message.dto.MessageTypeDto; -import cn.bunny.domain.message.entity.MessageType; -import cn.bunny.domain.message.vo.MessageTypeVo; +import cn.bunny.domain.model.message.dto.MessageTypeDto; +import cn.bunny.domain.model.message.entity.MessageType; +import cn.bunny.domain.model.message.vo.MessageTypeVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java index 6e588dc..fe4c1cb 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.schedule; -import cn.bunny.domain.schedule.dto.SchedulersGroupDto; -import cn.bunny.domain.schedule.entity.SchedulersGroup; -import cn.bunny.domain.schedule.vo.SchedulersGroupVo; +import cn.bunny.domain.model.schedule.dto.SchedulersGroupDto; +import cn.bunny.domain.model.schedule.entity.SchedulersGroup; +import cn.bunny.domain.model.schedule.vo.SchedulersGroupVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java index a2c7bd4..8282aad 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.schedule; -import cn.bunny.domain.schedule.dto.SchedulersDto; -import cn.bunny.domain.schedule.entity.Schedulers; +import cn.bunny.domain.model.schedule.dto.SchedulersDto; +import cn.bunny.domain.model.schedule.entity.Schedulers; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java index 1ae7c42..7bc3411 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.domain.system.dto.DeptDto; -import cn.bunny.domain.system.entity.Dept; -import cn.bunny.domain.system.vo.DeptVo; +import cn.bunny.domain.model.system.dto.DeptDto; +import cn.bunny.domain.model.system.entity.Dept; +import cn.bunny.domain.model.system.vo.DeptVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java index 5049703..c5abc29 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.domain.system.dto.PermissionDto; -import cn.bunny.domain.system.entity.Permission; -import cn.bunny.domain.system.vo.PermissionVo; +import cn.bunny.domain.model.system.dto.PermissionDto; +import cn.bunny.domain.model.system.entity.Permission; +import cn.bunny.domain.model.system.vo.PermissionVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java index 44656c9..b48bfbb 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.domain.system.dto.RoleDto; -import cn.bunny.domain.system.entity.Role; -import cn.bunny.domain.system.vo.RoleVo; +import cn.bunny.domain.model.system.dto.RoleDto; +import cn.bunny.domain.model.system.entity.Role; +import cn.bunny.domain.model.system.vo.RoleVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java index a91fa1d..7fb5762 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; -import cn.bunny.domain.system.entity.RolePermission; -import cn.bunny.domain.system.views.ViewRolePermission; +import cn.bunny.domain.model.system.entity.RolePermission; +import cn.bunny.domain.model.system.views.ViewRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java index 13a9ec1..62b3ba3 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.domain.system.entity.router.Router; -import cn.bunny.domain.system.vo.router.RouterVo; +import cn.bunny.domain.model.system.entity.router.Router; +import cn.bunny.domain.model.system.vo.router.RouterVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java index d5c5e9d..c9e99f6 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; -import cn.bunny.domain.system.entity.RouterRole; -import cn.bunny.domain.system.views.ViewRouterRole; +import cn.bunny.domain.model.system.entity.RouterRole; +import cn.bunny.domain.model.system.views.ViewRouterRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java index d1b9ccb..10dc83b 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper.system; -import cn.bunny.domain.system.entity.UserDept; +import cn.bunny.domain.model.system.entity.UserDept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/system/UserMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserMapper.java index eeedba4..f73bad1 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/system/UserMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.domain.system.dto.user.AdminUserDto; -import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.views.ViewUserDept; +import cn.bunny.domain.model.system.dto.user.AdminUserDto; +import cn.bunny.domain.model.system.entity.AdminUser; +import cn.bunny.domain.model.system.views.ViewUserDept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-system/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java index c410986..b56604d 100644 --- a/auth-system/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper.system; -import cn.bunny.domain.system.entity.UserRole; +import cn.bunny.domain.model.system.entity.UserRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/auth-system/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java b/auth-system/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java index 3204880..25d412e 100644 --- a/auth-system/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java +++ b/auth-system/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java @@ -3,8 +3,6 @@ package cn.bunny.services.quartz; /** * WARNING ： * 这个只是Demo！！！ - * 这个只是Demo！！！ - * 这个只是Demo！！！ */ // @Slf4j // @QuartzSchedulers(type = "backup", description = "数据库备份(仅限本地docker中MySQL)") diff --git a/auth-system/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java b/auth-system/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java index 8552fd0..1435942 100644 --- a/auth-system/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java +++ b/auth-system/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java @@ -1,7 +1,7 @@ package cn.bunny.services.security.config; import cn.bunny.domain.common.enums.ResultCodeEnum; -import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.model.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.context.annotation.Bean; diff --git a/auth-system/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java b/auth-system/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java index 8d6a0ac..1cf0bb0 100644 --- a/auth-system/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java +++ b/auth-system/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java @@ -3,8 +3,8 @@ package cn.bunny.services.security.service; import cn.bunny.core.context.BaseContext; import cn.bunny.services.core.cache.UserAuthorizationCacheService; import cn.bunny.services.core.utils.RoleHelper; -import cn.bunny.domain.system.entity.Permission; -import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.model.system.entity.Permission; +import cn.bunny.domain.model.system.entity.Role; import cn.bunny.services.security.config.WebSecurityConfig; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java index 198eb11..afbfbf4 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.configuration; -import cn.bunny.domain.configuration.dto.WebConfigurationDto; -import cn.bunny.domain.configuration.entity.WebConfiguration; +import cn.bunny.domain.model.configuration.dto.WebConfigurationDto; +import cn.bunny.domain.model.configuration.entity.WebConfiguration; public interface ConfigurationService { diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java index b02e92b..87fb442 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.configuration; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.configuration.dto.EmailTemplateDto; -import cn.bunny.domain.configuration.entity.EmailTemplate; -import cn.bunny.domain.configuration.vo.EmailTemplateVo; +import cn.bunny.domain.model.configuration.dto.EmailTemplateDto; +import cn.bunny.domain.model.configuration.entity.EmailTemplate; +import cn.bunny.domain.model.configuration.vo.EmailTemplateVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java index 8ecf9d7..3328119 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.configuration; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.configuration.dto.EmailUsersDto; -import cn.bunny.domain.configuration.entity.EmailUsers; -import cn.bunny.domain.configuration.vo.EmailUsersVo; +import cn.bunny.domain.model.configuration.dto.EmailUsersDto; +import cn.bunny.domain.model.configuration.entity.EmailUsers; +import cn.bunny.domain.model.configuration.vo.EmailUsersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nService.java index 62e73d0..0433bcd 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nService.java @@ -2,10 +2,10 @@ package cn.bunny.services.service.configuration; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.configuration.dto.I18nDto; -import cn.bunny.domain.configuration.dto.I18nUpdateByFileDto; -import cn.bunny.domain.configuration.entity.I18n; -import cn.bunny.domain.configuration.vo.I18nVo; +import cn.bunny.domain.model.configuration.dto.I18nDto; +import cn.bunny.domain.model.configuration.dto.I18nUpdateByFileDto; +import cn.bunny.domain.model.configuration.entity.I18n; +import cn.bunny.domain.model.configuration.vo.I18nVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.http.ResponseEntity; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java index 77c82b1..60c1b8d 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.configuration; -import cn.bunny.domain.configuration.dto.I18nTypeDto; -import cn.bunny.domain.configuration.entity.I18nType; -import cn.bunny.domain.configuration.vo.I18nTypeVo; +import cn.bunny.domain.model.configuration.dto.I18nTypeDto; +import cn.bunny.domain.model.configuration.entity.I18nType; +import cn.bunny.domain.model.configuration.vo.I18nTypeVo; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java index ef33e02..30e6b14 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.configuration; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.configuration.dto.MenuIconDto; -import cn.bunny.domain.configuration.entity.MenuIcon; -import cn.bunny.domain.configuration.vo.MenuIconVo; +import cn.bunny.domain.model.configuration.dto.MenuIconDto; +import cn.bunny.domain.model.configuration.entity.MenuIcon; +import cn.bunny.domain.model.configuration.vo.MenuIconVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java index 22bae1c..829445b 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.domain.configuration.dto.WebConfigurationDto; -import cn.bunny.domain.configuration.entity.WebConfiguration; +import cn.bunny.domain.model.configuration.dto.WebConfigurationDto; +import cn.bunny.domain.model.configuration.entity.WebConfiguration; import cn.bunny.domain.common.constant.RedisUserConstant; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.core.exception.AuthCustomerException; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java index 2dbf02f..4d340de 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java @@ -3,9 +3,9 @@ package cn.bunny.services.service.configuration.impl; import cn.bunny.domain.common.enums.EmailTemplateEnums; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.configuration.dto.EmailTemplateDto; -import cn.bunny.domain.configuration.entity.EmailTemplate; -import cn.bunny.domain.configuration.vo.EmailTemplateVo; +import cn.bunny.domain.model.configuration.dto.EmailTemplateDto; +import cn.bunny.domain.model.configuration.entity.EmailTemplate; +import cn.bunny.domain.model.configuration.vo.EmailTemplateVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import cn.bunny.services.service.configuration.EmailTemplateService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java index ef2d12d..e0e6546 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java @@ -2,9 +2,9 @@ package cn.bunny.services.service.configuration.impl; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.configuration.dto.EmailUsersDto; -import cn.bunny.domain.configuration.entity.EmailUsers; -import cn.bunny.domain.configuration.vo.EmailUsersVo; +import cn.bunny.domain.model.configuration.dto.EmailUsersDto; +import cn.bunny.domain.model.configuration.entity.EmailUsers; +import cn.bunny.domain.model.configuration.vo.EmailUsersVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailUsersMapper; import cn.bunny.services.service.configuration.EmailUsersService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java index 3ced38b..3a4f7bd 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java @@ -8,11 +8,11 @@ import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.dto.excel.I18nExcel; import cn.bunny.domain.common.model.entity.BaseEntity; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.configuration.dto.I18nDto; -import cn.bunny.domain.configuration.dto.I18nUpdateByFileDto; -import cn.bunny.domain.configuration.entity.I18n; -import cn.bunny.domain.configuration.entity.I18nType; -import cn.bunny.domain.configuration.vo.I18nVo; +import cn.bunny.domain.model.configuration.dto.I18nDto; +import cn.bunny.domain.model.configuration.dto.I18nUpdateByFileDto; +import cn.bunny.domain.model.configuration.entity.I18n; +import cn.bunny.domain.model.configuration.entity.I18nType; +import cn.bunny.domain.model.configuration.vo.I18nVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.I18nMapper; import cn.bunny.services.mapper.configuration.I18nTypeMapper; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java index 504547c..e06163d 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.configuration.impl; import cn.bunny.domain.common.enums.ResultCodeEnum; -import cn.bunny.domain.configuration.dto.I18nTypeDto; -import cn.bunny.domain.configuration.entity.I18nType; -import cn.bunny.domain.configuration.vo.I18nTypeVo; +import cn.bunny.domain.model.configuration.dto.I18nTypeDto; +import cn.bunny.domain.model.configuration.entity.I18nType; +import cn.bunny.domain.model.configuration.vo.I18nTypeVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.I18nTypeMapper; import cn.bunny.services.service.configuration.I18nTypeService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java index cc48c98..ec3b862 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java @@ -2,9 +2,9 @@ package cn.bunny.services.service.configuration.impl; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.configuration.dto.MenuIconDto; -import cn.bunny.domain.configuration.entity.MenuIcon; -import cn.bunny.domain.configuration.vo.MenuIconVo; +import cn.bunny.domain.model.configuration.dto.MenuIconDto; +import cn.bunny.domain.model.configuration.entity.MenuIcon; +import cn.bunny.domain.model.configuration.vo.MenuIconVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.MenuIconMapper; import cn.bunny.services.service.configuration.MenuIconService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/file/FilesParDetailService.java b/auth-system/src/main/java/cn/bunny/services/service/file/FilesParDetailService.java index eb4b7a1..8573919 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/file/FilesParDetailService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/file/FilesParDetailService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.file; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.files.dto.FilesParDetailDto; -import cn.bunny.domain.files.entity.FilesParDetail; -import cn.bunny.domain.files.vo.FilesParDetailVo; +import cn.bunny.domain.model.files.dto.FilesParDetailDto; +import cn.bunny.domain.model.files.entity.FilesParDetail; +import cn.bunny.domain.model.files.vo.FilesParDetailVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/file/FilesService.java b/auth-system/src/main/java/cn/bunny/services/service/file/FilesService.java index aed930d..9d9d886 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/file/FilesService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/file/FilesService.java @@ -1,13 +1,13 @@ package cn.bunny.services.service.file; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.files.dto.FileUploadDto; -import cn.bunny.domain.files.dto.FilesCreateOrUpdateDto; -import cn.bunny.domain.files.dto.FilesDto; -import cn.bunny.domain.files.dto.UploadThumbnail; -import cn.bunny.domain.files.entity.Files; -import cn.bunny.domain.files.vo.FileInfoVo; -import cn.bunny.domain.files.vo.FilesVo; +import cn.bunny.domain.model.files.dto.FileUploadDto; +import cn.bunny.domain.model.files.dto.FilesCreateOrUpdateDto; +import cn.bunny.domain.model.files.dto.FilesDto; +import cn.bunny.domain.model.files.dto.UploadThumbnail; +import cn.bunny.domain.model.files.entity.Files; +import cn.bunny.domain.model.files.vo.FileInfoVo; +import cn.bunny.domain.model.files.vo.FilesVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.x.file.storage.core.get.RemoteDirInfo; diff --git a/auth-system/src/main/java/cn/bunny/services/service/file/impl/FileDetailService.java b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FileDetailService.java index a95ebb3..dfb90b7 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/file/impl/FileDetailService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FileDetailService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.file.impl; -import cn.bunny.domain.files.entity.Files; -import cn.bunny.domain.files.entity.FilesParDetail; +import cn.bunny.domain.model.files.entity.Files; +import cn.bunny.domain.model.files.entity.FilesParDetail; import cn.bunny.services.mapper.file.FilesMapper; import cn.bunny.services.mapper.file.FilesParDetailMapper; import cn.bunny.core.utils.FileUtil; diff --git a/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java index a42d5c0..2b90aa5 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.file.impl; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.files.dto.FilesParDetailDto; -import cn.bunny.domain.files.entity.FilesParDetail; -import cn.bunny.domain.files.vo.FilesParDetailVo; +import cn.bunny.domain.model.files.dto.FilesParDetailDto; +import cn.bunny.domain.model.files.entity.FilesParDetail; +import cn.bunny.domain.model.files.vo.FilesParDetailVo; import cn.bunny.services.mapper.file.FilesParDetailMapper; import cn.bunny.services.service.file.FilesParDetailService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java index 6ddb649..f31071c 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java @@ -1,32 +1,32 @@ package cn.bunny.services.service.file.impl; +import cn.bunny.core.exception.AuthCustomerException; +import cn.bunny.core.utils.FileUtil; import cn.bunny.domain.common.constant.FileStorageConstant; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.files.dto.FileUploadDto; -import cn.bunny.domain.files.dto.FilesCreateOrUpdateDto; -import cn.bunny.domain.files.dto.FilesDto; -import cn.bunny.domain.files.dto.UploadThumbnail; -import cn.bunny.domain.files.entity.Files; -import cn.bunny.domain.files.vo.FileInfoVo; -import cn.bunny.domain.files.vo.FilesVo; -import cn.bunny.core.exception.AuthCustomerException; +import cn.bunny.domain.model.files.dto.FileUploadDto; +import cn.bunny.domain.model.files.dto.FilesCreateOrUpdateDto; +import cn.bunny.domain.model.files.dto.FilesDto; +import cn.bunny.domain.model.files.dto.UploadThumbnail; +import cn.bunny.domain.model.files.entity.Files; +import cn.bunny.domain.model.files.vo.FileInfoVo; +import cn.bunny.domain.model.files.vo.FilesVo; import cn.bunny.services.mapper.file.FilesMapper; import cn.bunny.services.service.file.FilesService; -import cn.bunny.core.utils.FileUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.annotation.Resource; import org.dromara.x.file.storage.core.FileInfo; import org.dromara.x.file.storage.core.FileStorageService; import org.dromara.x.file.storage.core.get.ListFilesSupportInfo; import org.dromara.x.file.storage.core.get.RemoteDirInfo; import org.dromara.x.file.storage.core.upload.UploadPretreatment; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -52,7 +52,7 @@ import java.util.Objects; @Transactional public class FilesServiceImpl extends ServiceImpl implements FilesService { - @Resource + @Autowired private FileStorageService fileStorageService; /** diff --git a/auth-system/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java b/auth-system/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java index 3779e0e..c2e0d93 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.log; -import cn.bunny.domain.log.dto.ScheduleExecuteLogDto; -import cn.bunny.domain.log.entity.ScheduleExecuteLog; -import cn.bunny.domain.log.vo.ScheduleExecuteLogVo; +import cn.bunny.domain.model.log.dto.ScheduleExecuteLogDto; +import cn.bunny.domain.model.log.entity.ScheduleExecuteLog; +import cn.bunny.domain.model.log.vo.ScheduleExecuteLogVo; import cn.bunny.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java b/auth-system/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java index e74be23..8b2a665 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.log; -import cn.bunny.domain.log.dto.UserLoginLogDto; -import cn.bunny.domain.log.entity.UserLoginLog; -import cn.bunny.domain.log.vo.UserLoginLogLocalVo; -import cn.bunny.domain.log.vo.UserLoginLogVo; +import cn.bunny.domain.model.log.dto.UserLoginLogDto; +import cn.bunny.domain.model.log.entity.UserLoginLog; +import cn.bunny.domain.model.log.vo.UserLoginLogLocalVo; +import cn.bunny.domain.model.log.vo.UserLoginLogVo; import cn.bunny.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java index 930fa9d..81f8550 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.log.impl; -import cn.bunny.domain.log.dto.ScheduleExecuteLogDto; -import cn.bunny.domain.log.entity.ScheduleExecuteLog; -import cn.bunny.domain.log.vo.ScheduleExecuteLogVo; +import cn.bunny.domain.model.log.dto.ScheduleExecuteLogDto; +import cn.bunny.domain.model.log.entity.ScheduleExecuteLog; +import cn.bunny.domain.model.log.vo.ScheduleExecuteLogVo; import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.services.mapper.log.ScheduleExecuteLogMapper; import cn.bunny.services.service.log.ScheduleExecuteLogService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java index abe1076..8c5eafa 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java @@ -2,10 +2,10 @@ package cn.bunny.services.service.log.impl; import cn.bunny.core.context.BaseContext; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.log.dto.UserLoginLogDto; -import cn.bunny.domain.log.entity.UserLoginLog; -import cn.bunny.domain.log.vo.UserLoginLogLocalVo; -import cn.bunny.domain.log.vo.UserLoginLogVo; +import cn.bunny.domain.model.log.dto.UserLoginLogDto; +import cn.bunny.domain.model.log.entity.UserLoginLog; +import cn.bunny.domain.model.log.vo.UserLoginLogLocalVo; +import cn.bunny.domain.model.log.vo.UserLoginLogVo; import cn.bunny.services.mapper.log.UserLoginLogMapper; import cn.bunny.services.service.log.UserLoginLogService; import cn.bunny.core.utils.IpUtil; diff --git a/auth-system/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java b/auth-system/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java index 223afd5..198a3d4 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java @@ -1,13 +1,13 @@ package cn.bunny.services.service.message; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.message.dto.MessageReceivedDto; -import cn.bunny.domain.message.dto.MessageReceivedUpdateDto; -import cn.bunny.domain.message.dto.MessageUserDto; -import cn.bunny.domain.message.entity.Message; -import cn.bunny.domain.message.entity.MessageReceived; -import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.domain.message.vo.MessageUserVo; +import cn.bunny.domain.model.message.dto.MessageReceivedDto; +import cn.bunny.domain.model.message.dto.MessageReceivedUpdateDto; +import cn.bunny.domain.model.message.dto.MessageUserDto; +import cn.bunny.domain.model.message.entity.Message; +import cn.bunny.domain.model.message.entity.MessageReceived; +import cn.bunny.domain.model.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.model.message.vo.MessageUserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/message/MessageService.java b/auth-system/src/main/java/cn/bunny/services/service/message/MessageService.java index ca155f9..29bb671 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/message/MessageService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/MessageService.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.message; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.message.dto.MessageDto; -import cn.bunny.domain.message.entity.Message; -import cn.bunny.domain.message.vo.MessageDetailVo; -import cn.bunny.domain.message.vo.MessageReceivedWithUserVo; -import cn.bunny.domain.message.vo.MessageVo; +import cn.bunny.domain.model.message.dto.MessageDto; +import cn.bunny.domain.model.message.entity.Message; +import cn.bunny.domain.model.message.vo.MessageDetailVo; +import cn.bunny.domain.model.message.vo.MessageReceivedWithUserVo; +import cn.bunny.domain.model.message.vo.MessageVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/message/MessageTypeService.java b/auth-system/src/main/java/cn/bunny/services/service/message/MessageTypeService.java index f2346a2..0c124cf 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/message/MessageTypeService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/MessageTypeService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.message; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.message.dto.MessageTypeDto; -import cn.bunny.domain.message.entity.MessageType; -import cn.bunny.domain.message.vo.MessageTypeVo; +import cn.bunny.domain.model.message.dto.MessageTypeDto; +import cn.bunny.domain.model.message.entity.MessageType; +import cn.bunny.domain.model.message.vo.MessageTypeVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java index 8a20b79..fce02d6 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java @@ -3,13 +3,13 @@ package cn.bunny.services.service.message.impl; import cn.bunny.core.context.BaseContext; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.message.dto.MessageReceivedDto; -import cn.bunny.domain.message.dto.MessageReceivedUpdateDto; -import cn.bunny.domain.message.dto.MessageUserDto; -import cn.bunny.domain.message.entity.Message; -import cn.bunny.domain.message.entity.MessageReceived; -import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.domain.message.vo.MessageUserVo; +import cn.bunny.domain.model.message.dto.MessageReceivedDto; +import cn.bunny.domain.model.message.dto.MessageReceivedUpdateDto; +import cn.bunny.domain.model.message.dto.MessageUserDto; +import cn.bunny.domain.model.message.entity.Message; +import cn.bunny.domain.model.message.entity.MessageReceived; +import cn.bunny.domain.model.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.model.message.vo.MessageUserVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.message.MessageReceivedMapper; import cn.bunny.services.service.message.MessageReceivedService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java index f83fc88..73d85e7 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java @@ -4,13 +4,13 @@ import cn.bunny.core.context.BaseContext; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.entity.BaseEntity; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.message.dto.MessageDto; -import cn.bunny.domain.message.entity.Message; -import cn.bunny.domain.message.entity.MessageReceived; -import cn.bunny.domain.message.vo.MessageDetailVo; -import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.domain.message.vo.MessageReceivedWithUserVo; -import cn.bunny.domain.message.vo.MessageVo; +import cn.bunny.domain.model.message.dto.MessageDto; +import cn.bunny.domain.model.message.entity.Message; +import cn.bunny.domain.model.message.entity.MessageReceived; +import cn.bunny.domain.model.message.vo.MessageDetailVo; +import cn.bunny.domain.model.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.model.message.vo.MessageReceivedWithUserVo; +import cn.bunny.domain.model.message.vo.MessageVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.message.MessageMapper; import cn.bunny.services.mapper.message.MessageReceivedMapper; diff --git a/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java index 95f9ace..c8cc215 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.message.impl; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.message.dto.MessageTypeDto; -import cn.bunny.domain.message.entity.MessageType; -import cn.bunny.domain.message.vo.MessageTypeVo; +import cn.bunny.domain.model.message.dto.MessageTypeDto; +import cn.bunny.domain.model.message.entity.MessageType; +import cn.bunny.domain.model.message.vo.MessageTypeVo; import cn.bunny.services.mapper.message.MessageTypeMapper; import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java b/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java index e62e581..68bdcfc 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.schedule; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.schedule.dto.SchedulersGroupDto; -import cn.bunny.domain.schedule.entity.SchedulersGroup; -import cn.bunny.domain.schedule.vo.SchedulersGroupVo; +import cn.bunny.domain.model.schedule.dto.SchedulersGroupDto; +import cn.bunny.domain.model.schedule.entity.SchedulersGroup; +import cn.bunny.domain.model.schedule.vo.SchedulersGroupVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java b/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java index 723e1df..954e4d3 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.schedule; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.schedule.dto.SchedulersDto; -import cn.bunny.domain.schedule.entity.Schedulers; -import cn.bunny.domain.schedule.vo.SchedulersVo; +import cn.bunny.domain.model.schedule.dto.SchedulersDto; +import cn.bunny.domain.model.schedule.entity.Schedulers; +import cn.bunny.domain.model.schedule.vo.SchedulersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java index 50cf487..888f72b 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.schedule.impl; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.schedule.dto.SchedulersGroupDto; -import cn.bunny.domain.schedule.entity.SchedulersGroup; -import cn.bunny.domain.schedule.vo.SchedulersGroupVo; +import cn.bunny.domain.model.schedule.dto.SchedulersGroupDto; +import cn.bunny.domain.model.schedule.entity.SchedulersGroup; +import cn.bunny.domain.model.schedule.vo.SchedulersGroupVo; import cn.bunny.services.mapper.schedule.SchedulersGroupMapper; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java index 1faeefb..f3703fd 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java @@ -2,9 +2,9 @@ package cn.bunny.services.service.schedule.impl; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.schedule.dto.SchedulersDto; -import cn.bunny.domain.schedule.entity.Schedulers; -import cn.bunny.domain.schedule.vo.SchedulersVo; +import cn.bunny.domain.model.schedule.dto.SchedulersDto; +import cn.bunny.domain.model.schedule.entity.Schedulers; +import cn.bunny.domain.model.schedule.vo.SchedulersVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.schedule.SchedulersMapper; import cn.bunny.services.service.schedule.SchedulersService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/DeptService.java b/auth-system/src/main/java/cn/bunny/services/service/system/DeptService.java index 6a6ea80..696fd85 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/DeptService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/DeptService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.system; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.system.dto.DeptDto; -import cn.bunny.domain.system.entity.Dept; -import cn.bunny.domain.system.vo.DeptVo; +import cn.bunny.domain.model.system.dto.DeptDto; +import cn.bunny.domain.model.system.entity.Dept; +import cn.bunny.domain.model.system.vo.DeptVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/PermissionService.java b/auth-system/src/main/java/cn/bunny/services/service/system/PermissionService.java index ca39192..56de512 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/PermissionService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/PermissionService.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.system; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.system.dto.PermissionDto; -import cn.bunny.domain.system.dto.PermissionUpdateBatchByParentIdDto; -import cn.bunny.domain.system.entity.Permission; -import cn.bunny.domain.system.vo.PermissionVo; +import cn.bunny.domain.model.system.dto.PermissionDto; +import cn.bunny.domain.model.system.dto.PermissionUpdateBatchByParentIdDto; +import cn.bunny.domain.model.system.entity.Permission; +import cn.bunny.domain.model.system.vo.PermissionVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.http.ResponseEntity; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/RolePermissionService.java b/auth-system/src/main/java/cn/bunny/services/service/system/RolePermissionService.java index 70c6e0f..dc85362 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/RolePermissionService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/RolePermissionService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.system; -import cn.bunny.domain.system.dto.AssignPowersToRoleDto; -import cn.bunny.domain.system.entity.RolePermission; +import cn.bunny.domain.model.system.dto.AssignPowersToRoleDto; +import cn.bunny.domain.model.system.entity.RolePermission; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/RoleService.java b/auth-system/src/main/java/cn/bunny/services/service/system/RoleService.java index 0624457..8028400 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/RoleService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/RoleService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.system; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.system.dto.RoleDto; -import cn.bunny.domain.system.entity.Role; -import cn.bunny.domain.system.vo.RoleVo; +import cn.bunny.domain.model.system.dto.RoleDto; +import cn.bunny.domain.model.system.entity.Role; +import cn.bunny.domain.model.system.vo.RoleVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.http.ResponseEntity; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/RouterRoleService.java b/auth-system/src/main/java/cn/bunny/services/service/system/RouterRoleService.java index e453362..bc10224 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/RouterRoleService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/RouterRoleService.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system; -import cn.bunny.domain.system.entity.RouterRole; +import cn.bunny.domain.model.system.entity.RouterRole; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/RouterService.java b/auth-system/src/main/java/cn/bunny/services/service/system/RouterService.java index fc21235..cf791a4 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/RouterService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/RouterService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.system; -import cn.bunny.domain.system.dto.RouterDto; -import cn.bunny.domain.system.entity.router.Router; -import cn.bunny.domain.system.vo.router.RouterManageVo; -import cn.bunny.domain.system.vo.router.WebUserRouterVo; +import cn.bunny.domain.model.system.dto.RouterDto; +import cn.bunny.domain.model.system.entity.router.Router; +import cn.bunny.domain.model.system.vo.router.RouterManageVo; +import cn.bunny.domain.model.system.vo.router.WebUserRouterVo; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/UserDeptService.java b/auth-system/src/main/java/cn/bunny/services/service/system/UserDeptService.java index dc779a5..3acc495 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/UserDeptService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/UserDeptService.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system; -import cn.bunny.domain.system.entity.UserDept; +import cn.bunny.domain.model.system.entity.UserDept; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/UserLoginService.java b/auth-system/src/main/java/cn/bunny/services/service/system/UserLoginService.java index 7769a53..74a84c8 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/UserLoginService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/UserLoginService.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.system; import cn.bunny.domain.common.model.vo.LoginVo; -import cn.bunny.domain.system.dto.user.AdminUserUpdateByLocalUserDto; -import cn.bunny.domain.system.dto.user.LoginDto; -import cn.bunny.domain.system.dto.user.RefreshTokenDto; -import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.vo.user.RefreshTokenVo; +import cn.bunny.domain.model.system.dto.user.AdminUserUpdateByLocalUserDto; +import cn.bunny.domain.model.system.dto.user.LoginDto; +import cn.bunny.domain.model.system.dto.user.RefreshTokenDto; +import cn.bunny.domain.model.system.entity.AdminUser; +import cn.bunny.domain.model.system.vo.user.RefreshTokenVo; import com.baomidou.mybatisplus.extension.service.IService; import org.jetbrains.annotations.NotNull; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/UserRoleService.java b/auth-system/src/main/java/cn/bunny/services/service/system/UserRoleService.java index 16a7f10..4eee7e7 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/UserRoleService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/UserRoleService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.system; -import cn.bunny.domain.system.dto.user.AssignRolesToUsersDto; -import cn.bunny.domain.system.entity.UserRole; +import cn.bunny.domain.model.system.dto.user.AssignRolesToUsersDto; +import cn.bunny.domain.model.system.entity.UserRole; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/UserService.java b/auth-system/src/main/java/cn/bunny/services/service/system/UserService.java index 62f6629..5094315 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/UserService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/UserService.java @@ -1,12 +1,12 @@ package cn.bunny.services.service.system; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.system.dto.user.AdminUserAddDto; -import cn.bunny.domain.system.dto.user.AdminUserDto; -import cn.bunny.domain.system.dto.user.AdminUserUpdateDto; -import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.vo.user.AdminUserVo; -import cn.bunny.domain.system.vo.user.UserVo; +import cn.bunny.domain.model.system.dto.user.AdminUserAddDto; +import cn.bunny.domain.model.system.dto.user.AdminUserDto; +import cn.bunny.domain.model.system.dto.user.AdminUserUpdateDto; +import cn.bunny.domain.model.system.entity.AdminUser; +import cn.bunny.domain.model.system.vo.user.AdminUserVo; +import cn.bunny.domain.model.system.vo.user.UserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java index bdcc65a..56d3f06 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java @@ -2,9 +2,9 @@ package cn.bunny.services.service.system.impl; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.system.dto.DeptDto; -import cn.bunny.domain.system.entity.Dept; -import cn.bunny.domain.system.vo.DeptVo; +import cn.bunny.domain.model.system.dto.DeptDto; +import cn.bunny.domain.model.system.entity.Dept; +import cn.bunny.domain.model.system.vo.DeptVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.DeptMapper; import cn.bunny.services.mapper.system.UserDeptMapper; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java index 212cb9d..0556955 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java @@ -9,10 +9,10 @@ import cn.bunny.domain.common.constant.FileType; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.dto.excel.PermissionExcel; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.system.dto.PermissionDto; -import cn.bunny.domain.system.dto.PermissionUpdateBatchByParentIdDto; -import cn.bunny.domain.system.entity.Permission; -import cn.bunny.domain.system.vo.PermissionVo; +import cn.bunny.domain.model.system.dto.PermissionDto; +import cn.bunny.domain.model.system.dto.PermissionUpdateBatchByParentIdDto; +import cn.bunny.domain.model.system.entity.Permission; +import cn.bunny.domain.model.system.vo.PermissionVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.PermissionMapper; import cn.bunny.services.service.system.PermissionService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java index 6bc545f..b4dcec3 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.core.event.event.UpdateUserinfoByRoleIdsEvent; -import cn.bunny.domain.system.dto.AssignPowersToRoleDto; -import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.entity.RolePermission; -import cn.bunny.domain.system.entity.UserRole; +import cn.bunny.domain.model.system.dto.AssignPowersToRoleDto; +import cn.bunny.domain.model.system.entity.AdminUser; +import cn.bunny.domain.model.system.entity.RolePermission; +import cn.bunny.domain.model.system.entity.UserRole; import cn.bunny.services.mapper.system.RolePermissionMapper; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.mapper.system.UserRoleMapper; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java index 93cc0ed..c67316f 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java @@ -5,9 +5,9 @@ import cn.bunny.services.core.event.listener.excel.RoleExcelListener; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.dto.excel.RoleExcel; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.system.dto.RoleDto; -import cn.bunny.domain.system.entity.Role; -import cn.bunny.domain.system.vo.RoleVo; +import cn.bunny.domain.model.system.dto.RoleDto; +import cn.bunny.domain.model.system.entity.Role; +import cn.bunny.domain.model.system.vo.RoleVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.RoleMapper; import cn.bunny.services.service.system.RoleService; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java index 8fa04e7..1c3a7ba 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.domain.system.entity.RouterRole; +import cn.bunny.domain.model.system.entity.RouterRole; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.RouterRoleMapper; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java index 9099060..7366161 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java @@ -2,15 +2,15 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.core.utils.RouterServiceHelper; import cn.bunny.domain.common.enums.ResultCodeEnum; -import cn.bunny.domain.system.dto.RouterDto; -import cn.bunny.domain.system.entity.router.Router; -import cn.bunny.domain.system.entity.router.RouterMeta; -import cn.bunny.domain.system.entity.router.RouterMetaTransition; -import cn.bunny.domain.system.views.ViewRolePermission; -import cn.bunny.domain.system.views.ViewRouterRole; -import cn.bunny.domain.system.vo.router.RouterManageVo; -import cn.bunny.domain.system.vo.router.RouterVo; -import cn.bunny.domain.system.vo.router.WebUserRouterVo; +import cn.bunny.domain.model.system.dto.RouterDto; +import cn.bunny.domain.model.system.entity.router.Router; +import cn.bunny.domain.model.system.entity.router.RouterMeta; +import cn.bunny.domain.model.system.entity.router.RouterMetaTransition; +import cn.bunny.domain.model.system.views.ViewRolePermission; +import cn.bunny.domain.model.system.views.ViewRouterRole; +import cn.bunny.domain.model.system.vo.router.RouterManageVo; +import cn.bunny.domain.model.system.vo.router.RouterVo; +import cn.bunny.domain.model.system.vo.router.WebUserRouterVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.RolePermissionMapper; import cn.bunny.services.mapper.system.RouterMapper; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java index 1513318..88ed30d 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.domain.system.entity.UserDept; +import cn.bunny.domain.model.system.entity.UserDept; import cn.bunny.services.mapper.system.UserDeptMapper; import cn.bunny.services.service.system.UserDeptService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java index 124ced4..4ed387a 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java @@ -15,13 +15,13 @@ import cn.bunny.domain.common.enums.EmailTemplateEnums; import cn.bunny.domain.common.enums.LoginEnums; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.LoginVo; -import cn.bunny.domain.configuration.entity.EmailTemplate; -import cn.bunny.domain.log.entity.UserLoginLog; -import cn.bunny.domain.system.dto.user.AdminUserUpdateByLocalUserDto; -import cn.bunny.domain.system.dto.user.LoginDto; -import cn.bunny.domain.system.dto.user.RefreshTokenDto; -import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.vo.user.RefreshTokenVo; +import cn.bunny.domain.model.configuration.entity.EmailTemplate; +import cn.bunny.domain.model.log.entity.UserLoginLog; +import cn.bunny.domain.model.system.dto.user.AdminUserUpdateByLocalUserDto; +import cn.bunny.domain.model.system.dto.user.LoginDto; +import cn.bunny.domain.model.system.dto.user.RefreshTokenDto; +import cn.bunny.domain.model.system.entity.AdminUser; +import cn.bunny.domain.model.system.vo.user.RefreshTokenVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import cn.bunny.services.mapper.log.UserLoginLogMapper; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java index fb67e88..a1a9fef 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java @@ -2,9 +2,9 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.core.event.event.UpdateUserinfoByUserIdsEvent; import cn.bunny.domain.common.enums.ResultCodeEnum; -import cn.bunny.domain.system.dto.user.AssignRolesToUsersDto; -import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.entity.UserRole; +import cn.bunny.domain.model.system.dto.user.AssignRolesToUsersDto; +import cn.bunny.domain.model.system.entity.AdminUser; +import cn.bunny.domain.model.system.entity.UserRole; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.mapper.system.UserRoleMapper; diff --git a/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java index f6c64fb..dd6d2f3 100644 --- a/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java @@ -8,18 +8,18 @@ import cn.bunny.domain.common.constant.UserConstant; import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.domain.common.model.vo.LoginVo; import cn.bunny.domain.common.model.vo.result.PageResult; -import cn.bunny.domain.files.dto.FileUploadDto; -import cn.bunny.domain.files.vo.FileInfoVo; -import cn.bunny.domain.log.entity.UserLoginLog; -import cn.bunny.domain.system.dto.user.AdminUserAddDto; -import cn.bunny.domain.system.dto.user.AdminUserDto; -import cn.bunny.domain.system.dto.user.AdminUserUpdateDto; -import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.entity.Role; -import cn.bunny.domain.system.entity.UserDept; -import cn.bunny.domain.system.views.ViewUserDept; -import cn.bunny.domain.system.vo.user.AdminUserVo; -import cn.bunny.domain.system.vo.user.UserVo; +import cn.bunny.domain.model.files.dto.FileUploadDto; +import cn.bunny.domain.model.files.vo.FileInfoVo; +import cn.bunny.domain.model.log.entity.UserLoginLog; +import cn.bunny.domain.model.system.dto.user.AdminUserAddDto; +import cn.bunny.domain.model.system.dto.user.AdminUserDto; +import cn.bunny.domain.model.system.dto.user.AdminUserUpdateDto; +import cn.bunny.domain.model.system.entity.AdminUser; +import cn.bunny.domain.model.system.entity.Role; +import cn.bunny.domain.model.system.entity.UserDept; +import cn.bunny.domain.model.system.views.ViewUserDept; +import cn.bunny.domain.model.system.vo.user.AdminUserVo; +import cn.bunny.domain.model.system.vo.user.UserVo; import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.log.UserLoginLogMapper; import cn.bunny.services.mapper.system.RoleMapper; diff --git a/auth-system/src/main/resources/application-dev.yml b/auth-system/src/main/resources/application-dev.yml index 72cea5e..7ef2368 100644 --- a/auth-system/src/main/resources/application-dev.yml +++ b/auth-system/src/main/resources/application-dev.yml @@ -33,7 +33,7 @@ bunny: dromara: local-plus: - # 访问域名，例如：“http://127.0.0.1:8030/file”，注意后面要和 path-patterns 名字一样 + # 访问域名，例如：“http://127.0.0.1:8030/{path-patterns}”，注意后面要和 path-patterns 名字一样 domain: /api/local-file # 访问路径，使用本地在SpringSecurity中要配置权限，如果是和我一样就不用修改了，如果不是api开头，上线需要配置nginx path-patterns: /api/local-file/** diff --git a/auth-system/src/main/resources/mapper/configuration/EmailTemplateMapper.xml b/auth-system/src/main/resources/mapper/configuration/EmailTemplateMapper.xml index d68daed..b7ba11c 100644 --- a/auth-system/src/main/resources/mapper/configuration/EmailTemplateMapper.xml +++ b/auth-system/src/main/resources/mapper/configuration/EmailTemplateMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ - select template.*, create_user.username as create_username, diff --git a/auth-system/src/main/resources/mapper/configuration/EmailUsersMapper.xml b/auth-system/src/main/resources/mapper/configuration/EmailUsersMapper.xml index 6214d5e..afa5086 100644 --- a/auth-system/src/main/resources/mapper/configuration/EmailUsersMapper.xml +++ b/auth-system/src/main/resources/mapper/configuration/EmailUsersMapper.xml @@ -3,7 +3,7 @@ - + @@ -26,7 +26,7 @@ - select email_user.*, create_user.username as create_username, diff --git a/auth-system/src/main/resources/mapper/configuration/I18nMapper.xml b/auth-system/src/main/resources/mapper/configuration/I18nMapper.xml index a06137e..32b7b87 100644 --- a/auth-system/src/main/resources/mapper/configuration/I18nMapper.xml +++ b/auth-system/src/main/resources/mapper/configuration/I18nMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select i18n.*, create_user.username as create_username, diff --git a/auth-system/src/main/resources/mapper/configuration/I18nTypeMapper.xml b/auth-system/src/main/resources/mapper/configuration/I18nTypeMapper.xml index 6cd9fe0..09ea346 100644 --- a/auth-system/src/main/resources/mapper/configuration/I18nTypeMapper.xml +++ b/auth-system/src/main/resources/mapper/configuration/I18nTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select i18n_type.*, create_user.username as createUsername, diff --git a/auth-system/src/main/resources/mapper/configuration/MenuIconMapper.xml b/auth-system/src/main/resources/mapper/configuration/MenuIconMapper.xml index ef6fdd0..08d70d8 100644 --- a/auth-system/src/main/resources/mapper/configuration/MenuIconMapper.xml +++ b/auth-system/src/main/resources/mapper/configuration/MenuIconMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select icon.*, create_user.username as create_username, diff --git a/auth-system/src/main/resources/mapper/file/FilesMapper.xml b/auth-system/src/main/resources/mapper/file/FilesMapper.xml index 72d1542..aa50b09 100644 --- a/auth-system/src/main/resources/mapper/file/FilesMapper.xml +++ b/auth-system/src/main/resources/mapper/file/FilesMapper.xml @@ -3,7 +3,7 @@ - + @@ -42,7 +42,7 @@ - select files.*, create_user.username as create_username, diff --git a/auth-system/src/main/resources/mapper/file/FilesPardetailMapper.xml b/auth-system/src/main/resources/mapper/file/FilesPardetailMapper.xml index d354fbd..72a2f1a 100644 --- a/auth-system/src/main/resources/mapper/file/FilesPardetailMapper.xml +++ b/auth-system/src/main/resources/mapper/file/FilesPardetailMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-system/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml b/auth-system/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml index c0a7282..337a7d7 100644 --- a/auth-system/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml +++ b/auth-system/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ - select log.*, create_user.username as create_username, diff --git a/auth-system/src/main/resources/mapper/log/UserLoginLogMapper.xml b/auth-system/src/main/resources/mapper/log/UserLoginLogMapper.xml index 98399d6..eeae55e 100644 --- a/auth-system/src/main/resources/mapper/log/UserLoginLogMapper.xml +++ b/auth-system/src/main/resources/mapper/log/UserLoginLogMapper.xml @@ -3,7 +3,7 @@ - + @@ -26,7 +26,7 @@ - select user_login.*, create_user.username as create_username, @@ -55,7 +55,7 @@ - select from log_user_login where user_id = #{id} diff --git a/auth-system/src/main/resources/mapper/message/MessageMapper.xml b/auth-system/src/main/resources/mapper/message/MessageMapper.xml index 0e59363..f171f58 100644 --- a/auth-system/src/main/resources/mapper/message/MessageMapper.xml +++ b/auth-system/src/main/resources/mapper/message/MessageMapper.xml @@ -3,7 +3,7 @@ - + @@ -28,7 +28,7 @@ - SELECT message.id, message.create_time, @@ -83,7 +83,7 @@ - SELECT message.*, send_user.nickname AS send_nickname FROM sys_message message @@ -95,7 +95,7 @@ + resultType="cn.bunny.domain.model.message.vo.MessageReceivedWithMessageVo"> SELECT message_received.status AS status, message_received.received_user_id AS received_user_id, @@ -86,7 +86,7 @@ - SELECT message.id, message.title, diff --git a/auth-system/src/main/resources/mapper/message/MessageTypeMapper.xml b/auth-system/src/main/resources/mapper/message/MessageTypeMapper.xml index 713e066..35c9bed 100644 --- a/auth-system/src/main/resources/mapper/message/MessageTypeMapper.xml +++ b/auth-system/src/main/resources/mapper/message/MessageTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,7 +22,7 @@ - select message_type.*, create_user.username as create_username, diff --git a/auth-system/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml b/auth-system/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml index e537592..9c34822 100644 --- a/auth-system/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml +++ b/auth-system/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select schedulers_group.*, create_user.username as create_username, diff --git a/auth-system/src/main/resources/mapper/schedule/SchedulersMapper.xml b/auth-system/src/main/resources/mapper/schedule/SchedulersMapper.xml index 11d972a..4369b7a 100644 --- a/auth-system/src/main/resources/mapper/schedule/SchedulersMapper.xml +++ b/auth-system/src/main/resources/mapper/schedule/SchedulersMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - select from view_qrtz_schedulers diff --git a/auth-system/src/main/resources/mapper/system/DeptMapper.xml b/auth-system/src/main/resources/mapper/system/DeptMapper.xml index d1e1db9..9f2924d 100644 --- a/auth-system/src/main/resources/mapper/system/DeptMapper.xml +++ b/auth-system/src/main/resources/mapper/system/DeptMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,7 +22,7 @@ - select dept.*, create_user.username as create_username, diff --git a/auth-system/src/main/resources/mapper/system/PermissionMapper.xml b/auth-system/src/main/resources/mapper/system/PermissionMapper.xml index 25a6f6b..a678a29 100644 --- a/auth-system/src/main/resources/mapper/system/PermissionMapper.xml +++ b/auth-system/src/main/resources/mapper/system/PermissionMapper.xml @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ - select permission.*, create_user.username as create_username, @@ -51,7 +51,7 @@ - SELECT p.* FROM sys_permission p INNER JOIN sys_role_permission rp ON p.id = rp.power_id diff --git a/auth-system/src/main/resources/mapper/system/RoleMapper.xml b/auth-system/src/main/resources/mapper/system/RoleMapper.xml index dfea70a..49a7166 100644 --- a/auth-system/src/main/resources/mapper/system/RoleMapper.xml +++ b/auth-system/src/main/resources/mapper/system/RoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select role.*, create_user.username as create_username, @@ -41,7 +41,7 @@ - SELECT r.* FROM sys_user u INNER JOIN sys_user_role ur ON u.id = ur.user_id @@ -51,7 +51,7 @@ - SELECT r.* FROM sys_role r, sys_user_role ur diff --git a/auth-system/src/main/resources/mapper/system/RolePermissionMapper.xml b/auth-system/src/main/resources/mapper/system/RolePermissionMapper.xml index 01d1521..6392876 100644 --- a/auth-system/src/main/resources/mapper/system/RolePermissionMapper.xml +++ b/auth-system/src/main/resources/mapper/system/RolePermissionMapper.xml @@ -3,7 +3,7 @@ - + @@ -41,14 +41,14 @@ - SELECT rp.power_id, permission.parent_id, permission.power_code, @@ -64,7 +64,7 @@ + + + - select * from sys_user diff --git a/auth-system/src/main/resources/mapper/system/UserRoleMapper.xml b/auth-system/src/main/resources/mapper/system/UserRoleMapper.xml index 9ca0e76..fd2191c 100644 --- a/auth-system/src/main/resources/mapper/system/UserRoleMapper.xml +++ b/auth-system/src/main/resources/mapper/system/UserRoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -39,7 +39,7 @@ - SELECT * FROM sys_user_role WHERE role_id IN diff --git a/auth-system/src/test/java/impl/BuildPermissionApiTest.java b/auth-system/src/test/java/impl/BuildPermissionApiTest.java index a2be7ec..39261f6 100644 --- a/auth-system/src/test/java/impl/BuildPermissionApiTest.java +++ b/auth-system/src/test/java/impl/BuildPermissionApiTest.java @@ -3,7 +3,7 @@ package impl; import cn.bunny.services.AuthServiceApplication; import cn.bunny.services.aop.scanner.ControllerApiPermissionScanner; import cn.bunny.domain.common.model.dto.scanner.ScannerControllerInfoVo; -import cn.bunny.domain.system.entity.Permission; +import cn.bunny.domain.model.system.entity.Permission; import cn.bunny.services.service.system.PermissionService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/dto/EmailTemplateDto.java b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/EmailTemplateDto.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/configuration/dto/EmailTemplateDto.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/dto/EmailTemplateDto.java index e32b143..a4b7e5c 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/dto/EmailTemplateDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/EmailTemplateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.dto; +package cn.bunny.domain.model.configuration.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/dto/EmailUsersDto.java b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/EmailUsersDto.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/configuration/dto/EmailUsersDto.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/dto/EmailUsersDto.java index be55b4e..09dfaf6 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/dto/EmailUsersDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/EmailUsersDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.dto; +package cn.bunny.domain.model.configuration.dto; import cn.bunny.domain.common.ValidationGroups.Add; import cn.bunny.domain.common.ValidationGroups.Update; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nDto.java b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/I18nDto.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/configuration/dto/I18nDto.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/dto/I18nDto.java index b61fc1d..b003d4a 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/I18nDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.dto; +package cn.bunny.domain.model.configuration.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nTypeDto.java b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/I18nTypeDto.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/configuration/dto/I18nTypeDto.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/dto/I18nTypeDto.java index c527813..d4c4548 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nTypeDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/I18nTypeDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.dto; +package cn.bunny.domain.model.configuration.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nUpdateByFileDto.java b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/I18nUpdateByFileDto.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/configuration/dto/I18nUpdateByFileDto.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/dto/I18nUpdateByFileDto.java index 8ca6193..fb95ec4 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nUpdateByFileDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/I18nUpdateByFileDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.dto; +package cn.bunny.domain.model.configuration.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/dto/MenuIconDto.java b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/MenuIconDto.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/configuration/dto/MenuIconDto.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/dto/MenuIconDto.java index ecf6844..0d93296 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/dto/MenuIconDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/MenuIconDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.dto; +package cn.bunny.domain.model.configuration.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/WebConfigurationDto.java similarity index 99% rename from domain/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/dto/WebConfigurationDto.java index c806e1b..712686e 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/dto/WebConfigurationDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.dto; +package cn.bunny.domain.model.configuration.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/entity/EmailTemplate.java b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/EmailTemplate.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/configuration/entity/EmailTemplate.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/entity/EmailTemplate.java index e1991aa..ea3bb86 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/entity/EmailTemplate.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/EmailTemplate.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.entity; +package cn.bunny.domain.model.configuration.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/entity/EmailUsers.java b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/EmailUsers.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/configuration/entity/EmailUsers.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/entity/EmailUsers.java index 76877d3..d1673de 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/entity/EmailUsers.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/EmailUsers.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.entity; +package cn.bunny.domain.model.configuration.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/entity/I18n.java b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/I18n.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/configuration/entity/I18n.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/entity/I18n.java index 25894de..3194fd8 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/entity/I18n.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/I18n.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.entity; +package cn.bunny.domain.model.configuration.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/entity/I18nType.java b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/I18nType.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/configuration/entity/I18nType.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/entity/I18nType.java index 7b28b6b..1b7fd64 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/entity/I18nType.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/I18nType.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.entity; +package cn.bunny.domain.model.configuration.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/entity/MenuIcon.java b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/MenuIcon.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/configuration/entity/MenuIcon.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/entity/MenuIcon.java index ccb876d..5607b89 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/entity/MenuIcon.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/MenuIcon.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.entity; +package cn.bunny.domain.model.configuration.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/WebConfiguration.java similarity index 98% rename from domain/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/entity/WebConfiguration.java index 9be18c9..12df11f 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/entity/WebConfiguration.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.entity; +package cn.bunny.domain.model.configuration.entity; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/vo/EmailTemplateVo.java b/domain/src/main/java/cn/bunny/domain/model/configuration/vo/EmailTemplateVo.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/configuration/vo/EmailTemplateVo.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/vo/EmailTemplateVo.java index 0196b83..1d62970 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/vo/EmailTemplateVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/vo/EmailTemplateVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.vo; +package cn.bunny.domain.model.configuration.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/vo/EmailUsersVo.java b/domain/src/main/java/cn/bunny/domain/model/configuration/vo/EmailUsersVo.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/configuration/vo/EmailUsersVo.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/vo/EmailUsersVo.java index bd40f01..9efe402 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/vo/EmailUsersVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/vo/EmailUsersVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.vo; +package cn.bunny.domain.model.configuration.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/vo/I18nTypeVo.java b/domain/src/main/java/cn/bunny/domain/model/configuration/vo/I18nTypeVo.java similarity index 93% rename from domain/src/main/java/cn/bunny/domain/configuration/vo/I18nTypeVo.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/vo/I18nTypeVo.java index c0bf524..83dee7c 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/vo/I18nTypeVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/vo/I18nTypeVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.vo; +package cn.bunny.domain.model.configuration.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/vo/I18nVo.java b/domain/src/main/java/cn/bunny/domain/model/configuration/vo/I18nVo.java similarity index 92% rename from domain/src/main/java/cn/bunny/domain/configuration/vo/I18nVo.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/vo/I18nVo.java index 313c374..8e7476d 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/vo/I18nVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/vo/I18nVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.vo; +package cn.bunny.domain.model.configuration.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/configuration/vo/MenuIconVo.java b/domain/src/main/java/cn/bunny/domain/model/configuration/vo/MenuIconVo.java similarity index 91% rename from domain/src/main/java/cn/bunny/domain/configuration/vo/MenuIconVo.java rename to domain/src/main/java/cn/bunny/domain/model/configuration/vo/MenuIconVo.java index 739c707..4f2aca4 100644 --- a/domain/src/main/java/cn/bunny/domain/configuration/vo/MenuIconVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/configuration/vo/MenuIconVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.configuration.vo; +package cn.bunny.domain.model.configuration.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java b/domain/src/main/java/cn/bunny/domain/model/files/dto/FileUploadDto.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java rename to domain/src/main/java/cn/bunny/domain/model/files/dto/FileUploadDto.java index 0754e90..72024d1 100644 --- a/domain/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/files/dto/FileUploadDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.files.dto; +package cn.bunny.domain.model.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/domain/src/main/java/cn/bunny/domain/files/dto/FilesCreateOrUpdateDto.java b/domain/src/main/java/cn/bunny/domain/model/files/dto/FilesCreateOrUpdateDto.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/files/dto/FilesCreateOrUpdateDto.java rename to domain/src/main/java/cn/bunny/domain/model/files/dto/FilesCreateOrUpdateDto.java index 48fc253..ea0205b 100644 --- a/domain/src/main/java/cn/bunny/domain/files/dto/FilesCreateOrUpdateDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/files/dto/FilesCreateOrUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.files.dto; +package cn.bunny.domain.model.files.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/files/dto/FilesDto.java b/domain/src/main/java/cn/bunny/domain/model/files/dto/FilesDto.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/files/dto/FilesDto.java rename to domain/src/main/java/cn/bunny/domain/model/files/dto/FilesDto.java index 69d8aa2..e40a085 100644 --- a/domain/src/main/java/cn/bunny/domain/files/dto/FilesDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/files/dto/FilesDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.files.dto; +package cn.bunny.domain.model.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/files/dto/FilesParDetailDto.java b/domain/src/main/java/cn/bunny/domain/model/files/dto/FilesParDetailDto.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/files/dto/FilesParDetailDto.java rename to domain/src/main/java/cn/bunny/domain/model/files/dto/FilesParDetailDto.java index 26c7ea3..f61a143 100644 --- a/domain/src/main/java/cn/bunny/domain/files/dto/FilesParDetailDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/files/dto/FilesParDetailDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.files.dto; +package cn.bunny.domain.model.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/files/dto/UploadThumbnail.java b/domain/src/main/java/cn/bunny/domain/model/files/dto/UploadThumbnail.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/files/dto/UploadThumbnail.java rename to domain/src/main/java/cn/bunny/domain/model/files/dto/UploadThumbnail.java index bf2abf0..6ebf882 100644 --- a/domain/src/main/java/cn/bunny/domain/files/dto/UploadThumbnail.java +++ b/domain/src/main/java/cn/bunny/domain/model/files/dto/UploadThumbnail.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.files.dto; +package cn.bunny.domain.model.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/files/entity/Files.java b/domain/src/main/java/cn/bunny/domain/model/files/entity/Files.java similarity index 98% rename from domain/src/main/java/cn/bunny/domain/files/entity/Files.java rename to domain/src/main/java/cn/bunny/domain/model/files/entity/Files.java index b1cb21c..75ea434 100644 --- a/domain/src/main/java/cn/bunny/domain/files/entity/Files.java +++ b/domain/src/main/java/cn/bunny/domain/model/files/entity/Files.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.files.entity; +package cn.bunny.domain.model.files.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/files/entity/FilesParDetail.java b/domain/src/main/java/cn/bunny/domain/model/files/entity/FilesParDetail.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/files/entity/FilesParDetail.java rename to domain/src/main/java/cn/bunny/domain/model/files/entity/FilesParDetail.java index ee0964b..cbaedca 100644 --- a/domain/src/main/java/cn/bunny/domain/files/entity/FilesParDetail.java +++ b/domain/src/main/java/cn/bunny/domain/model/files/entity/FilesParDetail.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.files.entity; +package cn.bunny.domain.model.files.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/domain/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java b/domain/src/main/java/cn/bunny/domain/model/files/vo/FileInfoVo.java similarity index 98% rename from domain/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java rename to domain/src/main/java/cn/bunny/domain/model/files/vo/FileInfoVo.java index 8dd5838..ed088a5 100644 --- a/domain/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/files/vo/FileInfoVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.files.vo; +package cn.bunny.domain.model.files.vo; import cn.bunny.domain.common.model.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/files/vo/FilesParDetailVo.java b/domain/src/main/java/cn/bunny/domain/model/files/vo/FilesParDetailVo.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/files/vo/FilesParDetailVo.java rename to domain/src/main/java/cn/bunny/domain/model/files/vo/FilesParDetailVo.java index 87ac5e3..55dd75a 100644 --- a/domain/src/main/java/cn/bunny/domain/files/vo/FilesParDetailVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/files/vo/FilesParDetailVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.files.vo; +package cn.bunny.domain.model.files.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/files/vo/FilesVo.java b/domain/src/main/java/cn/bunny/domain/model/files/vo/FilesVo.java similarity index 98% rename from domain/src/main/java/cn/bunny/domain/files/vo/FilesVo.java rename to domain/src/main/java/cn/bunny/domain/model/files/vo/FilesVo.java index 5fc427c..5ee0149 100644 --- a/domain/src/main/java/cn/bunny/domain/files/vo/FilesVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/files/vo/FilesVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.files.vo; +package cn.bunny.domain.model.files.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java b/domain/src/main/java/cn/bunny/domain/model/log/dto/ScheduleExecuteLogDto.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java rename to domain/src/main/java/cn/bunny/domain/model/log/dto/ScheduleExecuteLogDto.java index 1917c8b..9bf062c 100644 --- a/domain/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/log/dto/ScheduleExecuteLogDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.log.dto; +package cn.bunny.domain.model.log.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java b/domain/src/main/java/cn/bunny/domain/model/log/dto/UserLoginLogDto.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java rename to domain/src/main/java/cn/bunny/domain/model/log/dto/UserLoginLogDto.java index 3939cab..bc3010d 100644 --- a/domain/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/log/dto/UserLoginLogDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.log.dto; +package cn.bunny.domain.model.log.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java b/domain/src/main/java/cn/bunny/domain/model/log/entity/ScheduleExecuteLog.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java rename to domain/src/main/java/cn/bunny/domain/model/log/entity/ScheduleExecuteLog.java index e5d7543..f1b3b7f 100644 --- a/domain/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java +++ b/domain/src/main/java/cn/bunny/domain/model/log/entity/ScheduleExecuteLog.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.log.entity; +package cn.bunny.domain.model.log.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java b/domain/src/main/java/cn/bunny/domain/model/log/entity/UserLoginLog.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java rename to domain/src/main/java/cn/bunny/domain/model/log/entity/UserLoginLog.java index bf77342..87bf60c 100644 --- a/domain/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java +++ b/domain/src/main/java/cn/bunny/domain/model/log/entity/UserLoginLog.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.log.entity; +package cn.bunny.domain.model.log.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/log/vo/ScheduleExecuteLogVo.java b/domain/src/main/java/cn/bunny/domain/model/log/vo/ScheduleExecuteLogVo.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/log/vo/ScheduleExecuteLogVo.java rename to domain/src/main/java/cn/bunny/domain/model/log/vo/ScheduleExecuteLogVo.java index a6897d1..4ed6744 100644 --- a/domain/src/main/java/cn/bunny/domain/log/vo/ScheduleExecuteLogVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/log/vo/ScheduleExecuteLogVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.log.vo; +package cn.bunny.domain.model.log.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java b/domain/src/main/java/cn/bunny/domain/model/log/vo/UserLoginLogLocalVo.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java rename to domain/src/main/java/cn/bunny/domain/model/log/vo/UserLoginLogLocalVo.java index 66117ec..b2ee069 100644 --- a/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/log/vo/UserLoginLogLocalVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.log.vo; +package cn.bunny.domain.model.log.vo; import cn.bunny.domain.common.model.vo.BaseVo; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java b/domain/src/main/java/cn/bunny/domain/model/log/vo/UserLoginLogVo.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java rename to domain/src/main/java/cn/bunny/domain/model/log/vo/UserLoginLogVo.java index 36e9641..4c9d533 100644 --- a/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/log/vo/UserLoginLogVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.log.vo; +package cn.bunny.domain.model.log.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/domain/src/main/java/cn/bunny/domain/message/dto/MessageDto.java b/domain/src/main/java/cn/bunny/domain/model/message/dto/MessageDto.java similarity index 98% rename from domain/src/main/java/cn/bunny/domain/message/dto/MessageDto.java rename to domain/src/main/java/cn/bunny/domain/model/message/dto/MessageDto.java index e086515..4fe9a9e 100644 --- a/domain/src/main/java/cn/bunny/domain/message/dto/MessageDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/dto/MessageDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.dto; +package cn.bunny.domain.model.message.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java b/domain/src/main/java/cn/bunny/domain/model/message/dto/MessageReceivedDto.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java rename to domain/src/main/java/cn/bunny/domain/model/message/dto/MessageReceivedDto.java index fa2e7d8..0953b6d 100644 --- a/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/dto/MessageReceivedDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.dto; +package cn.bunny.domain.model.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java b/domain/src/main/java/cn/bunny/domain/model/message/dto/MessageReceivedUpdateDto.java similarity index 92% rename from domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java rename to domain/src/main/java/cn/bunny/domain/model/message/dto/MessageReceivedUpdateDto.java index ef180a0..df12897 100644 --- a/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/dto/MessageReceivedUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.dto; +package cn.bunny.domain.model.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java b/domain/src/main/java/cn/bunny/domain/model/message/dto/MessageTypeDto.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java rename to domain/src/main/java/cn/bunny/domain/model/message/dto/MessageTypeDto.java index 326528e..fa401ce 100644 --- a/domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/dto/MessageTypeDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.dto; +package cn.bunny.domain.model.message.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java b/domain/src/main/java/cn/bunny/domain/model/message/dto/MessageUserDto.java similarity index 93% rename from domain/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java rename to domain/src/main/java/cn/bunny/domain/model/message/dto/MessageUserDto.java index dbc0833..28169f8 100644 --- a/domain/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/dto/MessageUserDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.dto; +package cn.bunny.domain.model.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/message/entity/Message.java b/domain/src/main/java/cn/bunny/domain/model/message/entity/Message.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/message/entity/Message.java rename to domain/src/main/java/cn/bunny/domain/model/message/entity/Message.java index fd44a9d..0cc21fe 100644 --- a/domain/src/main/java/cn/bunny/domain/message/entity/Message.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/entity/Message.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.entity; +package cn.bunny.domain.model.message.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java b/domain/src/main/java/cn/bunny/domain/model/message/entity/MessageReceived.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java rename to domain/src/main/java/cn/bunny/domain/model/message/entity/MessageReceived.java index fd348ad..e094d01 100644 --- a/domain/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/entity/MessageReceived.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.entity; +package cn.bunny.domain.model.message.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/message/entity/MessageType.java b/domain/src/main/java/cn/bunny/domain/model/message/entity/MessageType.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/message/entity/MessageType.java rename to domain/src/main/java/cn/bunny/domain/model/message/entity/MessageType.java index 65ed9aa..7db4740 100644 --- a/domain/src/main/java/cn/bunny/domain/message/entity/MessageType.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/entity/MessageType.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.entity; +package cn.bunny.domain.model.message.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageDetailVo.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java rename to domain/src/main/java/cn/bunny/domain/model/message/vo/MessageDetailVo.java index e435784..7953fff 100644 --- a/domain/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageDetailVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.vo; +package cn.bunny.domain.model.message.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageReceivedWithMessageVo.java similarity index 98% rename from domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java rename to domain/src/main/java/cn/bunny/domain/model/message/vo/MessageReceivedWithMessageVo.java index 1899218..c2d3191 100644 --- a/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageReceivedWithMessageVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.vo; +package cn.bunny.domain.model.message.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageReceivedWithUserVo.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java rename to domain/src/main/java/cn/bunny/domain/model/message/vo/MessageReceivedWithUserVo.java index d6bc714..fbecbe5 100644 --- a/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageReceivedWithUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.vo; +package cn.bunny.domain.model.message.vo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/domain/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageTypeVo.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java rename to domain/src/main/java/cn/bunny/domain/model/message/vo/MessageTypeVo.java index 5115e1b..c33ccc1 100644 --- a/domain/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageTypeVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.vo; +package cn.bunny.domain.model.message.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageUserVo.java similarity index 98% rename from domain/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java rename to domain/src/main/java/cn/bunny/domain/model/message/vo/MessageUserVo.java index 64458be..07c453c 100644 --- a/domain/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.vo; +package cn.bunny.domain.model.message.vo; import cn.bunny.domain.common.model.vo.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/domain/src/main/java/cn/bunny/domain/message/vo/MessageVo.java b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageVo.java similarity index 98% rename from domain/src/main/java/cn/bunny/domain/message/vo/MessageVo.java rename to domain/src/main/java/cn/bunny/domain/model/message/vo/MessageVo.java index 3137c50..f045eab 100644 --- a/domain/src/main/java/cn/bunny/domain/message/vo/MessageVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/message/vo/MessageVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.message.vo; +package cn.bunny.domain.model.message.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersDto.java b/domain/src/main/java/cn/bunny/domain/model/schedule/dto/SchedulersDto.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersDto.java rename to domain/src/main/java/cn/bunny/domain/model/schedule/dto/SchedulersDto.java index 6572278..d55ab2a 100644 --- a/domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/schedule/dto/SchedulersDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.schedule.dto; +package cn.bunny.domain.model.schedule.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersGroupDto.java b/domain/src/main/java/cn/bunny/domain/model/schedule/dto/SchedulersGroupDto.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersGroupDto.java rename to domain/src/main/java/cn/bunny/domain/model/schedule/dto/SchedulersGroupDto.java index 4c8287b..3123d6b 100644 --- a/domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersGroupDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/schedule/dto/SchedulersGroupDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.schedule.dto; +package cn.bunny.domain.model.schedule.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/schedule/entity/Schedulers.java b/domain/src/main/java/cn/bunny/domain/model/schedule/entity/Schedulers.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/schedule/entity/Schedulers.java rename to domain/src/main/java/cn/bunny/domain/model/schedule/entity/Schedulers.java index 13ba442..9ecd12d 100644 --- a/domain/src/main/java/cn/bunny/domain/schedule/entity/Schedulers.java +++ b/domain/src/main/java/cn/bunny/domain/model/schedule/entity/Schedulers.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.schedule.entity; +package cn.bunny.domain.model.schedule.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/schedule/entity/SchedulersGroup.java b/domain/src/main/java/cn/bunny/domain/model/schedule/entity/SchedulersGroup.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/schedule/entity/SchedulersGroup.java rename to domain/src/main/java/cn/bunny/domain/model/schedule/entity/SchedulersGroup.java index 0abecac..f2b524b 100644 --- a/domain/src/main/java/cn/bunny/domain/schedule/entity/SchedulersGroup.java +++ b/domain/src/main/java/cn/bunny/domain/model/schedule/entity/SchedulersGroup.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.schedule.entity; +package cn.bunny.domain.model.schedule.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersGroupVo.java b/domain/src/main/java/cn/bunny/domain/model/schedule/vo/SchedulersGroupVo.java similarity index 92% rename from domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersGroupVo.java rename to domain/src/main/java/cn/bunny/domain/model/schedule/vo/SchedulersGroupVo.java index 2e3e28c..9944cbd 100644 --- a/domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersGroupVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/schedule/vo/SchedulersGroupVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.schedule.vo; +package cn.bunny.domain.model.schedule.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersVo.java b/domain/src/main/java/cn/bunny/domain/model/schedule/vo/SchedulersVo.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersVo.java rename to domain/src/main/java/cn/bunny/domain/model/schedule/vo/SchedulersVo.java index 02e380f..2fd4fcc 100644 --- a/domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/schedule/vo/SchedulersVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.schedule.vo; +package cn.bunny.domain.model.schedule.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/AssignPowersToRoleDto.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/AssignPowersToRoleDto.java index a36604a..c9a623a 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/AssignPowersToRoleDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto; +package cn.bunny.domain.model.system.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/DeptDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/DeptDto.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/system/dto/DeptDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/DeptDto.java index 4a66a0f..a3c4e1a 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/DeptDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/DeptDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto; +package cn.bunny.domain.model.system.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/PermissionDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/PermissionDto.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/system/dto/PermissionDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/PermissionDto.java index 6ea6227..3801d4f 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/PermissionDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/PermissionDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto; +package cn.bunny.domain.model.system.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/PermissionUpdateBatchByParentIdDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/PermissionUpdateBatchByParentIdDto.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/system/dto/PermissionUpdateBatchByParentIdDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/PermissionUpdateBatchByParentIdDto.java index 659bdc3..6372b27 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/PermissionUpdateBatchByParentIdDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/PermissionUpdateBatchByParentIdDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto; +package cn.bunny.domain.model.system.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/RoleDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/RoleDto.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/system/dto/RoleDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/RoleDto.java index 5e0ca53..3fd405e 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/RoleDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/RoleDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto; +package cn.bunny.domain.model.system.dto; import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/RouterDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/RouterDto.java similarity index 93% rename from domain/src/main/java/cn/bunny/domain/system/dto/RouterDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/RouterDto.java index c43bb46..17d3892 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/RouterDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/RouterDto.java @@ -1,7 +1,7 @@ -package cn.bunny.domain.system.dto; +package cn.bunny.domain.model.system.dto; import cn.bunny.domain.common.ValidationGroups; -import cn.bunny.domain.system.entity.router.RouterMeta; +import cn.bunny.domain.model.system.entity.router.RouterMeta; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserAddDto.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserAddDto.java index 5d1a531..c767a17 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto.user; +package cn.bunny.domain.model.system.dto.user; import cn.bunny.domain.common.constant.UserConstant; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserDto.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserDto.java index 6680952..60abf1a 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto.user; +package cn.bunny.domain.model.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserUpdateByLocalUserDto.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserUpdateByLocalUserDto.java index c34c78f..a4f2b53 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserUpdateByLocalUserDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto.user; +package cn.bunny.domain.model.system.dto.user; import cn.bunny.domain.common.constant.UserConstant; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserUpdateDto.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserUpdateDto.java index 9a52591..2056c0f 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/AdminUserUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto.user; +package cn.bunny.domain.model.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/AssignRolesToUsersDto.java similarity index 92% rename from domain/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/user/AssignRolesToUsersDto.java index f952305..a22159a 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/AssignRolesToUsersDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto.user; +package cn.bunny.domain.model.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/LoginDto.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/user/LoginDto.java index e1cc0b5..462d999 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/LoginDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto.user; +package cn.bunny.domain.model.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/domain/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/RefreshTokenDto.java similarity index 92% rename from domain/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java rename to domain/src/main/java/cn/bunny/domain/model/system/dto/user/RefreshTokenDto.java index a5cb48c..2064eae 100644 --- a/domain/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/dto/user/RefreshTokenDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.dto.user; +package cn.bunny.domain.model.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/AdminUser.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/AdminUser.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/system/entity/AdminUser.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/AdminUser.java index 806c4eb..3e1bbad 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/AdminUser.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/AdminUser.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity; +package cn.bunny.domain.model.system.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/Dept.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/Dept.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/system/entity/Dept.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/Dept.java index ce6727f..10541e1 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/Dept.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/Dept.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity; +package cn.bunny.domain.model.system.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/Permission.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/Permission.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/system/entity/Permission.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/Permission.java index 8c96537..bee05f3 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/Permission.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/Permission.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity; +package cn.bunny.domain.model.system.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/Role.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/Role.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/system/entity/Role.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/Role.java index b4c1934..6cf9e02 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/Role.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/Role.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity; +package cn.bunny.domain.model.system.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/RolePermission.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/RolePermission.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/system/entity/RolePermission.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/RolePermission.java index ceb7ca1..18e5c97 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/RolePermission.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/RolePermission.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity; +package cn.bunny.domain.model.system.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/RouterRole.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/RouterRole.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/system/entity/RouterRole.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/RouterRole.java index 2fb224f..cbc8896 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/RouterRole.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/RouterRole.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity; +package cn.bunny.domain.model.system.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/UserDept.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/UserDept.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/system/entity/UserDept.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/UserDept.java index 482b1ec..4a6bb98 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/UserDept.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/UserDept.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity; +package cn.bunny.domain.model.system.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/UserRole.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/UserRole.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/system/entity/UserRole.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/UserRole.java index 5ce6c18..07d64f1 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/UserRole.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/UserRole.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity; +package cn.bunny.domain.model.system.entity; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/router/Router.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/router/Router.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/system/entity/router/Router.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/router/Router.java index 2b115b1..7b7c92d 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/router/Router.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/router/Router.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity.router; +package cn.bunny.domain.model.system.entity.router; import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMeta.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/router/RouterMeta.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMeta.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/router/RouterMeta.java index b9fb1de..d4980ad 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMeta.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/router/RouterMeta.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity.router; +package cn.bunny.domain.model.system.entity.router; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMetaTransition.java b/domain/src/main/java/cn/bunny/domain/model/system/entity/router/RouterMetaTransition.java similarity index 91% rename from domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMetaTransition.java rename to domain/src/main/java/cn/bunny/domain/model/system/entity/router/RouterMetaTransition.java index 26ecd92..cb30a2c 100644 --- a/domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMetaTransition.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/entity/router/RouterMetaTransition.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.entity.router; +package cn.bunny.domain.model.system.entity.router; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/system/views/ViewRolePermission.java b/domain/src/main/java/cn/bunny/domain/model/system/views/ViewRolePermission.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/system/views/ViewRolePermission.java rename to domain/src/main/java/cn/bunny/domain/model/system/views/ViewRolePermission.java index c87b046..f7ff531 100644 --- a/domain/src/main/java/cn/bunny/domain/system/views/ViewRolePermission.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/views/ViewRolePermission.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.views; +package cn.bunny.domain.model.system.views; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/system/views/ViewRouterRole.java b/domain/src/main/java/cn/bunny/domain/model/system/views/ViewRouterRole.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/system/views/ViewRouterRole.java rename to domain/src/main/java/cn/bunny/domain/model/system/views/ViewRouterRole.java index 9323d09..c5c9b17 100644 --- a/domain/src/main/java/cn/bunny/domain/system/views/ViewRouterRole.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/views/ViewRouterRole.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.views; +package cn.bunny.domain.model.system.views; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/system/views/ViewUserDept.java b/domain/src/main/java/cn/bunny/domain/model/system/views/ViewUserDept.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/system/views/ViewUserDept.java rename to domain/src/main/java/cn/bunny/domain/model/system/views/ViewUserDept.java index 736cf93..7b330ff 100644 --- a/domain/src/main/java/cn/bunny/domain/system/views/ViewUserDept.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/views/ViewUserDept.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.views; +package cn.bunny.domain.model.system.views; import cn.bunny.domain.common.model.entity.BaseUserEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/domain/src/main/java/cn/bunny/domain/system/vo/DeptVo.java b/domain/src/main/java/cn/bunny/domain/model/system/vo/DeptVo.java similarity index 94% rename from domain/src/main/java/cn/bunny/domain/system/vo/DeptVo.java rename to domain/src/main/java/cn/bunny/domain/model/system/vo/DeptVo.java index 95943d5..56916fa 100644 --- a/domain/src/main/java/cn/bunny/domain/system/vo/DeptVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/vo/DeptVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.vo; +package cn.bunny.domain.model.system.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/system/vo/PermissionVo.java b/domain/src/main/java/cn/bunny/domain/model/system/vo/PermissionVo.java similarity index 96% rename from domain/src/main/java/cn/bunny/domain/system/vo/PermissionVo.java rename to domain/src/main/java/cn/bunny/domain/model/system/vo/PermissionVo.java index 7135c5d..57f1ba3 100644 --- a/domain/src/main/java/cn/bunny/domain/system/vo/PermissionVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/vo/PermissionVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.vo; +package cn.bunny.domain.model.system.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/domain/src/main/java/cn/bunny/domain/system/vo/RoleVo.java b/domain/src/main/java/cn/bunny/domain/model/system/vo/RoleVo.java similarity index 92% rename from domain/src/main/java/cn/bunny/domain/system/vo/RoleVo.java rename to domain/src/main/java/cn/bunny/domain/model/system/vo/RoleVo.java index 6f5c5a7..5c80188 100644 --- a/domain/src/main/java/cn/bunny/domain/system/vo/RoleVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/vo/RoleVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.vo; +package cn.bunny.domain.model.system.vo; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java b/domain/src/main/java/cn/bunny/domain/model/system/vo/router/RouterManageVo.java similarity index 98% rename from domain/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java rename to domain/src/main/java/cn/bunny/domain/model/system/vo/router/RouterManageVo.java index 17e575d..775322f 100644 --- a/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/vo/router/RouterManageVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.vo.router; +package cn.bunny.domain.model.system.vo.router; import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterVo.java b/domain/src/main/java/cn/bunny/domain/model/system/vo/router/RouterVo.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/system/vo/router/RouterVo.java rename to domain/src/main/java/cn/bunny/domain/model/system/vo/router/RouterVo.java index 4f5c4a4..858dbcb 100644 --- a/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/vo/router/RouterVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.vo.router; +package cn.bunny.domain.model.system.vo.router; import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/domain/src/main/java/cn/bunny/domain/system/vo/router/WebUserRouterVo.java b/domain/src/main/java/cn/bunny/domain/model/system/vo/router/WebUserRouterVo.java similarity index 93% rename from domain/src/main/java/cn/bunny/domain/system/vo/router/WebUserRouterVo.java rename to domain/src/main/java/cn/bunny/domain/model/system/vo/router/WebUserRouterVo.java index cf35957..4be468f 100644 --- a/domain/src/main/java/cn/bunny/domain/system/vo/router/WebUserRouterVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/vo/router/WebUserRouterVo.java @@ -1,6 +1,6 @@ -package cn.bunny.domain.system.vo.router; +package cn.bunny.domain.model.system.vo.router; -import cn.bunny.domain.system.entity.router.RouterMeta; +import cn.bunny.domain.model.system.entity.router.RouterMeta; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/domain/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java b/domain/src/main/java/cn/bunny/domain/model/system/vo/user/AdminUserVo.java similarity index 97% rename from domain/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java rename to domain/src/main/java/cn/bunny/domain/model/system/vo/user/AdminUserVo.java index 3736d84..7aa7610 100644 --- a/domain/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/vo/user/AdminUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.vo.user; +package cn.bunny.domain.model.system.vo.user; import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/domain/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java b/domain/src/main/java/cn/bunny/domain/model/system/vo/user/RefreshTokenVo.java similarity index 92% rename from domain/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java rename to domain/src/main/java/cn/bunny/domain/model/system/vo/user/RefreshTokenVo.java index 689c746..f089798 100644 --- a/domain/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/vo/user/RefreshTokenVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.vo.user; +package cn.bunny.domain.model.system.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/domain/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java b/domain/src/main/java/cn/bunny/domain/model/system/vo/user/UserVo.java similarity index 95% rename from domain/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java rename to domain/src/main/java/cn/bunny/domain/model/system/vo/user/UserVo.java index 071c283..e51e7be 100644 --- a/domain/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java +++ b/domain/src/main/java/cn/bunny/domain/model/system/vo/user/UserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.system.vo.user; +package cn.bunny.domain.model.system.vo.user; import cn.bunny.domain.common.model.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema;