diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/interfaces/BasicEnum.java b/agileboot-common/src/main/java/com/agileboot/common/enums/BasicEnum.java similarity index 84% rename from agileboot-orm/src/main/java/com/agileboot/orm/common/enums/interfaces/BasicEnum.java rename to agileboot-common/src/main/java/com/agileboot/common/enums/BasicEnum.java index cb5b796..b0fb87e 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/interfaces/BasicEnum.java +++ b/agileboot-common/src/main/java/com/agileboot/common/enums/BasicEnum.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.common.enums.interfaces; +package com.agileboot.common.enums; /** * @author valarchie diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/interfaces/DictionaryEnum.java b/agileboot-common/src/main/java/com/agileboot/common/enums/DictionaryEnum.java similarity index 79% rename from agileboot-orm/src/main/java/com/agileboot/orm/common/enums/interfaces/DictionaryEnum.java rename to agileboot-common/src/main/java/com/agileboot/common/enums/DictionaryEnum.java index b950be9..68422b5 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/interfaces/DictionaryEnum.java +++ b/agileboot-common/src/main/java/com/agileboot/common/enums/DictionaryEnum.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.common.enums.interfaces; +package com.agileboot.common.enums; /** * 字典类型 接口 diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/MapCache.java b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/MapCache.java index 7fc691c..5ece7fe 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/MapCache.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/MapCache.java @@ -5,7 +5,7 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import com.agileboot.orm.common.annotations.Dictionary; import com.agileboot.orm.common.enums.*; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; import com.agileboot.orm.common.dto.DictionaryData; import java.util.Arrays; diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/user/web/DataScopeEnum.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/user/web/DataScopeEnum.java index d8f0b2d..b969550 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/user/web/DataScopeEnum.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/user/web/DataScopeEnum.java @@ -1,6 +1,6 @@ package com.agileboot.infrastructure.user.web; -import com.agileboot.orm.common.enums.interfaces.BasicEnum; +import com.agileboot.common.enums.BasicEnum; /** * 对应sys_role表的data_scope字段 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/dto/DictionaryData.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/dto/DictionaryData.java index 04c9fbb..d443ab8 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/dto/DictionaryData.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/dto/DictionaryData.java @@ -1,6 +1,6 @@ package com.agileboot.orm.common.dto; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; import lombok.Data; /** diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/BusinessTypeEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/BusinessTypeEnum.java index 77e0b40..c5319d2 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/BusinessTypeEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/BusinessTypeEnum.java @@ -2,7 +2,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.CssTag; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; /** * 对应sys_operation_log的business_type diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/ConfigKeyEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/ConfigKeyEnum.java index a3bd4e5..2987244 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/ConfigKeyEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/ConfigKeyEnum.java @@ -1,6 +1,6 @@ package com.agileboot.orm.common.enums; -import com.agileboot.orm.common.enums.interfaces.BasicEnum; +import com.agileboot.common.enums.BasicEnum; /** * 系统配置 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/GenderEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/GenderEnum.java index 502cc1b..8985ee0 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/GenderEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/GenderEnum.java @@ -2,7 +2,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.CssTag; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; /** * 对应sys_user的sex字段 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/LoginStatusEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/LoginStatusEnum.java index fdb0a44..16212af 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/LoginStatusEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/LoginStatusEnum.java @@ -2,7 +2,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.CssTag; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; /** * 用户状态 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/MenuComponentEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/MenuComponentEnum.java index e5ed82b..33387bf 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/MenuComponentEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/MenuComponentEnum.java @@ -1,6 +1,6 @@ package com.agileboot.orm.common.enums; -import com.agileboot.orm.common.enums.interfaces.BasicEnum; +import com.agileboot.common.enums.BasicEnum; /** * diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/MenuTypeEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/MenuTypeEnum.java index 23cf47e..5f23706 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/MenuTypeEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/MenuTypeEnum.java @@ -1,6 +1,6 @@ package com.agileboot.orm.common.enums; -import com.agileboot.orm.common.enums.interfaces.BasicEnum; +import com.agileboot.common.enums.BasicEnum; /** * @author valarchie diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/NoticeStatusEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/NoticeStatusEnum.java index 545abe7..f46500f 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/NoticeStatusEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/NoticeStatusEnum.java @@ -2,7 +2,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.CssTag; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; /** * 对应sys_notice的 status字段 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/NoticeTypeEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/NoticeTypeEnum.java index e67a05a..37c6d18 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/NoticeTypeEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/NoticeTypeEnum.java @@ -2,7 +2,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.CssTag; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; /** * 对应sys_notice的 notice_type字段 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/OperationStatusEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/OperationStatusEnum.java index 02f8f83..4e046c2 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/OperationStatusEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/OperationStatusEnum.java @@ -2,7 +2,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.CssTag; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; /** * 对应sys_operation_log的status字段 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/OperatorTypeEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/OperatorTypeEnum.java index a507110..7f4cc14 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/OperatorTypeEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/OperatorTypeEnum.java @@ -1,7 +1,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.BasicEnum; +import com.agileboot.common.enums.BasicEnum; /** * 操作者类型 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/RequestMethodEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/RequestMethodEnum.java index 21245f8..71cbdf7 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/RequestMethodEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/RequestMethodEnum.java @@ -1,6 +1,6 @@ package com.agileboot.orm.common.enums; -import com.agileboot.orm.common.enums.interfaces.BasicEnum; +import com.agileboot.common.enums.BasicEnum; /** * Http Method diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/StatusEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/StatusEnum.java index a2b65f5..bb1ded5 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/StatusEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/StatusEnum.java @@ -2,7 +2,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.CssTag; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; /** * 除非表有特殊指明的话，一般用这个枚举代表 status字段 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/UserStatusEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/UserStatusEnum.java index e334b38..7190eb5 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/UserStatusEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/UserStatusEnum.java @@ -2,7 +2,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.CssTag; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; /** * 对应sys_user的status字段 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/VisibleStatusEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/VisibleStatusEnum.java index f64a27e..42e5fe3 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/VisibleStatusEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/VisibleStatusEnum.java @@ -2,7 +2,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.CssTag; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; /** * 对应sys_menu表的is_visible字段 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/YesOrNoEnum.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/YesOrNoEnum.java index 38331b7..2d95656 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/YesOrNoEnum.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/YesOrNoEnum.java @@ -2,7 +2,7 @@ package com.agileboot.orm.common.enums; import com.agileboot.orm.common.CssTag; import com.agileboot.orm.common.annotations.Dictionary; -import com.agileboot.orm.common.enums.interfaces.DictionaryEnum; +import com.agileboot.common.enums.DictionaryEnum; /** * 系统内代表是与否的枚举 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/util/BasicEnumUtil.java b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/util/BasicEnumUtil.java index 2315446..29b09fc 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/util/BasicEnumUtil.java +++ b/agileboot-orm/src/main/java/com/agileboot/orm/common/enums/util/BasicEnumUtil.java @@ -3,7 +3,7 @@ package com.agileboot.orm.common.enums.util; import cn.hutool.core.convert.Convert; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; -import com.agileboot.orm.common.enums.interfaces.BasicEnum; +import com.agileboot.common.enums.BasicEnum; import java.util.Objects;