diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/Query.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/annotation/Query.java similarity index 93% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/Query.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/annotation/Query.java index 97f5dd83..dc395684 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/Query.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/annotation/Query.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.starter.data.core.annotation; +package top.continew.starter.data.annotation; -import top.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.enums.QueryType; import java.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/QueryIgnore.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/annotation/QueryIgnore.java similarity index 94% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/QueryIgnore.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/annotation/QueryIgnore.java index a2967b4e..d14638f0 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/QueryIgnore.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/annotation/QueryIgnore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.core.annotation; +package top.continew.starter.data.annotation; import java.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/DatabaseType.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/enums/DatabaseType.java similarity index 94% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/DatabaseType.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/enums/DatabaseType.java index 3c8100f1..8480e620 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/DatabaseType.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/enums/DatabaseType.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.starter.data.core.enums; +package top.continew.starter.data.enums; -import top.continew.starter.data.core.function.ISqlFunction; +import top.continew.starter.data.function.ISqlFunction; import java.io.Serializable; diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/QueryType.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/enums/QueryType.java similarity index 97% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/QueryType.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/enums/QueryType.java index bb336be7..c769d4f0 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/QueryType.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/enums/QueryType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.core.enums; +package top.continew.starter.data.enums; /** * 查询类型枚举 diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/function/ISqlFunction.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/function/ISqlFunction.java similarity index 95% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/function/ISqlFunction.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/function/ISqlFunction.java index 9f96cc49..4c828d3c 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/function/ISqlFunction.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/function/ISqlFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.core.function; +package top.continew.starter.data.function; import java.io.Serializable; diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/MetaUtils.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/util/MetaUtils.java similarity index 97% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/MetaUtils.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/util/MetaUtils.java index dc3107b9..b1ad3078 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/MetaUtils.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/util/MetaUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.core.util; +package top.continew.starter.data.util; import cn.hutool.core.convert.Convert; import cn.hutool.core.text.CharSequenceUtil; @@ -25,7 +25,7 @@ import cn.hutool.db.meta.MetaUtil; import cn.hutool.db.meta.Table; import cn.hutool.db.meta.TableType; import top.continew.starter.core.exception.BusinessException; -import top.continew.starter.data.core.enums.DatabaseType; +import top.continew.starter.data.enums.DatabaseType; import javax.sql.DataSource; import java.sql.Connection; diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/SqlInjectionUtils.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/util/SqlInjectionUtils.java similarity index 99% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/SqlInjectionUtils.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/util/SqlInjectionUtils.java index 6fd922e8..4e64d494 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/SqlInjectionUtils.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/util/SqlInjectionUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.core.util; +package top.continew.starter.data.util; import cn.hutool.core.text.CharSequenceUtil; import org.slf4j.Logger; diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/ConditionalOnEnabledDataPermission.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/autoconfigure/ConditionalOnEnabledDataPermission.java similarity index 95% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/ConditionalOnEnabledDataPermission.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/autoconfigure/ConditionalOnEnabledDataPermission.java index e81314af..778ffcdc 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/ConditionalOnEnabledDataPermission.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/autoconfigure/ConditionalOnEnabledDataPermission.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.autoconfigure; +package top.continew.starter.data.autoconfigure; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import top.continew.starter.core.constant.PropertiesConstants; diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MyBatisFlexExtensionProperties.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/autoconfigure/MyBatisFlexExtensionProperties.java similarity index 98% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MyBatisFlexExtensionProperties.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/autoconfigure/MyBatisFlexExtensionProperties.java index 2c0a51ac..fbb5d59c 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MyBatisFlexExtensionProperties.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/autoconfigure/MyBatisFlexExtensionProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.autoconfigure; +package top.continew.starter.data.autoconfigure; import com.mybatisflex.core.dialect.DbType; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MybatisFlexAutoConfiguration.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/autoconfigure/MybatisFlexAutoConfiguration.java similarity index 92% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MybatisFlexAutoConfiguration.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/autoconfigure/MybatisFlexAutoConfiguration.java index f0e0bad7..bba0ad53 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MybatisFlexAutoConfiguration.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/autoconfigure/MybatisFlexAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.autoconfigure; +package top.continew.starter.data.autoconfigure; import com.mybatisflex.core.dialect.DbType; import com.mybatisflex.core.dialect.DialectFactory; @@ -30,8 +30,8 @@ import org.springframework.context.annotation.PropertySource; import org.springframework.transaction.annotation.EnableTransactionManagement; import top.continew.starter.core.constant.PropertiesConstants; import top.continew.starter.core.util.GeneralPropertySourceFactory; -import top.continew.starter.data.mf.datapermission.DataPermissionDialect; -import top.continew.starter.data.mf.datapermission.DataPermissionFilter; +import top.continew.starter.data.datapermission.DataPermissionDialect; +import top.continew.starter.data.datapermission.DataPermissionFilter; /** * MyBatis Flex 自动配置 diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/BaseMapper.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/base/BaseMapper.java similarity index 97% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/BaseMapper.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/base/BaseMapper.java index 60f2fa1c..64fe5f0d 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/BaseMapper.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/base/BaseMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.base; +package top.continew.starter.data.base; import cn.hutool.core.util.ClassUtil; import com.mybatisflex.core.query.QueryWrapper; diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/IBaseEnum.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/base/IBaseEnum.java similarity index 96% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/IBaseEnum.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/base/IBaseEnum.java index c517382b..1d343467 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/IBaseEnum.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/base/IBaseEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.base; +package top.continew.starter.data.base; import java.io.Serializable; diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermission.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermission.java similarity index 96% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermission.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermission.java index 977aa41a..d1e12006 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermission.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermission.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.datapermission; +package top.continew.starter.data.datapermission; import java.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionAspect.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionAspect.java similarity index 96% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionAspect.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionAspect.java index b48a208a..84d5f08c 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionAspect.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionAspect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.datapermission; +package top.continew.starter.data.datapermission; import org.aspectj.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionCurrentUser.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionCurrentUser.java similarity index 97% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionCurrentUser.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionCurrentUser.java index b857f427..229bfe7f 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionCurrentUser.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionCurrentUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.datapermission; +package top.continew.starter.data.datapermission; import java.util.Set; diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionDialect.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionDialect.java similarity index 99% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionDialect.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionDialect.java index aef0327e..cd0dfd42 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionDialect.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionDialect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.datapermission; +package top.continew.starter.data.datapermission; import cn.hutool.core.text.CharSequenceUtil; import com.mybatisflex.core.dialect.impl.CommonsDialectImpl; diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionFilter.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionFilter.java similarity index 95% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionFilter.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionFilter.java index 1952c863..4f33bcab 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionFilter.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataPermissionFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.datapermission; +package top.continew.starter.data.datapermission; /** * 数据权限过滤器接口 diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataScope.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataScope.java similarity index 95% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataScope.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataScope.java index 694c92c1..3d6625c2 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataScope.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/datapermission/DataScope.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.datapermission; +package top.continew.starter.data.datapermission; /** * 数据权限枚举 diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/IService.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/service/IService.java similarity index 94% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/IService.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/service/IService.java index c3250094..c1762646 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/IService.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/service/IService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.service; +package top.continew.starter.data.service; /** * 通用业务接口 diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/impl/ServiceImpl.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/service/impl/ServiceImpl.java similarity index 88% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/impl/ServiceImpl.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/service/impl/ServiceImpl.java index 326b172c..5dce2ef1 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/impl/ServiceImpl.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/service/impl/ServiceImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.starter.data.mf.service.impl; +package top.continew.starter.data.service.impl; import top.continew.starter.core.util.ClassUtils; -import top.continew.starter.data.mf.base.BaseMapper; -import top.continew.starter.data.mf.service.IService; +import top.continew.starter.data.base.BaseMapper; +import top.continew.starter.data.service.IService; /** * 通用业务实现类 diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/util/QueryWrapperHelper.java similarity index 96% rename from continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/util/QueryWrapperHelper.java index f6aef178..fbf103c7 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/util/QueryWrapperHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mf.util; +package top.continew.starter.data.util; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.collection.CollUtil; @@ -29,10 +29,9 @@ import org.springframework.data.domain.Sort; import top.continew.starter.core.exception.BadRequestException; import top.continew.starter.core.util.ReflectUtils; import top.continew.starter.core.util.validation.ValidationUtils; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.annotation.QueryIgnore; -import top.continew.starter.data.core.enums.QueryType; -import top.continew.starter.data.core.util.SqlInjectionUtils; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.annotation.QueryIgnore; +import top.continew.starter.data.enums.QueryType; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/continew-starter-data/continew-starter-data-mf/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-data/continew-starter-data-mf/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 138b056d..56c2c4b7 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-data/continew-starter-data-mf/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.continew.starter.data.mf.autoconfigure.MybatisFlexAutoConfiguration \ No newline at end of file +top.continew.starter.data.autoconfigure.MybatisFlexAutoConfiguration \ No newline at end of file diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MyBatisPlusExtensionProperties.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/MyBatisPlusExtensionProperties.java similarity index 96% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MyBatisPlusExtensionProperties.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/MyBatisPlusExtensionProperties.java index 88ae6d17..f4066713 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MyBatisPlusExtensionProperties.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/MyBatisPlusExtensionProperties.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.starter.data.mp.autoconfigure; +package top.continew.starter.data.autoconfigure; import com.baomidou.mybatisplus.annotation.DbType; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -import top.continew.starter.data.mp.autoconfigure.idgenerator.MyBatisPlusIdGeneratorProperties; +import top.continew.starter.data.autoconfigure.idgenerator.MyBatisPlusIdGeneratorProperties; /** * MyBatis Plus 扩展配置属性 diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MybatisPlusAutoConfiguration.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/MybatisPlusAutoConfiguration.java similarity index 96% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MybatisPlusAutoConfiguration.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/MybatisPlusAutoConfiguration.java index d3a3eed4..c00f4945 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MybatisPlusAutoConfiguration.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/MybatisPlusAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mp.autoconfigure; +package top.continew.starter.data.autoconfigure; import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusPropertiesCustomizer; @@ -38,8 +38,8 @@ import org.springframework.context.annotation.PropertySource; import org.springframework.transaction.annotation.EnableTransactionManagement; import top.continew.starter.core.constant.PropertiesConstants; import top.continew.starter.core.util.GeneralPropertySourceFactory; -import top.continew.starter.data.mp.autoconfigure.idgenerator.MyBatisPlusIdGeneratorConfiguration; -import top.continew.starter.data.mp.handler.CompositeBaseEnumTypeHandler; +import top.continew.starter.data.autoconfigure.idgenerator.MyBatisPlusIdGeneratorConfiguration; +import top.continew.starter.data.handler.CompositeBaseEnumTypeHandler; import java.util.Map; diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java similarity index 95% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java index 8a91fa44..3e760cb7 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mp.autoconfigure.idgenerator; +package top.continew.starter.data.autoconfigure.idgenerator; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import me.ahoo.cosid.snowflake.SnowflakeId; diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java similarity index 98% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java index 31c9e0ee..0b3243d8 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mp.autoconfigure.idgenerator; +package top.continew.starter.data.autoconfigure.idgenerator; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java similarity index 88% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java index 4519c7dc..b990b3b8 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.starter.data.mp.autoconfigure.idgenerator; +package top.continew.starter.data.autoconfigure.idgenerator; -import top.continew.starter.data.mp.enums.MyBatisPlusIdGeneratorType; +import top.continew.starter.data.enums.MyBatisPlusIdGeneratorType; /** * MyBatis ID 生成器配置属性 diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/enums/MyBatisPlusIdGeneratorType.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/enums/MyBatisPlusIdGeneratorType.java similarity index 95% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/enums/MyBatisPlusIdGeneratorType.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/enums/MyBatisPlusIdGeneratorType.java index eec60993..206b9f7d 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/enums/MyBatisPlusIdGeneratorType.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/enums/MyBatisPlusIdGeneratorType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mp.enums; +package top.continew.starter.data.enums; /** * MyBatis ID 生成器类型枚举 diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/handler/CompositeBaseEnumTypeHandler.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/handler/CompositeBaseEnumTypeHandler.java similarity index 98% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/handler/CompositeBaseEnumTypeHandler.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/handler/CompositeBaseEnumTypeHandler.java index 368f6b15..a1a06802 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/handler/CompositeBaseEnumTypeHandler.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/handler/CompositeBaseEnumTypeHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mp.handler; +package top.continew.starter.data.handler; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import org.apache.ibatis.type.EnumTypeHandler; diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/handler/MybatisBaseEnumTypeHandler.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/handler/MybatisBaseEnumTypeHandler.java similarity index 99% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/handler/MybatisBaseEnumTypeHandler.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/handler/MybatisBaseEnumTypeHandler.java index d74b015f..b911a524 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/handler/MybatisBaseEnumTypeHandler.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/handler/MybatisBaseEnumTypeHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mp.handler; +package top.continew.starter.data.handler; import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.IEnum; diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/mapper/BaseMapper.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mapper/BaseMapper.java similarity index 98% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/mapper/BaseMapper.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mapper/BaseMapper.java index 5bffd9fc..93f4ad87 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/mapper/BaseMapper.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mapper/BaseMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mp.mapper; +package top.continew.starter.data.mapper; import cn.hutool.core.util.ClassUtil; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/IService.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/service/IService.java similarity index 94% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/IService.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/service/IService.java index e49a9263..f4dbc200 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/IService.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/service/IService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mp.service; +package top.continew.starter.data.service; import com.baomidou.mybatisplus.extension.repository.IRepository; diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/service/impl/ServiceImpl.java similarity index 95% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/service/impl/ServiceImpl.java index 7ec8e9d6..8e9a01f7 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/service/impl/ServiceImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.continew.starter.data.mp.service.impl; +package top.continew.starter.data.service.impl; import cn.hutool.core.util.ClassUtil; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.repository.CrudRepository; import top.continew.starter.core.util.ReflectUtils; -import top.continew.starter.data.mp.service.IService; +import top.continew.starter.data.service.IService; import top.continew.starter.core.util.validation.CheckUtils; import java.io.Serializable; diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/util/QueryWrapperHelper.java similarity index 97% rename from continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/util/QueryWrapperHelper.java index a9846c94..fadabfb1 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/util/QueryWrapperHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mp.util; +package top.continew.starter.data.util; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.collection.CollUtil; @@ -29,10 +29,9 @@ import org.springframework.data.domain.Sort; import top.continew.starter.core.exception.BadRequestException; import top.continew.starter.core.util.ReflectUtils; import top.continew.starter.core.util.validation.ValidationUtils; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.annotation.QueryIgnore; -import top.continew.starter.data.core.enums.QueryType; -import top.continew.starter.data.core.util.SqlInjectionUtils; +import top.continew.starter.data.annotation.Query; +import top.continew.starter.data.annotation.QueryIgnore; +import top.continew.starter.data.enums.QueryType; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/continew-starter-data/continew-starter-data-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-data/continew-starter-data-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b04af5fe..3ace3d08 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-data/continew-starter-data-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.continew.starter.data.mp.autoconfigure.MybatisPlusAutoConfiguration \ No newline at end of file +top.continew.starter.data.autoconfigure.MybatisPlusAutoConfiguration \ No newline at end of file diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java index e10c49d5..e549fa1a 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java @@ -22,7 +22,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.data.domain.Sort; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.validation.ValidationUtils; -import top.continew.starter.data.core.util.SqlInjectionUtils; +import top.continew.starter.data.util.SqlInjectionUtils; import java.io.Serial; import java.io.Serializable; diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java index ecaa99ca..491200ef 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java @@ -34,9 +34,9 @@ import org.springframework.transaction.annotation.Transactional; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.ReflectUtils; import top.continew.starter.core.util.validation.ValidationUtils; -import top.continew.starter.data.mf.base.BaseMapper; -import top.continew.starter.data.mf.service.impl.ServiceImpl; -import top.continew.starter.data.mf.util.QueryWrapperHelper; +import top.continew.starter.data.base.BaseMapper; +import top.continew.starter.data.service.impl.ServiceImpl; +import top.continew.starter.data.util.QueryWrapperHelper; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.extension.crud.autoconfigure.CrudProperties; import top.continew.starter.extension.crud.autoconfigure.CrudTreeProperties; diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java index ff00119f..568d36a5 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java @@ -37,9 +37,9 @@ import org.springframework.transaction.annotation.Transactional; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.ClassUtils; import top.continew.starter.core.util.ReflectUtils; -import top.continew.starter.data.mp.mapper.BaseMapper; -import top.continew.starter.data.mp.service.impl.ServiceImpl; -import top.continew.starter.data.mp.util.QueryWrapperHelper; +import top.continew.starter.data.mapper.BaseMapper; +import top.continew.starter.data.service.impl.ServiceImpl; +import top.continew.starter.data.util.QueryWrapperHelper; import top.continew.starter.extension.crud.annotation.DictModel; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.extension.crud.autoconfigure.CrudProperties; diff --git a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java index bd4cd9b0..7f1817cb 100644 --- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java +++ b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java @@ -43,8 +43,8 @@ import net.sf.jsqlparser.statement.select.ParenthesedSelect; import net.sf.jsqlparser.statement.select.PlainSelect; import net.sf.jsqlparser.statement.select.SelectItem; import top.continew.starter.core.constant.StringConstants; -import top.continew.starter.data.core.enums.DatabaseType; -import top.continew.starter.data.core.util.MetaUtils; +import top.continew.starter.data.enums.DatabaseType; +import top.continew.starter.data.util.MetaUtils; import top.continew.starter.extension.datapermission.annotation.DataPermission; import top.continew.starter.extension.datapermission.enums.DataScope; import top.continew.starter.extension.datapermission.filter.DataPermissionUserContextProvider; diff --git a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/exception/LicenseException.java b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/exception/LicenseException.java similarity index 96% rename from continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/exception/LicenseException.java rename to continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/exception/LicenseException.java index 91e28b5f..868bd08f 100644 --- a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/exception/LicenseException.java +++ b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/exception/LicenseException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.exception; +package top.continew.starter.license.exception; import top.continew.starter.core.exception.BaseException; diff --git a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/BuildCreatorResp.java b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/BuildCreatorResp.java similarity index 97% rename from continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/BuildCreatorResp.java rename to continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/BuildCreatorResp.java index 678a5fb5..8918575c 100644 --- a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/BuildCreatorResp.java +++ b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/BuildCreatorResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.model; +package top.continew.starter.license.model; import net.lingala.zip4j.ZipFile; diff --git a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/ConfigParam.java b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/ConfigParam.java similarity index 96% rename from continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/ConfigParam.java rename to continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/ConfigParam.java index 1125180c..3348f41f 100644 --- a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/ConfigParam.java +++ b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/ConfigParam.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.model; +package top.continew.starter.license.model; /** * config参数 diff --git a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/CustomKeyStoreParam.java b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/CustomKeyStoreParam.java similarity index 97% rename from continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/CustomKeyStoreParam.java rename to continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/CustomKeyStoreParam.java index dd346036..7ea80650 100644 --- a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/CustomKeyStoreParam.java +++ b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/CustomKeyStoreParam.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.model; +package top.continew.starter.license.model; import de.schlichtherle.license.AbstractKeyStoreParam; diff --git a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/LicenseCreatorParam.java b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/LicenseCreatorParam.java similarity index 98% rename from continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/LicenseCreatorParam.java rename to continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/LicenseCreatorParam.java index 226bac5d..85539ee4 100644 --- a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/LicenseCreatorParam.java +++ b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/LicenseCreatorParam.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.model; +package top.continew.starter.license.model; import java.io.Serial; import java.io.Serializable; diff --git a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/LicenseCreatorParamVO.java b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/LicenseCreatorParamVO.java similarity index 98% rename from continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/LicenseCreatorParamVO.java rename to continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/LicenseCreatorParamVO.java index 061c9a5a..549571ca 100644 --- a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/LicenseCreatorParamVO.java +++ b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/LicenseCreatorParamVO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.model; +package top.continew.starter.license.model; import java.util.Date; diff --git a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/LicenseExtraModel.java b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/LicenseExtraModel.java similarity index 97% rename from continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/LicenseExtraModel.java rename to continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/LicenseExtraModel.java index ccdfba8a..487e331c 100644 --- a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/model/LicenseExtraModel.java +++ b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/model/LicenseExtraModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.model; +package top.continew.starter.license.model; import java.util.Set; diff --git a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/util/ExecCmdUtil.java b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/util/ExecCmdUtil.java similarity index 98% rename from continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/util/ExecCmdUtil.java rename to continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/util/ExecCmdUtil.java index f7ba8dca..f8ba3175 100644 --- a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/util/ExecCmdUtil.java +++ b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/util/ExecCmdUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.util; +package top.continew.starter.license.util; import cn.hutool.core.util.ArrayUtil; diff --git a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/util/ServerInfoUtils.java b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/util/ServerInfoUtils.java similarity index 98% rename from continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/util/ServerInfoUtils.java rename to continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/util/ServerInfoUtils.java index b2e0327e..ca188d9e 100644 --- a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/license/util/ServerInfoUtils.java +++ b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/util/ServerInfoUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.util; +package top.continew.starter.license.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; @@ -23,8 +23,8 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import top.continew.license.exception.LicenseException; -import top.continew.license.model.LicenseExtraModel; +import top.continew.starter.license.exception.LicenseException; +import top.continew.starter.license.model.LicenseExtraModel; import java.io.*; import java.net.InetAddress; diff --git a/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/autoconfigure/LicenseGenerateAutoConfiguration.java b/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/autoconfigure/LicenseGenerateAutoConfiguration.java similarity index 94% rename from continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/autoconfigure/LicenseGenerateAutoConfiguration.java rename to continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/autoconfigure/LicenseGenerateAutoConfiguration.java index 5ff4283a..70bf0a04 100644 --- a/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/autoconfigure/LicenseGenerateAutoConfiguration.java +++ b/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/autoconfigure/LicenseGenerateAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.autoconfigure; +package top.continew.starter.license.autoconfigure; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import top.continew.license.service.LicenseCreateService; +import top.continew.starter.license.service.LicenseCreateService; import top.continew.starter.core.constant.PropertiesConstants; /** diff --git a/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/autoconfigure/LicenseGenerateProperties.java b/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/autoconfigure/LicenseGenerateProperties.java similarity index 95% rename from continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/autoconfigure/LicenseGenerateProperties.java rename to continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/autoconfigure/LicenseGenerateProperties.java index a29dfdb0..0865b432 100644 --- a/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/autoconfigure/LicenseGenerateProperties.java +++ b/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/autoconfigure/LicenseGenerateProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.autoconfigure; +package top.continew.starter.license.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; import top.continew.starter.core.constant.PropertiesConstants; diff --git a/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/manager/ServerLicenseManager.java b/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/manager/ServerLicenseManager.java similarity index 95% rename from continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/manager/ServerLicenseManager.java rename to continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/manager/ServerLicenseManager.java index 551f04a0..77e282ec 100644 --- a/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/manager/ServerLicenseManager.java +++ b/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/manager/ServerLicenseManager.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.license.manager; +package top.continew.starter.license.manager; import de.schlichtherle.license.*; import de.schlichtherle.xml.GenericCertificate; -import top.continew.license.exception.LicenseException; +import top.continew.starter.license.exception.LicenseException; import java.util.Date; diff --git a/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/service/LicenseCreateService.java b/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/service/LicenseCreateService.java similarity index 97% rename from continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/service/LicenseCreateService.java rename to continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/service/LicenseCreateService.java index 5f274bba..56c415bf 100644 --- a/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/license/service/LicenseCreateService.java +++ b/continew-starter-license/continew-starter-license-generator/src/main/java/top/continew/starter/license/service/LicenseCreateService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.service; +package top.continew.starter.license.service; import cn.hutool.core.util.IdUtil; import com.fasterxml.jackson.databind.ObjectMapper; @@ -22,11 +22,11 @@ import de.schlichtherle.license.*; import net.lingala.zip4j.ZipFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import top.continew.license.exception.LicenseException; -import top.continew.license.manager.ServerLicenseManager; -import top.continew.license.model.*; -import top.continew.license.util.ExecCmdUtil; -import top.continew.license.util.ServerInfoUtils; +import top.continew.starter.license.exception.LicenseException; +import top.continew.starter.license.manager.ServerLicenseManager; +import top.continew.starter.license.model.*; +import top.continew.starter.license.util.ExecCmdUtil; +import top.continew.starter.license.util.ServerInfoUtils; import javax.security.auth.x500.X500Principal; import java.io.File; diff --git a/continew-starter-license/continew-starter-license-generator/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-license/continew-starter-license-generator/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index ba26ebbe..c3aee06e 100644 --- a/continew-starter-license/continew-starter-license-generator/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-license/continew-starter-license-generator/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.continew.license.autoconfigure.LicenseGenerateAutoConfiguration \ No newline at end of file +top.continew.starter.license.autoconfigure.LicenseGenerateAutoConfiguration \ No newline at end of file diff --git a/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/autoconfigure/LicenseVerifyAutoConfiguration.java b/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/autoconfigure/LicenseVerifyAutoConfiguration.java similarity index 91% rename from continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/autoconfigure/LicenseVerifyAutoConfiguration.java rename to continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/autoconfigure/LicenseVerifyAutoConfiguration.java index 6deb2954..6a885f04 100644 --- a/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/autoconfigure/LicenseVerifyAutoConfiguration.java +++ b/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/autoconfigure/LicenseVerifyAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.autoconfigure; +package top.continew.starter.license.autoconfigure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,9 +26,9 @@ import org.springframework.context.annotation.DependsOn; import de.schlichtherle.license.LicenseManager; import jakarta.annotation.PostConstruct; -import top.continew.license.initializing.LicenseStarterInitializingBean; -import top.continew.license.bean.LicenseInstallerBean; -import top.continew.license.manager.CustomLicenseManager; +import top.continew.starter.license.initializing.LicenseStarterInitializingBean; +import top.continew.starter.license.bean.LicenseInstallerBean; +import top.continew.starter.license.manager.CustomLicenseManager; import top.continew.starter.core.constant.PropertiesConstants; /** diff --git a/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/autoconfigure/LicenseVerifyProperties.java b/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/autoconfigure/LicenseVerifyProperties.java similarity index 96% rename from continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/autoconfigure/LicenseVerifyProperties.java rename to continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/autoconfigure/LicenseVerifyProperties.java index 8409f5fe..2dbfeeec 100644 --- a/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/autoconfigure/LicenseVerifyProperties.java +++ b/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/autoconfigure/LicenseVerifyProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.autoconfigure; +package top.continew.starter.license.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/bean/LicenseInstallerBean.java b/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/bean/LicenseInstallerBean.java similarity index 91% rename from continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/bean/LicenseInstallerBean.java rename to continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/bean/LicenseInstallerBean.java index 5af75d9c..a8968c3a 100644 --- a/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/bean/LicenseInstallerBean.java +++ b/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/bean/LicenseInstallerBean.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.continew.license.bean; +package top.continew.starter.license.bean; import de.schlichtherle.license.LicenseContent; import de.schlichtherle.license.LicenseManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import top.continew.license.autoconfigure.LicenseVerifyProperties; -import top.continew.license.exception.LicenseException; -import top.continew.license.manager.CustomLicenseManager; +import top.continew.starter.license.autoconfigure.LicenseVerifyProperties; +import top.continew.starter.license.exception.LicenseException; +import top.continew.starter.license.manager.CustomLicenseManager; import java.io.File; import java.nio.file.Paths; diff --git a/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/initializing/LicenseStarterInitializingBean.java b/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/initializing/LicenseStarterInitializingBean.java similarity index 91% rename from continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/initializing/LicenseStarterInitializingBean.java rename to continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/initializing/LicenseStarterInitializingBean.java index 39f0e964..3c35b543 100644 --- a/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/initializing/LicenseStarterInitializingBean.java +++ b/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/initializing/LicenseStarterInitializingBean.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.continew.license.initializing; +package top.continew.starter.license.initializing; import org.springframework.beans.factory.InitializingBean; -import top.continew.license.bean.LicenseInstallerBean; +import top.continew.starter.license.bean.LicenseInstallerBean; /** * 启动校验 License diff --git a/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/manager/CustomLicenseManager.java b/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/manager/CustomLicenseManager.java similarity index 93% rename from continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/manager/CustomLicenseManager.java rename to continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/manager/CustomLicenseManager.java index 1de7efa0..bd9fe0e4 100644 --- a/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/license/manager/CustomLicenseManager.java +++ b/continew-starter-license/continew-starter-license-verifier/src/main/java/top/continew/starter/license/manager/CustomLicenseManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.license.manager; +package top.continew.starter.license.manager; import com.fasterxml.jackson.databind.ObjectMapper; import de.schlichtherle.license.*; @@ -22,13 +22,13 @@ import de.schlichtherle.xml.GenericCertificate; import net.lingala.zip4j.ZipFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import top.continew.license.autoconfigure.LicenseVerifyProperties; -import top.continew.license.bean.LicenseInstallerBean; -import top.continew.license.exception.LicenseException; -import top.continew.license.model.ConfigParam; -import top.continew.license.model.CustomKeyStoreParam; -import top.continew.license.model.LicenseExtraModel; -import top.continew.license.util.ServerInfoUtils; +import top.continew.starter.license.autoconfigure.LicenseVerifyProperties; +import top.continew.starter.license.bean.LicenseInstallerBean; +import top.continew.starter.license.exception.LicenseException; +import top.continew.starter.license.model.ConfigParam; +import top.continew.starter.license.model.CustomKeyStoreParam; +import top.continew.starter.license.model.LicenseExtraModel; +import top.continew.starter.license.util.ServerInfoUtils; import java.io.File; import java.io.IOException; diff --git a/continew-starter-license/continew-starter-license-verifier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-license/continew-starter-license-verifier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5ea5a597..e284eeb2 100644 --- a/continew-starter-license/continew-starter-license-verifier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-license/continew-starter-license-verifier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.continew.license.autoconfigure.LicenseVerifyAutoConfiguration \ No newline at end of file +top.continew.starter.license.autoconfigure.LicenseVerifyAutoConfiguration \ No newline at end of file