diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/abstracts/AbstractExceptionEnum.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/AbstractExceptionEnum.java similarity index 92% rename from kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/abstracts/AbstractExceptionEnum.java rename to kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/AbstractExceptionEnum.java index 5f31c4205..ca91f87d0 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/abstracts/AbstractExceptionEnum.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/AbstractExceptionEnum.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.rule.abstracts; +package cn.stylefeng.roses.kernel.rule.exception; /** * 异常枚举格式规范，每个异常枚举都要实现这个接口 diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/base/ServiceException.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/base/ServiceException.java index bfba75be5..461ed7406 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/base/ServiceException.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/base/ServiceException.java @@ -24,7 +24,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package cn.stylefeng.roses.kernel.rule.exception.base; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultBusinessExceptionEnum.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultBusinessExceptionEnum.java index 733391f3e..5c44e40af 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultBusinessExceptionEnum.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultBusinessExceptionEnum.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.rule.exception.enums.defaults; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; import static cn.stylefeng.roses.kernel.rule.constants.RuleConstants.BUSINESS_ERROR_TYPE_CODE; diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultThirdExceptionEnum.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultThirdExceptionEnum.java index 702de69d3..0605979df 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultThirdExceptionEnum.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultThirdExceptionEnum.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.rule.exception.enums.defaults; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; import static cn.stylefeng.roses.kernel.rule.constants.RuleConstants.FIRST_LEVEL_WIDE_CODE; diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultUserExceptionEnum.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultUserExceptionEnum.java index 40c276c83..c7b231c7c 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultUserExceptionEnum.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/defaults/DefaultUserExceptionEnum.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.rule.exception.enums.defaults; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; import static cn.stylefeng.roses.kernel.rule.constants.RuleConstants.FIRST_LEVEL_WIDE_CODE; diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/http/ServletExceptionEnum.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/http/ServletExceptionEnum.java index 1d4e65dcc..736350fa0 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/http/ServletExceptionEnum.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/enums/http/ServletExceptionEnum.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.rule.exception.enums.http; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; import static cn.stylefeng.roses.kernel.rule.constants.RuleConstants.BUSINESS_ERROR_TYPE_CODE; diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/UserSelectTreeNode.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/UserSelectTreeNode.java index 1b74e42f0..16b4e7f5d 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/UserSelectTreeNode.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/UserSelectTreeNode.java @@ -1,13 +1,10 @@ package cn.stylefeng.roses.kernel.rule.pojo.tree; import cn.hutool.core.collection.IterUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.rule.enums.TreeNodeEnum; +import cn.stylefeng.roses.kernel.rule.tree.factory.node.DefaultTreeNode; import lombok.Data; - -import java.util.List; +import lombok.EqualsAndHashCode; /** * 用户选择树节点封装 @@ -17,6 +14,7 @@ import java.util.List; * @author liuhanqing * @date 2021/1/15 13:36 */ +@EqualsAndHashCode(callSuper = true) @Data public class UserSelectTreeNode extends DefaultTreeNode { diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/factory/DefaultTreeBuildFactory.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/DefaultTreeBuildFactory.java similarity index 91% rename from kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/factory/DefaultTreeBuildFactory.java rename to kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/DefaultTreeBuildFactory.java index 50c8bdfad..556fd321c 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/factory/DefaultTreeBuildFactory.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/DefaultTreeBuildFactory.java @@ -1,7 +1,7 @@ -package cn.stylefeng.roses.kernel.rule.factory; +package cn.stylefeng.roses.kernel.rule.tree.factory; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; -import cn.stylefeng.roses.kernel.rule.factory.base.AbstractTreeBuildFactory; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeBuildFactory; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.util.ArrayList; @@ -91,4 +91,4 @@ public class DefaultTreeBuildFactory implements Abst return nodeList; } -} \ No newline at end of file +} diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/factory/base/AbstractTreeBuildFactory.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/base/AbstractTreeBuildFactory.java similarity index 88% rename from kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/factory/base/AbstractTreeBuildFactory.java rename to kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/base/AbstractTreeBuildFactory.java index 85ef13f05..c5f390cf3 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/factory/base/AbstractTreeBuildFactory.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/base/AbstractTreeBuildFactory.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.rule.factory.base; +package cn.stylefeng.roses.kernel.rule.tree.factory.base; import java.util.List; diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/abstracts/AbstractTreeNode.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/base/AbstractTreeNode.java similarity index 92% rename from kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/abstracts/AbstractTreeNode.java rename to kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/base/AbstractTreeNode.java index 8cf15b381..d7b229311 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/abstracts/AbstractTreeNode.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/base/AbstractTreeNode.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.rule.abstracts; +package cn.stylefeng.roses.kernel.rule.tree.factory.base; import java.util.List; diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/DefaultTreeNode.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/node/DefaultTreeNode.java similarity index 88% rename from kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/DefaultTreeNode.java rename to kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/node/DefaultTreeNode.java index 3be374e71..6f72fe897 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/DefaultTreeNode.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/factory/node/DefaultTreeNode.java @@ -1,6 +1,6 @@ -package cn.stylefeng.roses.kernel.rule.pojo.tree; +package cn.stylefeng.roses.kernel.rule.tree.factory.node; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.math.BigDecimal; diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/DefaultXmSelectNode.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/xmtree/DefaultXmSelectNode.java similarity index 88% rename from kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/DefaultXmSelectNode.java rename to kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/xmtree/DefaultXmSelectNode.java index dd7a7eae3..96977750b 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/DefaultXmSelectNode.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/xmtree/DefaultXmSelectNode.java @@ -1,6 +1,6 @@ -package cn.stylefeng.roses.kernel.rule.pojo.tree; +package cn.stylefeng.roses.kernel.rule.tree.xmtree; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractXmSelectNode; +import cn.stylefeng.roses.kernel.rule.tree.xmtree.base.AbstractXmSelectNode; import lombok.Data; import java.util.List; diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/abstracts/AbstractXmSelectNode.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/xmtree/base/AbstractXmSelectNode.java similarity index 93% rename from kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/abstracts/AbstractXmSelectNode.java rename to kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/xmtree/base/AbstractXmSelectNode.java index 236b6ffac..9c9ad874e 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/abstracts/AbstractXmSelectNode.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/xmtree/base/AbstractXmSelectNode.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.rule.abstracts; +package cn.stylefeng.roses.kernel.rule.tree.xmtree.base; import java.util.List; diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/ztree/ZTreeNode.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/ztree/ZTreeNode.java similarity index 93% rename from kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/ztree/ZTreeNode.java rename to kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/ztree/ZTreeNode.java index 7d4f33e0a..562179351 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/ztree/ZTreeNode.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/ztree/ZTreeNode.java @@ -1,7 +1,7 @@ -package cn.stylefeng.roses.kernel.rule.pojo.ztree; +package cn.stylefeng.roses.kernel.rule.tree.ztree; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/exception/AuthException.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/exception/AuthException.java index 170e5b19a..c0ce93ed6 100644 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/exception/AuthException.java +++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/exception/AuthException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.auth.api.exception; import cn.stylefeng.roses.kernel.auth.api.constants.AuthConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/exception/enums/AuthExceptionEnum.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/exception/enums/AuthExceptionEnum.java index d84f39608..deb17dfe7 100644 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/exception/enums/AuthExceptionEnum.java +++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/exception/enums/AuthExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.auth.api.exception.enums; import cn.stylefeng.roses.kernel.auth.api.constants.AuthConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/exception/ConfigException.java b/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/exception/ConfigException.java index 9792d2fcd..277c66a7a 100644 --- a/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/exception/ConfigException.java +++ b/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/exception/ConfigException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.config.api.exception; import cn.stylefeng.roses.kernel.config.api.constants.ConfigConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/exception/enums/ConfigExceptionEnum.java b/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/exception/enums/ConfigExceptionEnum.java index 84f7c6f0a..6d6475083 100644 --- a/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/exception/enums/ConfigExceptionEnum.java +++ b/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/exception/enums/ConfigExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.config.api.exception.enums; import cn.stylefeng.roses.kernel.config.api.constants.ConfigConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/DaoException.java b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/DaoException.java index 3e23f7fc3..2fe138128 100644 --- a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/DaoException.java +++ b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/DaoException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.db.api.exception; import cn.stylefeng.roses.kernel.db.api.constants.DbConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/DaoExceptionEnum.java b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/DaoExceptionEnum.java index 0ffc91180..d07fa8b7b 100644 --- a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/DaoExceptionEnum.java +++ b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/DaoExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.db.api.exception.enums; import cn.stylefeng.roses.kernel.db.api.constants.DbConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/DbInitEnum.java b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/DbInitEnum.java index 0c790c81d..012d09836 100644 --- a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/DbInitEnum.java +++ b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/DbInitEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.db.api.exception.enums; import cn.stylefeng.roses.kernel.db.api.constants.DbConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/FlywayExceptionEnum.java b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/FlywayExceptionEnum.java index 66669ae95..fe097940e 100644 --- a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/FlywayExceptionEnum.java +++ b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/FlywayExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.db.api.exception.enums; import cn.stylefeng.roses.kernel.db.api.constants.DbConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/DatasourceContainerException.java b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/DatasourceContainerException.java index 45ddf2509..bbd24a2fc 100644 --- a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/DatasourceContainerException.java +++ b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/DatasourceContainerException.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.dsctn.api.exception; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.dsctn.api.constants.DatasourceContainerConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/enums/DatasourceContainerExceptionEnum.java b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/enums/DatasourceContainerExceptionEnum.java index 9c85a8ecd..19efe3015 100644 --- a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/enums/DatasourceContainerExceptionEnum.java +++ b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/enums/DatasourceContainerExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.dsctn.api.exception.enums; import cn.stylefeng.roses.kernel.dsctn.api.constants.DatasourceContainerConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/exception/MailException.java b/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/exception/MailException.java index 8c75feee9..8a7dafc28 100644 --- a/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/exception/MailException.java +++ b/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/exception/MailException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.email.api.exception; import cn.stylefeng.roses.kernel.email.api.constants.MailConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import lombok.Getter; diff --git a/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/exception/enums/EmailExceptionEnum.java b/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/exception/enums/EmailExceptionEnum.java index ee954974a..2dbf7999d 100644 --- a/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/exception/enums/EmailExceptionEnum.java +++ b/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/exception/enums/EmailExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.email.api.exception.enums; import cn.stylefeng.roses.kernel.email.api.constants.MailConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java index b66a2a262..d2b105f49 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.file.exception; import cn.stylefeng.roses.kernel.file.constants.FileConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/enums/FileExceptionEnum.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/enums/FileExceptionEnum.java index 33b56411b..8c3b85edd 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/enums/FileExceptionEnum.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/enums/FileExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.file.exception.enums; import cn.stylefeng.roses.kernel.file.constants.FileConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-groovy/groovy-api/src/main/java/cn/stylefeng/roses/kernel/groovy/api/exception/GroovyException.java b/kernel-d-groovy/groovy-api/src/main/java/cn/stylefeng/roses/kernel/groovy/api/exception/GroovyException.java index ecd2cb17e..5d1e1bb57 100644 --- a/kernel-d-groovy/groovy-api/src/main/java/cn/stylefeng/roses/kernel/groovy/api/exception/GroovyException.java +++ b/kernel-d-groovy/groovy-api/src/main/java/cn/stylefeng/roses/kernel/groovy/api/exception/GroovyException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.groovy.api.exception; import cn.stylefeng.roses.kernel.groovy.api.constants.GroovyConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-groovy/groovy-api/src/main/java/cn/stylefeng/roses/kernel/groovy/api/exception/enums/GroovyExceptionEnum.java b/kernel-d-groovy/groovy-api/src/main/java/cn/stylefeng/roses/kernel/groovy/api/exception/enums/GroovyExceptionEnum.java index bb1fc59c1..3ce63bae7 100644 --- a/kernel-d-groovy/groovy-api/src/main/java/cn/stylefeng/roses/kernel/groovy/api/exception/enums/GroovyExceptionEnum.java +++ b/kernel-d-groovy/groovy-api/src/main/java/cn/stylefeng/roses/kernel/groovy/api/exception/enums/GroovyExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.groovy.api.exception.enums; import cn.stylefeng.roses.kernel.groovy.api.constants.GroovyConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/exception/TranslationException.java b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/exception/TranslationException.java index d1204fc7d..c8f4645ae 100644 --- a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/exception/TranslationException.java +++ b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/exception/TranslationException.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.i18n.api.exception; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.i18n.api.constants.TranslationConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/exception/enums/TranslationExceptionEnum.java b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/exception/enums/TranslationExceptionEnum.java index 839b677ee..37925898a 100644 --- a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/exception/enums/TranslationExceptionEnum.java +++ b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/exception/enums/TranslationExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.i18n.api.exception.enums; import cn.stylefeng.roses.kernel.i18n.api.constants.TranslationConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-jwt/jwt-api/src/main/java/cn/stylefeng/roses/kernel/jwt/api/exception/JwtException.java b/kernel-d-jwt/jwt-api/src/main/java/cn/stylefeng/roses/kernel/jwt/api/exception/JwtException.java index 40b3d61e2..64c95b3d3 100644 --- a/kernel-d-jwt/jwt-api/src/main/java/cn/stylefeng/roses/kernel/jwt/api/exception/JwtException.java +++ b/kernel-d-jwt/jwt-api/src/main/java/cn/stylefeng/roses/kernel/jwt/api/exception/JwtException.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.jwt.api.exception; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.jwt.api.constants.JwtConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-jwt/jwt-api/src/main/java/cn/stylefeng/roses/kernel/jwt/api/exception/enums/JwtExceptionEnum.java b/kernel-d-jwt/jwt-api/src/main/java/cn/stylefeng/roses/kernel/jwt/api/exception/enums/JwtExceptionEnum.java index 0bbfbd3a0..8f0fd6e49 100644 --- a/kernel-d-jwt/jwt-api/src/main/java/cn/stylefeng/roses/kernel/jwt/api/exception/enums/JwtExceptionEnum.java +++ b/kernel-d-jwt/jwt-api/src/main/java/cn/stylefeng/roses/kernel/jwt/api/exception/enums/JwtExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.jwt.api.exception.enums; import cn.stylefeng.roses.kernel.jwt.api.constants.JwtConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/LogException.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/LogException.java index 85a08f443..fb355349a 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/LogException.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/LogException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.log.api.exception; import cn.stylefeng.roses.kernel.log.api.constants.LogConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/enums/LogExceptionEnum.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/enums/LogExceptionEnum.java index efd6f5293..930b5857f 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/enums/LogExceptionEnum.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/enums/LogExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.log.api.exception.enums; import cn.stylefeng.roses.kernel.log.api.constants.LogConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-office/office-api/src/main/java/cn/stylefeng/roses/kernel/office/api/exception/OfficeException.java b/kernel-d-office/office-api/src/main/java/cn/stylefeng/roses/kernel/office/api/exception/OfficeException.java index 82bf4ec38..1985448f4 100644 --- a/kernel-d-office/office-api/src/main/java/cn/stylefeng/roses/kernel/office/api/exception/OfficeException.java +++ b/kernel-d-office/office-api/src/main/java/cn/stylefeng/roses/kernel/office/api/exception/OfficeException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.office.api.exception; import cn.stylefeng.roses.kernel.office.api.constants.OfficeConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-office/office-api/src/main/java/cn/stylefeng/roses/kernel/office/api/exception/enums/OfficeExceptionEnum.java b/kernel-d-office/office-api/src/main/java/cn/stylefeng/roses/kernel/office/api/exception/enums/OfficeExceptionEnum.java index d082ee600..62b723ec8 100644 --- a/kernel-d-office/office-api/src/main/java/cn/stylefeng/roses/kernel/office/api/exception/enums/OfficeExceptionEnum.java +++ b/kernel-d-office/office-api/src/main/java/cn/stylefeng/roses/kernel/office/api/exception/enums/OfficeExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.office.api.exception.enums; import cn.stylefeng.roses.kernel.office.api.constants.OfficeConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-pinyin/pinyin-api/src/main/java/cn/stylefeng/roses/kernel/pinyin/api/exception/PinyinException.java b/kernel-d-pinyin/pinyin-api/src/main/java/cn/stylefeng/roses/kernel/pinyin/api/exception/PinyinException.java index 8714deb0c..7eb7f5aaa 100644 --- a/kernel-d-pinyin/pinyin-api/src/main/java/cn/stylefeng/roses/kernel/pinyin/api/exception/PinyinException.java +++ b/kernel-d-pinyin/pinyin-api/src/main/java/cn/stylefeng/roses/kernel/pinyin/api/exception/PinyinException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.pinyin.api.exception; import cn.stylefeng.roses.kernel.pinyin.api.constants.PinyinConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import lombok.Getter; diff --git a/kernel-d-pinyin/pinyin-api/src/main/java/cn/stylefeng/roses/kernel/pinyin/api/exception/enums/PinyinExceptionEnum.java b/kernel-d-pinyin/pinyin-api/src/main/java/cn/stylefeng/roses/kernel/pinyin/api/exception/enums/PinyinExceptionEnum.java index 85c13e6cc..9ce69e742 100644 --- a/kernel-d-pinyin/pinyin-api/src/main/java/cn/stylefeng/roses/kernel/pinyin/api/exception/enums/PinyinExceptionEnum.java +++ b/kernel-d-pinyin/pinyin-api/src/main/java/cn/stylefeng/roses/kernel/pinyin/api/exception/enums/PinyinExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.pinyin.api.exception.enums; import cn.stylefeng.roses.kernel.pinyin.api.constants.PinyinConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/exception/ScannerException.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/exception/ScannerException.java index 6803bcb23..54a56755a 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/exception/ScannerException.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/exception/ScannerException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.resource.api.exception; import cn.stylefeng.roses.kernel.resource.api.constants.ScannerConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/exception/enums/ScannerExceptionEnum.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/exception/enums/ScannerExceptionEnum.java index 16623a232..2ec9945cc 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/exception/enums/ScannerExceptionEnum.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/exception/enums/ScannerExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.resource.api.exception.enums; import cn.stylefeng.roses.kernel.resource.api.constants.ScannerConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-d-sms/sms-api/src/main/java/cn/stylefeng/roses/kernel/sms/api/exception/SmsException.java b/kernel-d-sms/sms-api/src/main/java/cn/stylefeng/roses/kernel/sms/api/exception/SmsException.java index 937ef94a0..a20725a71 100644 --- a/kernel-d-sms/sms-api/src/main/java/cn/stylefeng/roses/kernel/sms/api/exception/SmsException.java +++ b/kernel-d-sms/sms-api/src/main/java/cn/stylefeng/roses/kernel/sms/api/exception/SmsException.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.sms.api.exception; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.sms.api.constants.SmsConstants; diff --git a/kernel-d-sms/sms-api/src/main/java/cn/stylefeng/roses/kernel/sms/api/exception/enums/SmsExceptionEnum.java b/kernel-d-sms/sms-api/src/main/java/cn/stylefeng/roses/kernel/sms/api/exception/enums/SmsExceptionEnum.java index e7f4a3eb1..6f57af787 100644 --- a/kernel-d-sms/sms-api/src/main/java/cn/stylefeng/roses/kernel/sms/api/exception/enums/SmsExceptionEnum.java +++ b/kernel-d-sms/sms-api/src/main/java/cn/stylefeng/roses/kernel/sms/api/exception/enums/SmsExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.sms.api.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.sms.api.constants.SmsConstants; import lombok.Getter; diff --git a/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/exception/TimerException.java b/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/exception/TimerException.java index 4cfae767a..f894658ab 100644 --- a/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/exception/TimerException.java +++ b/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/exception/TimerException.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.timer.api.exception; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.timer.api.constants.TimerConstants; diff --git a/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/exception/enums/TimerExceptionEnum.java b/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/exception/enums/TimerExceptionEnum.java index 77ded9b1e..cf60c43e5 100644 --- a/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/exception/enums/TimerExceptionEnum.java +++ b/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/exception/enums/TimerExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.timer.api.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.timer.api.constants.TimerConstants; import lombok.Getter; diff --git a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/CountValidateException.java b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/CountValidateException.java index c127e16da..ad1dfafdb 100644 --- a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/CountValidateException.java +++ b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/CountValidateException.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.validator.exception; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants; diff --git a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/ParamValidateException.java b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/ParamValidateException.java index 408be68e0..b0e4ab580 100644 --- a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/ParamValidateException.java +++ b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/ParamValidateException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.validator.exception; import cn.hutool.core.util.StrUtil; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants; diff --git a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/XssFilterException.java b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/XssFilterException.java index 0858e2dc3..a56d5ce2c 100644 --- a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/XssFilterException.java +++ b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/XssFilterException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.validator.exception; import cn.hutool.core.util.StrUtil; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants; diff --git a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/CountValidateExceptionEnum.java b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/CountValidateExceptionEnum.java index e13c77d59..0b87a2d6b 100644 --- a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/CountValidateExceptionEnum.java +++ b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/CountValidateExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.validator.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants; import lombok.Getter; diff --git a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/ValidatorExceptionEnum.java b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/ValidatorExceptionEnum.java index b5ccfabb1..3ebab01da 100644 --- a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/ValidatorExceptionEnum.java +++ b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/ValidatorExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.validator.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants; import lombok.Getter; diff --git a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/XssFilterExceptionEnum.java b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/XssFilterExceptionEnum.java index e5f5151da..2d9e1e589 100644 --- a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/XssFilterExceptionEnum.java +++ b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/exception/enums/XssFilterExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.validator.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants; import lombok.Getter; diff --git a/kernel-d-wrapper/wrapper-api/src/main/java/cn/stylefeng/roses/kernel/wrapper/api/exception/WrapperException.java b/kernel-d-wrapper/wrapper-api/src/main/java/cn/stylefeng/roses/kernel/wrapper/api/exception/WrapperException.java index eaa487489..ea8454b5d 100644 --- a/kernel-d-wrapper/wrapper-api/src/main/java/cn/stylefeng/roses/kernel/wrapper/api/exception/WrapperException.java +++ b/kernel-d-wrapper/wrapper-api/src/main/java/cn/stylefeng/roses/kernel/wrapper/api/exception/WrapperException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.wrapper.api.exception; import cn.hutool.core.util.StrUtil; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.wrapper.api.constants.WrapperConstants; diff --git a/kernel-d-wrapper/wrapper-api/src/main/java/cn/stylefeng/roses/kernel/wrapper/api/exception/enums/WrapperExceptionEnum.java b/kernel-d-wrapper/wrapper-api/src/main/java/cn/stylefeng/roses/kernel/wrapper/api/exception/enums/WrapperExceptionEnum.java index 77e9ed4db..f7b710f96 100644 --- a/kernel-d-wrapper/wrapper-api/src/main/java/cn/stylefeng/roses/kernel/wrapper/api/exception/enums/WrapperExceptionEnum.java +++ b/kernel-d-wrapper/wrapper-api/src/main/java/cn/stylefeng/roses/kernel/wrapper/api/exception/enums/WrapperExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.wrapper.api.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.wrapper.api.constants.WrapperConstants; import lombok.Getter; diff --git a/kernel-o-monitor/monitor-api/src/main/java/cn/stylefeng/roses/kernel/monitor/api/exception/MonitorException.java b/kernel-o-monitor/monitor-api/src/main/java/cn/stylefeng/roses/kernel/monitor/api/exception/MonitorException.java index 8472177c6..ae3d97914 100644 --- a/kernel-o-monitor/monitor-api/src/main/java/cn/stylefeng/roses/kernel/monitor/api/exception/MonitorException.java +++ b/kernel-o-monitor/monitor-api/src/main/java/cn/stylefeng/roses/kernel/monitor/api/exception/MonitorException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.monitor.api.exception; import cn.stylefeng.roses.kernel.monitor.api.constants.MonitorConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-o-monitor/monitor-api/src/main/java/cn/stylefeng/roses/kernel/monitor/api/exception/enums/MonitorExceptionEnum.java b/kernel-o-monitor/monitor-api/src/main/java/cn/stylefeng/roses/kernel/monitor/api/exception/enums/MonitorExceptionEnum.java index ad84f3b43..6ad470c0e 100644 --- a/kernel-o-monitor/monitor-api/src/main/java/cn/stylefeng/roses/kernel/monitor/api/exception/enums/MonitorExceptionEnum.java +++ b/kernel-o-monitor/monitor-api/src/main/java/cn/stylefeng/roses/kernel/monitor/api/exception/enums/MonitorExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.monitor.api.exception.enums; import cn.stylefeng.roses.kernel.monitor.api.constants.MonitorConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-s-demo/demo-api/src/main/java/cn/stylefeng/roses/kernel/demo/exception/DemoException.java b/kernel-s-demo/demo-api/src/main/java/cn/stylefeng/roses/kernel/demo/exception/DemoException.java index b6eb308b6..633a79082 100644 --- a/kernel-s-demo/demo-api/src/main/java/cn/stylefeng/roses/kernel/demo/exception/DemoException.java +++ b/kernel-s-demo/demo-api/src/main/java/cn/stylefeng/roses/kernel/demo/exception/DemoException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.demo.exception; import cn.stylefeng.roses.kernel.demo.constants.DemoConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-s-demo/demo-api/src/main/java/cn/stylefeng/roses/kernel/demo/exception/enums/DemoExceptionEnum.java b/kernel-s-demo/demo-api/src/main/java/cn/stylefeng/roses/kernel/demo/exception/enums/DemoExceptionEnum.java index 1ca567b4f..21a65646c 100644 --- a/kernel-s-demo/demo-api/src/main/java/cn/stylefeng/roses/kernel/demo/exception/enums/DemoExceptionEnum.java +++ b/kernel-s-demo/demo-api/src/main/java/cn/stylefeng/roses/kernel/demo/exception/enums/DemoExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.demo.exception.enums; import cn.stylefeng.roses.kernel.demo.constants.DemoConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/exception/DictException.java b/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/exception/DictException.java index c02b6093f..4a95b897e 100644 --- a/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/exception/DictException.java +++ b/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/exception/DictException.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.dict.api.exception; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.dict.api.constants.DictConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/exception/enums/DictExceptionEnum.java b/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/exception/enums/DictExceptionEnum.java index bac143ba4..cfee348dd 100644 --- a/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/exception/enums/DictExceptionEnum.java +++ b/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/exception/enums/DictExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.dict.api.exception.enums; import cn.stylefeng.roses.kernel.dict.api.constants.DictConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java index 5ffc79cde..d1c4ed9b4 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java @@ -11,7 +11,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; 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.rule.pojo.ztree.ZTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/TreeDictInfo.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/TreeDictInfo.java index 2bb56c661..f5e9ef1d5 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/TreeDictInfo.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/TreeDictInfo.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.dict.modular.pojo; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.util.List; diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java index f26609f91..b238a156d 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java @@ -5,7 +5,7 @@ import cn.stylefeng.roses.kernel.dict.api.DictApi; import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict; import cn.stylefeng.roses.kernel.dict.modular.pojo.TreeDictInfo; import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictRequest; -import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java index d1eb68151..1012ac09a 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java @@ -22,9 +22,9 @@ import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; 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.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; -import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; +import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; 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-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/MessageException.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/MessageException.java index 6b1f9fcd2..ea5feef2b 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/MessageException.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/MessageException.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.message.api.exception; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.message.api.constants.MessageConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; /** diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java index 2c1e53b1e..1a955d35e 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.message.api.exception.enums; import cn.stylefeng.roses.kernel.message.api.constants.MessageConstants; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/DataScopeException.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/DataScopeException.java index 697795669..40a69fb9c 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/DataScopeException.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/DataScopeException.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.system.exception; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +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; 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/exception/SystemModularException.java index 76252edfa..88944e8c9 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/exception/SystemModularException.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.exception; import cn.hutool.core.util.StrUtil; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; +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; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/AppExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/AppExceptionEnum.java index 4c0ce4fdb..a19ca074f 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/AppExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/AppExceptionEnum.java @@ -24,8 +24,8 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package cn.stylefeng.roses.kernel.system.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; 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 lombok.Getter; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/DataScopeExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/DataScopeExceptionEnum.java index ea006905d..d34284943 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/DataScopeExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/DataScopeExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; 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 lombok.Getter; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/NoticeExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/NoticeExceptionEnum.java index cd8fecfe3..c05b51203 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/NoticeExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/NoticeExceptionEnum.java @@ -24,8 +24,8 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package cn.stylefeng.roses.kernel.system.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; 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 lombok.Getter; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/OrganizationExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/OrganizationExceptionEnum.java index a707faa43..78b58e6e9 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/OrganizationExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/OrganizationExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; 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 lombok.Getter; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/PositionExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/PositionExceptionEnum.java index 3964c96d4..9c74fcc2b 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/PositionExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/PositionExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; 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 lombok.Getter; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysMenuButtonExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysMenuButtonExceptionEnum.java index ff4fda5d1..c396ab988 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysMenuButtonExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysMenuButtonExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.system.constants.SystemConstants; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysMenuExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysMenuExceptionEnum.java index 44f991956..9da6ee3da 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysMenuExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysMenuExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.system.constants.SystemConstants; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysRoleExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysRoleExceptionEnum.java index a94da9ef7..329a83006 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysRoleExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysRoleExceptionEnum.java @@ -24,8 +24,8 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package cn.stylefeng.roses.kernel.system.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; 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 lombok.Getter; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserExceptionEnum.java index 84b3ec28e..bbc1b0637 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserExceptionEnum.java @@ -24,8 +24,8 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package cn.stylefeng.roses.kernel.system.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; 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 lombok.Getter; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserOrgExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserOrgExceptionEnum.java index bce2323e5..ef124682b 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserOrgExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserOrgExceptionEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.exception.enums; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractExceptionEnum; 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 lombok.Getter; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdBaseTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdBaseTreeNode.java index 9c0a563b3..2e6e23d97 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdBaseTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdBaseTreeNode.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.system.pojo.menu.antd; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.util.List; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdIndexMenuTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdIndexMenuTreeNode.java index 54595d6dc..e18ce6199 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdIndexMenuTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/antd/AntdIndexMenuTreeNode.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.system.pojo.menu.antd; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.util.List; 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/pojo/menu/layui/LayuiIndexMenuTreeNode.java index ce3f739bb..a0ba217c1 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/pojo/menu/layui/LayuiIndexMenuTreeNode.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.system.pojo.menu.layui; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.util.List; 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/pojo/menu/layui/LayuiMenuAndButtonTreeResponse.java index 3b77a4e95..293657230 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/pojo/menu/layui/LayuiMenuAndButtonTreeResponse.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.system.pojo.menu.layui; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.util.List; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/other/MenuSelectTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/other/MenuSelectTreeNode.java index 470f25e7c..9a60590f4 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/other/MenuSelectTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/other/MenuSelectTreeNode.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.system.pojo.menu.other; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.math.BigDecimal; 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/pojo/organization/layui/LayuiOrganizationTreeNode.java index 22ca05a47..827e14cf3 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/pojo/organization/layui/LayuiOrganizationTreeNode.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.pojo.organization.layui; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractXmSelectNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.xmtree.base.AbstractXmSelectNode; import lombok.Data; import java.util.List; 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/pojo/resource/LayuiApiResourceTreeNode.java index 2505a2be2..118092bfa 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/pojo/resource/LayuiApiResourceTreeNode.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.system.pojo.resource; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.util.List; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java index 21d20a23f..f5b9cf4a4 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java @@ -8,7 +8,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; 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.rule.pojo.ztree.ZTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.pojo.SysMenuRequest; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuResponse; import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiMenuAndButtonTreeResponse; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java index e1a9e4223..0913430f6 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.menu.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java index 0462c8383..6b2367fa7 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java @@ -6,7 +6,7 @@ import cn.stylefeng.roses.kernel.menu.modular.pojo.AntdvMenuItem; import cn.stylefeng.roses.kernel.menu.modular.pojo.AuthorityItem; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; -import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory; +import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdIndexMenuTreeNode; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuResponse; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/LayuiMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/LayuiMenusFactory.java index c9a1920ba..3097a56d1 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/LayuiMenusFactory.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/LayuiMenusFactory.java @@ -8,7 +8,7 @@ import cn.stylefeng.roses.kernel.i18n.api.constants.TranslationConstants; import cn.stylefeng.roses.kernel.i18n.api.context.TranslationContext; import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; -import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory; +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.pojo.menu.layui.LayuiAppIndexMenus; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/pojo/AntdvMenuItem.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/pojo/AntdvMenuItem.java index f485cea48..53843145a 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/pojo/AntdvMenuItem.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/pojo/AntdvMenuItem.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.menu.modular.pojo; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.util.List; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java index 3a8e6e968..7c1b42732 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java @@ -25,7 +25,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package cn.stylefeng.roses.kernel.menu.modular.service; import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu; -import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.pojo.SysMenuRequest; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdIndexMenuTreeNode; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuResponse; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java index a15dc01a3..62e0c8905 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java @@ -44,8 +44,8 @@ import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; 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.factory.DefaultTreeBuildFactory; -import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; +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; 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 7b6e35380..20c48c216 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 @@ -5,7 +5,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; 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.rule.pojo.ztree.ZTreeNode; +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 org.springframework.validation.annotation.Validated; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java index 050a9c173..986fe394d 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.modular.organization.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractXmSelectNode; +import cn.stylefeng.roses.kernel.rule.tree.xmtree.base.AbstractXmSelectNode; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java index 62748f7d0..cfc49e794 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.system.modular.organization.factory; -import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; +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; 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 41f477a98..6e3f8c21b 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 @@ -1,8 +1,8 @@ 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.pojo.tree.DefaultTreeNode; -import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; +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.modular.organization.entity.HrOrganization; import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationRequest; 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 db780ee20..574d43822 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 @@ -15,9 +15,9 @@ import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; -import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory; -import cn.stylefeng.roses.kernel.rule.pojo.tree.DefaultTreeNode; -import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; +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; diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/pojo/ResourceTreeNode.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/pojo/ResourceTreeNode.java index 9ce0cd19c..b99058566 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/pojo/ResourceTreeNode.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/pojo/ResourceTreeNode.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.resource.modular.pojo; -import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; +import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; import java.util.List; diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java index 557805128..414d5b878 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java @@ -20,7 +20,7 @@ import cn.stylefeng.roses.kernel.resource.modular.service.SysResourceService; 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.factory.DefaultTreeBuildFactory; +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.UserServiceApi; 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 8b3c2897d..c0776d43c 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 @@ -18,9 +18,9 @@ import cn.stylefeng.roses.kernel.office.api.OfficeExcelApi; import cn.stylefeng.roses.kernel.office.api.pojo.report.ExcelExportParam; import cn.stylefeng.roses.kernel.rule.enums.TreeNodeEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; -import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.rule.pojo.tree.UserSelectTreeNode; +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;