【7.0.1】【sys】整理api包结构

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;

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;

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;

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;
 

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;
 

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接口

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

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

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;
 

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;

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;
 

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;

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

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;

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;
 
 /**
  * 系统管理模块的常量

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;
 

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;
 
 /**

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;
 
 /**
  * 系统管理模块的异常

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;
 
 /**

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;
 
 /**

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;
 
 /**
  * 菜单按钮异常枚举

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;
 
 /**
  * 系统菜单相关异常枚举

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 

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;

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;

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;

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;

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;

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;

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;
 

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;

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;
 

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;
 

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
      */

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;

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;
 

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;
 

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;
 

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;

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;

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;
 

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;

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;

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;
 

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;
 

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;
 

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;

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;

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;

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;
 

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;
 
 /**

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;

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;

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;

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;

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;

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;

kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.stylefeng.roses.kernel.system.modular.menu.mapper.SysMenuMapper">
 
-    <resultMap id="systemMenuAndRole" type="cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO">
+    <resultMap id="systemMenuAndRole" type="cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdSysMenuDTO">
         <id column="menu_id" property="menuId"/>
         <result column="menu_parent_id" property="menuParentId"/>
         <result column="menu_name" property="menuName"/>

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;