diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java index 0c8f4a959..26b6534e4 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java @@ -18,11 +18,11 @@ import cn.stylefeng.roses.kernel.jwt.api.exception.enums.JwtExceptionEnum; import cn.stylefeng.roses.kernel.jwt.api.pojo.payload.DefaultJwtPayload; import cn.stylefeng.roses.kernel.message.api.expander.WebSocketConfigExpander; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; -import cn.stylefeng.roses.kernel.system.LoginLogServiceApi; -import cn.stylefeng.roses.kernel.system.UserServiceApi; -import cn.stylefeng.roses.kernel.system.enums.UserStatusEnum; -import cn.stylefeng.roses.kernel.system.expander.SystemConfigExpander; -import cn.stylefeng.roses.kernel.system.pojo.user.UserLoginInfoDTO; +import cn.stylefeng.roses.kernel.system.api.LoginLogServiceApi; +import cn.stylefeng.roses.kernel.system.api.UserServiceApi; +import cn.stylefeng.roses.kernel.system.api.enums.UserStatusEnum; +import cn.stylefeng.roses.kernel.system.api.expander.SystemConfigExpander; +import cn.stylefeng.roses.kernel.system.api.pojo.user.UserLoginInfoDTO; import cn.stylefeng.roses.kernel.validator.CaptchaApi; import cn.stylefeng.roses.kernel.validator.exception.enums.ValidatorExceptionEnum; import org.springframework.stereotype.Service; diff --git a/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/service/impl/SysSmsInfoServiceImpl.java b/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/service/impl/SysSmsInfoServiceImpl.java index 7c6decb50..f430cbc9e 100644 --- a/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/service/impl/SysSmsInfoServiceImpl.java +++ b/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/service/impl/SysSmsInfoServiceImpl.java @@ -18,7 +18,7 @@ import cn.stylefeng.roses.kernel.sms.modular.param.SysSmsInfoParam; import cn.stylefeng.roses.kernel.sms.modular.param.SysSmsSendParam; import cn.stylefeng.roses.kernel.sms.modular.param.SysSmsVerifyParam; import cn.stylefeng.roses.kernel.sms.modular.service.SysSmsInfoService; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; import cn.stylefeng.roses.kernel.validator.CaptchaApi; import cn.stylefeng.roses.kernel.validator.exception.enums.ValidatorExceptionEnum; import com.alibaba.fastjson.JSON; diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java index 444ec7f4a..922a04caa 100644 --- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java +++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java @@ -19,8 +19,8 @@ import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageSendRequest; import cn.stylefeng.roses.kernel.message.db.entity.SysMessage; import cn.stylefeng.roses.kernel.message.db.service.SysMessageService; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; -import cn.stylefeng.roses.kernel.system.UserServiceApi; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.UserServiceApi; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/AppServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/AppServiceApi.java similarity index 95% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/AppServiceApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/AppServiceApi.java index b26f64195..beaf8ef28 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/AppServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/AppServiceApi.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/DataScopeApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/DataScopeApi.java similarity index 77% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/DataScopeApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/DataScopeApi.java index 7a40cb4e6..3522d3697 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/DataScopeApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/DataScopeApi.java @@ -1,7 +1,7 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; -import cn.stylefeng.roses.kernel.system.pojo.organization.DataScopeDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.DataScopeDTO; import java.util.List; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/LoginLogServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/LoginLogServiceApi.java similarity index 89% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/LoginLogServiceApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/LoginLogServiceApi.java index cd691c576..5d5d7f9fa 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/LoginLogServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/LoginLogServiceApi.java @@ -1,6 +1,6 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; -import cn.stylefeng.roses.kernel.system.pojo.loginlog.SysLoginLogRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.loginlog.SysLoginLogRequest; /** * 登录日志api接口 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/MenuServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/MenuServiceApi.java similarity index 89% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/MenuServiceApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/MenuServiceApi.java index 4bae223c7..b78b43d12 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/MenuServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/MenuServiceApi.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; /** * 菜单api diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/NoticeServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/NoticeServiceApi.java similarity index 70% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/NoticeServiceApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/NoticeServiceApi.java index ee1c4152a..279822614 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/NoticeServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/NoticeServiceApi.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; /** * 通知api diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/OrganizationServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java similarity index 72% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/OrganizationServiceApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java index 3f6e5a338..4e21dee1e 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/OrganizationServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java @@ -1,6 +1,6 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; -import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO; import java.util.List; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/ResourceServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/ResourceServiceApi.java similarity index 95% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/ResourceServiceApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/ResourceServiceApi.java index e800e1637..1013adc75 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/ResourceServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/ResourceServiceApi.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition; import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceUrlParam; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/RoleDataScopeServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleDataScopeServiceApi.java similarity index 89% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/RoleDataScopeServiceApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleDataScopeServiceApi.java index 428b50ef6..d1b7b463d 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/RoleDataScopeServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleDataScopeServiceApi.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; import java.util.Set; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/RoleServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleServiceApi.java similarity index 86% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/RoleServiceApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleServiceApi.java index cdf65611c..fc9b31843 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/RoleServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleServiceApi.java @@ -1,9 +1,9 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleMenuButtonDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleMenuDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleResourceDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleMenuButtonDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleMenuDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleResourceDTO; import java.util.List; import java.util.Set; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserOrgServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java similarity index 82% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserOrgServiceApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java index d372484b1..fa97794e6 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserOrgServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java @@ -1,6 +1,6 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserOrgDTO; /** * 用户组织机构服务api diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserServiceApi.java similarity index 86% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserServiceApi.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserServiceApi.java index 6348dc8ca..ed9bf8693 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserServiceApi.java @@ -1,10 +1,10 @@ -package cn.stylefeng.roses.kernel.system; +package cn.stylefeng.roses.kernel.system.api; -import cn.stylefeng.roses.kernel.system.pojo.user.OnlineUserDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.UserLoginInfoDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.request.OnlineUserRequest; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.OnlineUserDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.UserLoginInfoDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.OnlineUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; import java.util.Date; import java.util.List; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/constants/SystemConstants.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java similarity index 92% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/constants/SystemConstants.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java index 79c1a2e75..9c6a9c2b3 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/constants/SystemConstants.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.constants; +package cn.stylefeng.roses.kernel.system.api.constants; /** * 系统管理模块的常量 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/enums/LinkOpenTypeEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/enums/LinkOpenTypeEnum.java similarity index 91% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/enums/LinkOpenTypeEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/enums/LinkOpenTypeEnum.java index fb2786090..0d9a87f56 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/enums/LinkOpenTypeEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/enums/LinkOpenTypeEnum.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.enums; +package cn.stylefeng.roses.kernel.system.api.enums; import lombok.Getter; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/enums/UserStatusEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/enums/UserStatusEnum.java similarity index 89% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/enums/UserStatusEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/enums/UserStatusEnum.java index 01c9d500e..3571bf5ab 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/enums/UserStatusEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/enums/UserStatusEnum.java @@ -1,7 +1,7 @@ -package cn.stylefeng.roses.kernel.system.enums; +package cn.stylefeng.roses.kernel.system.api.enums; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.user.SysUserExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/SystemModularException.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/SystemModularException.java similarity index 84% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/SystemModularException.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/SystemModularException.java index 3b7e47a61..7ba53c96e 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/SystemModularException.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/SystemModularException.java @@ -1,9 +1,9 @@ -package cn.stylefeng.roses.kernel.system.exception; +package cn.stylefeng.roses.kernel.system.api.exception; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; /** * 系统管理模块的异常 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/app/AppExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/app/AppExceptionEnum.java similarity index 91% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/app/AppExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/app/AppExceptionEnum.java index c5b181dc4..6056d5e18 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/app/AppExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/app/AppExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.app; +package cn.stylefeng.roses.kernel.system.api.exception.enums.app; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/log/LogExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/log/LogExceptionEnum.java similarity index 85% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/log/LogExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/log/LogExceptionEnum.java index 3b30d4bcb..3fa0527af 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/log/LogExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/log/LogExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.log; +package cn.stylefeng.roses.kernel.system.api.exception.enums.log; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuButtonExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/menu/SysMenuButtonExceptionEnum.java similarity index 86% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuButtonExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/menu/SysMenuButtonExceptionEnum.java index 3ee4af68f..b241c80e0 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuButtonExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/menu/SysMenuButtonExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.menu; +package cn.stylefeng.roses.kernel.system.api.exception.enums.menu; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; /** * 菜单按钮异常枚举 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/menu/SysMenuExceptionEnum.java similarity index 89% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/menu/SysMenuExceptionEnum.java index 5ad376a6d..b03684a48 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/menu/SysMenuExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.menu; +package cn.stylefeng.roses.kernel.system.api.exception.enums.menu; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; /** * 系统菜单相关异常枚举 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/notice/NoticeExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/notice/NoticeExceptionEnum.java similarity index 87% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/notice/NoticeExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/notice/NoticeExceptionEnum.java index 3ef079d06..17c8ed985 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/notice/NoticeExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/notice/NoticeExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.notice; +package cn.stylefeng.roses.kernel.system.api.exception.enums.notice; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/DataScopeExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/organization/DataScopeExceptionEnum.java similarity index 90% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/DataScopeExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/organization/DataScopeExceptionEnum.java index 0f02d872c..8fb1e3477 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/DataScopeExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/organization/DataScopeExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.organization; +package cn.stylefeng.roses.kernel.system.api.exception.enums.organization; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/OrganizationExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/organization/OrganizationExceptionEnum.java similarity index 92% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/OrganizationExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/organization/OrganizationExceptionEnum.java index d033936e1..413ad3846 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/OrganizationExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/organization/OrganizationExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.organization; +package cn.stylefeng.roses.kernel.system.api.exception.enums.organization; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/PositionExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/organization/PositionExceptionEnum.java similarity index 87% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/PositionExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/organization/PositionExceptionEnum.java index 4f8831ac1..a94617de3 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/PositionExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/organization/PositionExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.organization; +package cn.stylefeng.roses.kernel.system.api.exception.enums.organization; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/role/SysRoleExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/role/SysRoleExceptionEnum.java similarity index 93% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/role/SysRoleExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/role/SysRoleExceptionEnum.java index 033f28fc9..4ea0b3433 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/role/SysRoleExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/role/SysRoleExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.role; +package cn.stylefeng.roses.kernel.system.api.exception.enums.role; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/user/SysUserExceptionEnum.java similarity index 95% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/user/SysUserExceptionEnum.java index 99f9ba014..b1332ff85 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/user/SysUserExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.user; +package cn.stylefeng.roses.kernel.system.api.exception.enums.user; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserOrgExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/user/SysUserOrgExceptionEnum.java similarity index 91% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserOrgExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/user/SysUserOrgExceptionEnum.java index b6e7cc7f6..0789f4349 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserOrgExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/exception/enums/user/SysUserOrgExceptionEnum.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.exception.enums.user; +package cn.stylefeng.roses.kernel.system.api.exception.enums.user; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/expander/SystemConfigExpander.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/expander/SystemConfigExpander.java similarity index 93% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/expander/SystemConfigExpander.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/expander/SystemConfigExpander.java index 094b3b841..601ec8960 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/expander/SystemConfigExpander.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/expander/SystemConfigExpander.java @@ -1,7 +1,7 @@ -package cn.stylefeng.roses.kernel.system.expander; +package cn.stylefeng.roses.kernel.system.api.expander; import cn.stylefeng.roses.kernel.config.api.context.ConfigContext; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import static cn.stylefeng.roses.kernel.auth.api.constants.AuthConstants.DEFAULT_PASSWORD; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/app/SysAppRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/app/SysAppRequest.java similarity index 97% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/app/SysAppRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/app/SysAppRequest.java index d34323d62..01df41a0b 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/app/SysAppRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/app/SysAppRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.app; +package cn.stylefeng.roses.kernel.system.api.pojo.app; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/loginlog/SysLoginLogRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/loginlog/SysLoginLogRequest.java similarity index 94% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/loginlog/SysLoginLogRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/loginlog/SysLoginLogRequest.java index c6bcedb20..3e1e16cc8 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/loginlog/SysLoginLogRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/loginlog/SysLoginLogRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.loginlog; +package cn.stylefeng.roses.kernel.system.api.pojo.loginlog; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuButtonRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuButtonRequest.java similarity index 97% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuButtonRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuButtonRequest.java index e99ed9c44..d5b82a56d 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuButtonRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuButtonRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.menu; +package cn.stylefeng.roses.kernel.system.api.pojo.menu; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuRequest.java similarity index 98% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuRequest.java index dd9732605..61666f089 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.menu; +package cn.stylefeng.roses.kernel.system.api.pojo.menu; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.validators.flag.FlagValue; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdMenuSelectTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdMenuSelectTreeNode.java similarity index 94% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdMenuSelectTreeNode.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdMenuSelectTreeNode.java index 2e0a000ee..e492eedc2 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdMenuSelectTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdMenuSelectTreeNode.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.menu.antd; +package cn.stylefeng.roses.kernel.system.api.pojo.menu.antd; import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdSysMenuDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdSysMenuDTO.java similarity index 94% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdSysMenuDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdSysMenuDTO.java index 4a9516d2d..c8749d7ad 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdSysMenuDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdSysMenuDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.menu.antd; +package cn.stylefeng.roses.kernel.system.api.pojo.menu.antd; import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdvMenuAuthorityItem.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdvMenuAuthorityItem.java similarity index 84% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdvMenuAuthorityItem.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdvMenuAuthorityItem.java index f7e5f9732..16c1c4e63 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdvMenuAuthorityItem.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdvMenuAuthorityItem.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.menu.antd; +package cn.stylefeng.roses.kernel.system.api.pojo.menu.antd; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdvMenuItem.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdvMenuItem.java similarity index 94% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdvMenuItem.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdvMenuItem.java index f0fa75d89..1c3766f75 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdvMenuItem.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdvMenuItem.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.menu.antd; +package cn.stylefeng.roses.kernel.system.api.pojo.menu.antd; import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/layui/LayuiAppIndexMenusVO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiAppIndexMenusVO.java similarity index 88% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/layui/LayuiAppIndexMenusVO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiAppIndexMenusVO.java index 9ed979c56..2a5b0e329 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/layui/LayuiAppIndexMenusVO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiAppIndexMenusVO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.menu.layui; +package cn.stylefeng.roses.kernel.system.api.pojo.menu.layui; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/layui/LayuiIndexMenuTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiIndexMenuTreeNode.java similarity index 94% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/layui/LayuiIndexMenuTreeNode.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiIndexMenuTreeNode.java index fe8166062..392a878e0 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/layui/LayuiIndexMenuTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiIndexMenuTreeNode.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.menu.layui; +package cn.stylefeng.roses.kernel.system.api.pojo.menu.layui; import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/layui/LayuiMenuAndButtonTreeResponse.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiMenuAndButtonTreeResponse.java similarity index 94% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/layui/LayuiMenuAndButtonTreeResponse.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiMenuAndButtonTreeResponse.java index 293657230..6e644cf01 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/layui/LayuiMenuAndButtonTreeResponse.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiMenuAndButtonTreeResponse.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.menu.layui; +package cn.stylefeng.roses.kernel.system.api.pojo.menu.layui; import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/SysNoticeRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/notice/SysNoticeRequest.java similarity index 96% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/SysNoticeRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/notice/SysNoticeRequest.java index 58f232209..630a5269f 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/SysNoticeRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/notice/SysNoticeRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.notice; +package cn.stylefeng.roses.kernel.system.api.pojo.notice; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/DataScopeDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/DataScopeDTO.java similarity index 89% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/DataScopeDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/DataScopeDTO.java index 5b972fa5e..972e5bff0 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/DataScopeDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/DataScopeDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.organization; +package cn.stylefeng.roses.kernel.system.api.pojo.organization; import cn.stylefeng.roses.kernel.auth.api.enums.DataScopeTypeEnum; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java similarity index 92% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java index 9a36335aa..4610e1764 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.organization; +package cn.stylefeng.roses.kernel.system.api.pojo.organization; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java similarity index 97% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java index d2100774c..3dadc742c 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.organization; +package cn.stylefeng.roses.kernel.system.api.pojo.organization; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrPositionRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrPositionRequest.java similarity index 96% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrPositionRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrPositionRequest.java index 0c3fc68d9..57be12e5d 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrPositionRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrPositionRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.organization; +package cn.stylefeng.roses.kernel.system.api.pojo.organization; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/layui/LayuiOrganizationTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/layui/LayuiOrganizationTreeNode.java similarity index 95% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/layui/LayuiOrganizationTreeNode.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/layui/LayuiOrganizationTreeNode.java index 827e14cf3..e456d282b 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/layui/LayuiOrganizationTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/layui/LayuiOrganizationTreeNode.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.organization.layui; +package cn.stylefeng.roses.kernel.system.api.pojo.organization.layui; import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import cn.stylefeng.roses.kernel.rule.tree.xmtree.base.AbstractXmSelectNode; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/resource/LayuiApiResourceTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/LayuiApiResourceTreeNode.java similarity index 95% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/resource/LayuiApiResourceTreeNode.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/LayuiApiResourceTreeNode.java index 118092bfa..967f86474 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/resource/LayuiApiResourceTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/LayuiApiResourceTreeNode.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.resource; +package cn.stylefeng.roses.kernel.system.api.pojo.resource; import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/resource/ResourceRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/ResourceRequest.java similarity index 93% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/resource/ResourceRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/ResourceRequest.java index 4fafcbdbd..8e029d5b5 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/resource/ResourceRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/ResourceRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.resource; +package cn.stylefeng.roses.kernel.system.api.pojo.resource; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleDTO.java similarity index 95% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleDTO.java index 32956b3f8..0647003e7 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.role.dto; +package cn.stylefeng.roses.kernel.system.api.pojo.role.dto; import cn.stylefeng.roses.kernel.auth.api.enums.DataScopeTypeEnum; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleMenuButtonDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleMenuButtonDTO.java similarity index 86% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleMenuButtonDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleMenuButtonDTO.java index 2e5a8c180..62d323d7a 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleMenuButtonDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleMenuButtonDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.role.dto; +package cn.stylefeng.roses.kernel.system.api.pojo.role.dto; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleMenuDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleMenuDTO.java similarity index 84% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleMenuDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleMenuDTO.java index 973e5e49c..9c40c41fb 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleMenuDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleMenuDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.role.dto; +package cn.stylefeng.roses.kernel.system.api.pojo.role.dto; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleResourceDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleResourceDTO.java similarity index 89% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleResourceDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleResourceDTO.java index 89e28b622..e1be631a8 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/dto/SysRoleResourceDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/SysRoleResourceDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.role.dto; +package cn.stylefeng.roses.kernel.system.api.pojo.role.dto; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleDataScopeRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleDataScopeRequest.java similarity index 84% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleDataScopeRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleDataScopeRequest.java index ee00cf3b4..4ce2b96f2 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleDataScopeRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleDataScopeRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.role.request; +package cn.stylefeng.roses.kernel.system.api.pojo.role.request; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleMenuButtonRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleMenuButtonRequest.java similarity index 80% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleMenuButtonRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleMenuButtonRequest.java index 012cfe409..131fe7066 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleMenuButtonRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleMenuButtonRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.role.request; +package cn.stylefeng.roses.kernel.system.api.pojo.role.request; import lombok.Data; @@ -10,7 +10,7 @@ import lombok.Data; */ @Data public class SysRoleMenuButtonRequest { - + /** * 按钮id */ diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleRequest.java similarity index 97% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleRequest.java index 8cf5c2819..12ac584ec 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.role.request; +package cn.stylefeng.roses.kernel.system.api.pojo.role.request; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/OnlineUserDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/OnlineUserDTO.java similarity index 92% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/OnlineUserDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/OnlineUserDTO.java index 46379eba4..0fc163a04 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/OnlineUserDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/OnlineUserDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.user; +package cn.stylefeng.roses.kernel.system.api.pojo.user; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/SysUserDTO.java similarity index 95% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/SysUserDTO.java index 5708d91b0..211186a73 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/SysUserDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.user; +package cn.stylefeng.roses.kernel.system.api.pojo.user; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserOrgDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/SysUserOrgDTO.java similarity index 88% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserOrgDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/SysUserOrgDTO.java index eb7b41f33..66827d2b3 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserOrgDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/SysUserOrgDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.user; +package cn.stylefeng.roses.kernel.system.api.pojo.user; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/UserLoginInfoDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/UserLoginInfoDTO.java similarity index 90% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/UserLoginInfoDTO.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/UserLoginInfoDTO.java index 8671231b0..dd66d4d55 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/UserLoginInfoDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/UserLoginInfoDTO.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.user; +package cn.stylefeng.roses.kernel.system.api.pojo.user; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/UserSelectTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/UserSelectTreeNode.java similarity index 94% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/UserSelectTreeNode.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/UserSelectTreeNode.java index 7e9141c37..0e7a56e3b 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/UserSelectTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/UserSelectTreeNode.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.user; +package cn.stylefeng.roses.kernel.system.api.pojo.user; import cn.hutool.core.collection.IterUtil; import cn.stylefeng.roses.kernel.rule.enums.TreeNodeEnum; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/OnlineUserRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/OnlineUserRequest.java similarity index 85% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/OnlineUserRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/OnlineUserRequest.java index a470fe6e4..82e2e7fe8 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/OnlineUserRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/OnlineUserRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.user.request; +package cn.stylefeng.roses.kernel.system.api.pojo.user.request; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/SysUserRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java similarity index 98% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/SysUserRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java index 8bbe2a0c1..d705ce07c 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/SysUserRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.user.request; +package cn.stylefeng.roses.kernel.system.api.pojo.user.request; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.validators.date.DateValue; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserDataScopeRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/UserDataScopeRequest.java similarity index 83% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserDataScopeRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/UserDataScopeRequest.java index d5cd94462..cc613e460 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserDataScopeRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/UserDataScopeRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.user.request; +package cn.stylefeng.roses.kernel.system.api.pojo.user.request; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserOrgRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/UserOrgRequest.java similarity index 85% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserOrgRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/UserOrgRequest.java index 4624ccce7..91521efd6 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserOrgRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/UserOrgRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.user.request; +package cn.stylefeng.roses.kernel.system.api.pojo.user.request; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserRoleRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/UserRoleRequest.java similarity index 82% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserRoleRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/UserRoleRequest.java index 07810548e..e9620f159 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserRoleRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/UserRoleRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.user.request; +package cn.stylefeng.roses.kernel.system.api.pojo.user.request; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/util/DataScopeUtil.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/util/DataScopeUtil.java similarity index 95% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/util/DataScopeUtil.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/util/DataScopeUtil.java index 99a43d35f..2307ec7d4 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/util/DataScopeUtil.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/util/DataScopeUtil.java @@ -1,12 +1,12 @@ -package cn.stylefeng.roses.kernel.system.util; +package cn.stylefeng.roses.kernel.system.api.util; import cn.hutool.core.collection.CollectionUtil; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; import cn.stylefeng.roses.kernel.auth.api.enums.DataScopeTypeEnum; import cn.stylefeng.roses.kernel.auth.api.exception.AuthException; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.organization.DataScopeExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.exception.enums.organization.DataScopeExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; import java.util.Set; diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java index 17d619119..0d638d702 100644 --- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java +++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java @@ -6,7 +6,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.system.modular.app.service.SysAppService; -import cn.stylefeng.roses.kernel.system.pojo.app.SysAppRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.app.SysAppRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java index 325f65cfa..b63766eff 100644 --- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java +++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.app.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.system.modular.app.entity.SysApp; -import cn.stylefeng.roses.kernel.system.pojo.app.SysAppRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.app.SysAppRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java index 0a0c98f9c..f70485c3c 100644 --- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java +++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java @@ -9,14 +9,14 @@ import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; -import cn.stylefeng.roses.kernel.system.AppServiceApi; -import cn.stylefeng.roses.kernel.system.MenuServiceApi; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.app.AppExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.AppServiceApi; +import cn.stylefeng.roses.kernel.system.api.MenuServiceApi; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.enums.app.AppExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.app.entity.SysApp; import cn.stylefeng.roses.kernel.system.modular.app.mapper.SysAppMapper; import cn.stylefeng.roses.kernel.system.modular.app.service.SysAppService; -import cn.stylefeng.roses.kernel.system.pojo.app.SysAppRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.app.SysAppRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java index 69417a02b..f830806cd 100644 --- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java +++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java @@ -5,7 +5,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.system.modular.loginlog.service.SysLoginLogService; -import cn.stylefeng.roses.kernel.system.pojo.loginlog.SysLoginLogRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.loginlog.SysLoginLogRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java index ddbe64e3f..e90df7785 100644 --- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java +++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.loginlog.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog; -import cn.stylefeng.roses.kernel.system.pojo.loginlog.SysLoginLogRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.loginlog.SysLoginLogRequest; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java index 9cb6ba56b..3d89714de 100644 --- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java +++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java @@ -8,13 +8,13 @@ import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; -import cn.stylefeng.roses.kernel.system.LoginLogServiceApi; -import cn.stylefeng.roses.kernel.system.exception.enums.log.LogExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.LoginLogServiceApi; +import cn.stylefeng.roses.kernel.system.api.exception.enums.log.LogExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.loginlog.constants.LoginLogConstant; import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog; import cn.stylefeng.roses.kernel.system.modular.loginlog.mapper.SysLoginLogMapper; import cn.stylefeng.roses.kernel.system.modular.loginlog.service.SysLoginLogService; -import cn.stylefeng.roses.kernel.system.pojo.loginlog.SysLoginLogRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.loginlog.SysLoginLogRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java index 0d1dea82d..b117ae943 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java @@ -8,7 +8,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton; import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuButtonService; -import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuButtonRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.SysMenuButtonRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java index b96956b85..50c322f69 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java @@ -8,11 +8,11 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.modular.menu.factory.AntdMenusFactory; import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuService; -import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdvMenuItem; -import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiMenuAndButtonTreeResponse; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.SysMenuRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdSysMenuDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdvMenuItem; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.layui.LayuiMenuAndButtonTreeResponse; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java index c982af079..da98677a1 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java @@ -5,10 +5,10 @@ import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdMenuSelectTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdvMenuAuthorityItem; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdvMenuItem; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdMenuSelectTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdSysMenuDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdvMenuAuthorityItem; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdvMenuItem; import java.util.ArrayList; import java.util.List; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java index cc345f51a..463845599 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java @@ -9,10 +9,10 @@ import cn.stylefeng.roses.kernel.i18n.api.context.TranslationContext; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; -import cn.stylefeng.roses.kernel.system.AppServiceApi; +import cn.stylefeng.roses.kernel.system.api.AppServiceApi; import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu; -import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiAppIndexMenusVO; -import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiIndexMenuTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.layui.LayuiAppIndexMenusVO; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.layui.LayuiIndexMenuTreeNode; import java.util.*; import java.util.stream.Collectors; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java index 2e24385cb..0960cd05d 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.modular.menu.mapper; import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdSysMenuDTO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml index 7f03968f0..53a0174d2 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java index 8850032de..6c8ad2ee3 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.menu.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton; -import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuButtonRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.SysMenuButtonRequest; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java index 38182ec4c..52502197b 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java @@ -2,12 +2,12 @@ package cn.stylefeng.roses.kernel.system.modular.menu.service; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu; -import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdMenuSelectTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO; -import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiAppIndexMenusVO; -import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiMenuAndButtonTreeResponse; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.SysMenuRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdMenuSelectTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdSysMenuDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.layui.LayuiAppIndexMenusVO; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.layui.LayuiMenuAndButtonTreeResponse; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java index 9aa22d3ac..86d2344e2 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java @@ -7,13 +7,13 @@ import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.menu.SysMenuButtonExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.enums.menu.SysMenuButtonExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton; import cn.stylefeng.roses.kernel.system.modular.menu.factory.MenuButtonFactory; import cn.stylefeng.roses.kernel.system.modular.menu.mapper.SysMenuButtonMapper; import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuButtonService; -import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuButtonRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.SysMenuButtonRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java index 7d2c5ed69..c4ba59cc1 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java @@ -15,12 +15,12 @@ import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; -import cn.stylefeng.roses.kernel.system.AppServiceApi; -import cn.stylefeng.roses.kernel.system.MenuServiceApi; -import cn.stylefeng.roses.kernel.system.RoleServiceApi; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.menu.SysMenuExceptionEnum; -import cn.stylefeng.roses.kernel.system.exception.enums.user.SysUserExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.AppServiceApi; +import cn.stylefeng.roses.kernel.system.api.MenuServiceApi; +import cn.stylefeng.roses.kernel.system.api.RoleServiceApi; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.enums.menu.SysMenuExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu; import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton; import cn.stylefeng.roses.kernel.system.modular.menu.factory.AntdMenusFactory; @@ -28,14 +28,14 @@ import cn.stylefeng.roses.kernel.system.modular.menu.factory.LayuiMenusFactory; import cn.stylefeng.roses.kernel.system.modular.menu.mapper.SysMenuMapper; import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuButtonService; import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuService; -import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdMenuSelectTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO; -import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiAppIndexMenusVO; -import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiMenuAndButtonTreeResponse; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleMenuButtonDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleMenuDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.SysMenuRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdMenuSelectTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdSysMenuDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.layui.LayuiAppIndexMenusVO; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.layui.LayuiMenuAndButtonTreeResponse; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleMenuButtonDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleMenuDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java index c23e05f44..878e9eab6 100644 --- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java +++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java @@ -6,7 +6,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.system.modular.notice.service.SysNoticeService; -import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.notice.SysNoticeRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java index 607424ae8..504cb5c42 100644 --- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java +++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java @@ -1,9 +1,9 @@ package cn.stylefeng.roses.kernel.system.modular.notice.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.system.NoticeServiceApi; +import cn.stylefeng.roses.kernel.system.api.NoticeServiceApi; import cn.stylefeng.roses.kernel.system.modular.notice.entity.SysNotice; -import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.notice.SysNoticeRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java index fc16a4286..0cc40ea57 100644 --- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java +++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java @@ -10,12 +10,12 @@ import cn.stylefeng.roses.kernel.message.api.MessageApi; import cn.stylefeng.roses.kernel.message.api.enums.MessageBusinessTypeEnum; import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageSendRequest; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.notice.NoticeExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.enums.notice.NoticeExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.notice.entity.SysNotice; import cn.stylefeng.roses.kernel.system.modular.notice.mapper.SysNoticeMapper; import cn.stylefeng.roses.kernel.system.modular.notice.service.SysNoticeService; -import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.notice.SysNoticeRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java index 8d54e60a0..e0ad773a0 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java @@ -7,7 +7,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.modular.organization.service.HrOrganizationService; -import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java index b702e1b89..55ec73913 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java @@ -7,7 +7,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.system.modular.organization.service.HrPositionService; -import cn.stylefeng.roses.kernel.system.pojo.organization.HrPositionRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrPositionRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/LayuiOrganizationFactory.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/LayuiOrganizationFactory.java index 0bd4813ca..188772753 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/LayuiOrganizationFactory.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/LayuiOrganizationFactory.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.organization.factory; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization; -import cn.stylefeng.roses.kernel.system.pojo.organization.layui.LayuiOrganizationTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.layui.LayuiOrganizationTreeNode; import java.util.ArrayList; import java.util.List; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java index da98375ff..97704a9c7 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java @@ -2,15 +2,15 @@ package cn.stylefeng.roses.kernel.system.modular.organization.service; import cn.stylefeng.roses.kernel.auth.api.enums.DataScopeTypeEnum; import cn.stylefeng.roses.kernel.db.api.DbOperatorApi; -import cn.stylefeng.roses.kernel.system.DataScopeApi; -import cn.stylefeng.roses.kernel.system.RoleServiceApi; -import cn.stylefeng.roses.kernel.system.UserOrgServiceApi; -import cn.stylefeng.roses.kernel.system.UserServiceApi; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.organization.DataScopeExceptionEnum; -import cn.stylefeng.roses.kernel.system.pojo.organization.DataScopeDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgDTO; +import cn.stylefeng.roses.kernel.system.api.DataScopeApi; +import cn.stylefeng.roses.kernel.system.api.RoleServiceApi; +import cn.stylefeng.roses.kernel.system.api.UserOrgServiceApi; +import cn.stylefeng.roses.kernel.system.api.UserServiceApi; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.enums.organization.DataScopeExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.DataScopeDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserOrgDTO; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java index b924c21b4..62478fabb 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java @@ -3,10 +3,10 @@ package cn.stylefeng.roses.kernel.system.modular.organization.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.tree.factory.node.DefaultTreeNode; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; -import cn.stylefeng.roses.kernel.system.OrganizationServiceApi; +import cn.stylefeng.roses.kernel.system.api.OrganizationServiceApi; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization; -import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationRequest; -import cn.stylefeng.roses.kernel.system.pojo.organization.layui.LayuiOrganizationTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.layui.LayuiOrganizationTreeNode; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java index 0f0a2230a..b0c8e47cd 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.organization.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrPosition; -import cn.stylefeng.roses.kernel.system.pojo.organization.HrPositionRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrPositionRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java index 344c9cabd..08036f72b 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java @@ -19,21 +19,21 @@ import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.rule.tree.factory.node.DefaultTreeNode; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; -import cn.stylefeng.roses.kernel.system.RoleDataScopeServiceApi; -import cn.stylefeng.roses.kernel.system.RoleServiceApi; -import cn.stylefeng.roses.kernel.system.UserOrgServiceApi; -import cn.stylefeng.roses.kernel.system.UserServiceApi; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.organization.OrganizationExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.RoleDataScopeServiceApi; +import cn.stylefeng.roses.kernel.system.api.RoleServiceApi; +import cn.stylefeng.roses.kernel.system.api.UserOrgServiceApi; +import cn.stylefeng.roses.kernel.system.api.UserServiceApi; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.enums.organization.OrganizationExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization; import cn.stylefeng.roses.kernel.system.modular.organization.factory.AntdvOrganizationFactory; import cn.stylefeng.roses.kernel.system.modular.organization.factory.LayuiOrganizationFactory; import cn.stylefeng.roses.kernel.system.modular.organization.mapper.HrOrganizationMapper; import cn.stylefeng.roses.kernel.system.modular.organization.service.HrOrganizationService; -import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationDTO; -import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationRequest; -import cn.stylefeng.roses.kernel.system.pojo.organization.layui.LayuiOrganizationTreeNode; -import cn.stylefeng.roses.kernel.system.util.DataScopeUtil; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.layui.LayuiOrganizationTreeNode; +import cn.stylefeng.roses.kernel.system.api.util.DataScopeUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java index 3359d9f10..77d6ba14f 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java @@ -8,13 +8,13 @@ import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; -import cn.stylefeng.roses.kernel.system.UserOrgServiceApi; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.organization.PositionExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.UserOrgServiceApi; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.enums.organization.PositionExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrPosition; import cn.stylefeng.roses.kernel.system.modular.organization.mapper.HrPositionMapper; import cn.stylefeng.roses.kernel.system.modular.organization.service.HrPositionService; -import cn.stylefeng.roses.kernel.system.pojo.organization.HrPositionRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrPositionRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java index 8c7633f48..719175a36 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java @@ -7,8 +7,8 @@ import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.system.modular.resource.service.SysResourceService; -import cn.stylefeng.roses.kernel.system.pojo.resource.LayuiApiResourceTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.resource.ResourceRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.resource.LayuiApiResourceTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java index 1584a0df8..15d9134e3 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java @@ -8,8 +8,8 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource; import cn.stylefeng.roses.kernel.system.modular.resource.pojo.ResourceTreeNode; import cn.stylefeng.roses.kernel.system.modular.resource.service.SysResourceService; -import cn.stylefeng.roses.kernel.system.pojo.resource.ResourceRequest; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java index ac85cdeda..4911839b7 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java @@ -4,8 +4,8 @@ import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition; import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource; import cn.stylefeng.roses.kernel.system.modular.resource.pojo.ResourceTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.resource.LayuiApiResourceTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.resource.ResourceRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.resource.LayuiApiResourceTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java index c43ab6a9b..79233cdab 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java @@ -15,17 +15,17 @@ import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; -import cn.stylefeng.roses.kernel.system.ResourceServiceApi; -import cn.stylefeng.roses.kernel.system.RoleServiceApi; +import cn.stylefeng.roses.kernel.system.api.ResourceServiceApi; +import cn.stylefeng.roses.kernel.system.api.RoleServiceApi; import cn.stylefeng.roses.kernel.system.modular.resource.cache.ResourceCache; import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource; import cn.stylefeng.roses.kernel.system.modular.resource.factory.ResourceFactory; import cn.stylefeng.roses.kernel.system.modular.resource.mapper.SysResourceMapper; import cn.stylefeng.roses.kernel.system.modular.resource.pojo.ResourceTreeNode; import cn.stylefeng.roses.kernel.system.modular.resource.service.SysResourceService; -import cn.stylefeng.roses.kernel.system.pojo.resource.LayuiApiResourceTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.resource.ResourceRequest; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleResourceDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.resource.LayuiApiResourceTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleResourceDTO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java index 5352970d2..9ab27410e 100644 --- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java +++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java @@ -8,7 +8,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleResourceService; import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleService; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java index 31d5e2a9d..d4baf3678 100644 --- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java +++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.system.modular.role.service; import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleDataScope; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleDataScopeRequest; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleDataScopeRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java index f68ebcbbb..aef9b3338 100644 --- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java +++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.modular.role.service; import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleResource; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java index 094628e25..3aee69adc 100644 --- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java +++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java @@ -2,10 +2,10 @@ package cn.stylefeng.roses.kernel.system.modular.role.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; -import cn.stylefeng.roses.kernel.system.RoleServiceApi; +import cn.stylefeng.roses.kernel.system.api.RoleServiceApi; import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRole; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java index acf271883..e78e51ed9 100644 --- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java +++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java @@ -3,12 +3,12 @@ package cn.stylefeng.roses.kernel.system.modular.role.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import cn.stylefeng.roses.kernel.system.RoleDataScopeServiceApi; +import cn.stylefeng.roses.kernel.system.api.RoleDataScopeServiceApi; import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleDataScope; import cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleDataScopeMapper; import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleDataScopeService; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleDataScopeRequest; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleDataScopeRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java index 40ded1b80..2d6b7bb67 100644 --- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java +++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java @@ -3,7 +3,7 @@ package cn.stylefeng.roses.kernel.system.modular.role.service.impl; import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleResource; import cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleResourceMapper; import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleResourceService; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java index fd9a30b93..bda1d0eb9 100644 --- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java +++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java @@ -16,19 +16,19 @@ import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; -import cn.stylefeng.roses.kernel.system.UserServiceApi; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.role.SysRoleExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.UserServiceApi; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.enums.role.SysRoleExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.role.entity.*; import cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleMapper; import cn.stylefeng.roses.kernel.system.modular.role.service.*; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleMenuButtonDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleMenuDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleResourceDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleMenuButtonRequest; -import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; -import cn.stylefeng.roses.kernel.system.util.DataScopeUtil; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleMenuButtonDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleMenuDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleResourceDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleMenuButtonRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; +import cn.stylefeng.roses.kernel.system.api.util.DataScopeUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/OnlineUserController.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/OnlineUserController.java index 2f6f07965..199012e81 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/OnlineUserController.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/OnlineUserController.java @@ -7,7 +7,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService; -import cn.stylefeng.roses.kernel.system.pojo.user.request.OnlineUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.OnlineUserRequest; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java index 8886e19ff..4a0bcbeb3 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java @@ -10,7 +10,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java index 6a3675eb6..c88885f19 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.user.factory; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; import cn.stylefeng.roses.kernel.rule.enums.SexEnum; -import cn.stylefeng.roses.kernel.system.pojo.user.OnlineUserDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.OnlineUserDTO; /** * 当前在线用户的创建工厂 diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java index 8d80c0815..10eebf5c0 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java @@ -6,10 +6,10 @@ import cn.hutool.extra.spring.SpringUtil; import cn.stylefeng.roses.kernel.auth.api.password.PasswordStoredEncryptApi; import cn.stylefeng.roses.kernel.rule.enums.SexEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; -import cn.stylefeng.roses.kernel.system.enums.UserStatusEnum; -import cn.stylefeng.roses.kernel.system.expander.SystemConfigExpander; +import cn.stylefeng.roses.kernel.system.api.enums.UserStatusEnum; +import cn.stylefeng.roses.kernel.system.api.expander.SystemConfigExpander; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; /** * 用户信息填充，用于创建和修改用户时，添加一些基础信息 diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java index b2686935c..eee0d8674 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java @@ -8,10 +8,10 @@ import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleUserInfo; import cn.stylefeng.roses.kernel.auth.api.prop.LoginUserPropExpander; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; -import cn.stylefeng.roses.kernel.system.pojo.organization.DataScopeDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.UserLoginInfoDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.DataScopeDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserOrgDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.UserLoginInfoDTO; import java.util.*; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java index 642e6f20a..5ab455e55 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.system.modular.user.mapper; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml index 964481069..ba366ceeb 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml @@ -3,7 +3,7 @@ - select suser.user_id as userId, suser.account as account, @@ -41,7 +41,7 @@ - select suser.user_id as userId, suser.account as account, diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java index fc32b562b..868fe04aa 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; -import cn.stylefeng.roses.kernel.system.pojo.user.request.UserDataScopeRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserDataScopeRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java index 6128cc86d..2e05d1df1 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; -import cn.stylefeng.roses.kernel.system.UserOrgServiceApi; +import cn.stylefeng.roses.kernel.system.api.UserOrgServiceApi; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserOrg; -import cn.stylefeng.roses.kernel.system.pojo.user.request.UserOrgRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserOrgRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java index 4401be75e..ec0209052 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; -import cn.stylefeng.roses.kernel.system.pojo.user.request.UserRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserRoleRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java index 265141fdb..a6daef246 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java @@ -2,11 +2,11 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; -import cn.stylefeng.roses.kernel.system.UserServiceApi; +import cn.stylefeng.roses.kernel.system.api.UserServiceApi; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.UserSelectTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.UserSelectTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java index 28bc1b22c..7823bace4 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java @@ -6,8 +6,8 @@ import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserDataScopeMapper; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeService; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; -import cn.stylefeng.roses.kernel.system.pojo.user.request.UserDataScopeRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserDataScopeRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java index afb29439d..c1d65e768 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java @@ -2,13 +2,13 @@ package cn.stylefeng.roses.kernel.system.modular.user.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.user.SysUserOrgExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserOrgExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserOrg; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserOrgMapper; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.request.UserOrgRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserOrgDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserOrgRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; -import static cn.stylefeng.roses.kernel.system.exception.enums.user.SysUserOrgExceptionEnum.EMPLOYEE_MANY_MAIN_NOT_FOUND; +import static cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserOrgExceptionEnum.EMPLOYEE_MANY_MAIN_NOT_FOUND; /** * 用户组织机构关联信息 diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java index 2e46653fa..4901d7786 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java @@ -6,8 +6,8 @@ import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserRoleMapper; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; -import cn.stylefeng.roses.kernel.system.pojo.user.request.UserRoleRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserRoleRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index 7e96e7ca4..9f90a8f74 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -22,14 +22,15 @@ import cn.stylefeng.roses.kernel.rule.enums.TreeNodeEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; -import cn.stylefeng.roses.kernel.system.DataScopeApi; -import cn.stylefeng.roses.kernel.system.OrganizationServiceApi; -import cn.stylefeng.roses.kernel.system.ResourceServiceApi; -import cn.stylefeng.roses.kernel.system.RoleServiceApi; -import cn.stylefeng.roses.kernel.system.enums.UserStatusEnum; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.user.SysUserExceptionEnum; -import cn.stylefeng.roses.kernel.system.expander.SystemConfigExpander; +import cn.stylefeng.roses.kernel.system.api.DataScopeApi; +import cn.stylefeng.roses.kernel.system.api.OrganizationServiceApi; +import cn.stylefeng.roses.kernel.system.api.ResourceServiceApi; +import cn.stylefeng.roses.kernel.system.api.RoleServiceApi; +import cn.stylefeng.roses.kernel.system.api.enums.UserStatusEnum; +import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.expander.SystemConfigExpander; +import cn.stylefeng.roses.kernel.system.api.pojo.user.*; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole; @@ -41,13 +42,12 @@ import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeSer import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService; -import cn.stylefeng.roses.kernel.system.pojo.organization.DataScopeDTO; -import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationDTO; -import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.*; -import cn.stylefeng.roses.kernel.system.pojo.user.request.OnlineUserRequest; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; -import cn.stylefeng.roses.kernel.system.util.DataScopeUtil; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.DataScopeDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.OnlineUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.util.DataScopeUtil; import com.alibaba.excel.support.ExcelTypeEnum; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;