diff --git a/README.md b/README.md index 8ac04124..01d80402 100644 --- a/README.md +++ b/README.md @@ -206,11 +206,11 @@ continew-starter.web: ### 数据访问模块 -| 模块名称 | 模块说明 | -| ---------------------------------- | --------------------- | -| continew-starter-data-core | 数据访问核心模块 | -| continew-starter-data-mybatis-plus | MyBatis Plus 自动配置 | -| continew-starter-data-mybatis-flex | MyBatis Flex 自动配置 | +| 模块名称 | 模块说明 | +|----------------------------| --------------------- | +| continew-starter-data-core | 数据访问核心模块 | +| continew-starter-data-mp | MyBatis Plus 自动配置 | +| continew-starter-data-mf | MyBatis Flex 自动配置 | ### 认证模块 diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/pom.xml b/continew-starter-data/continew-starter-data-mf/pom.xml similarity index 96% rename from continew-starter-data/continew-starter-data-mybatis-flex/pom.xml rename to continew-starter-data/continew-starter-data-mf/pom.xml index 47dfe25d..bbc3a57f 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/pom.xml +++ b/continew-starter-data/continew-starter-data-mf/pom.xml @@ -9,7 +9,7 @@ ${revision} - continew-starter-data-mybatis-flex + continew-starter-data-mf ContiNew Starter 数据访问模块 - MyBatis Flex diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/ConditionalOnEnabledDataPermission.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/ConditionalOnEnabledDataPermission.java similarity index 94% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/ConditionalOnEnabledDataPermission.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/ConditionalOnEnabledDataPermission.java index f868d466..e81314af 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/ConditionalOnEnabledDataPermission.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/ConditionalOnEnabledDataPermission.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.autoconfigure; +package top.continew.starter.data.mf.autoconfigure; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import top.continew.starter.core.constant.PropertiesConstants; diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/MyBatisFlexExtensionProperties.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MyBatisFlexExtensionProperties.java similarity index 98% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/MyBatisFlexExtensionProperties.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MyBatisFlexExtensionProperties.java index d567ab1b..8dd315aa 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/MyBatisFlexExtensionProperties.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MyBatisFlexExtensionProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.autoconfigure; +package top.continew.starter.data.mf.autoconfigure; import com.mybatisflex.core.dialect.DbType; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/MybatisFlexAutoConfiguration.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MybatisFlexAutoConfiguration.java similarity index 91% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/MybatisFlexAutoConfiguration.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MybatisFlexAutoConfiguration.java index 407c1792..f0e0bad7 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/MybatisFlexAutoConfiguration.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/autoconfigure/MybatisFlexAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.autoconfigure; +package top.continew.starter.data.mf.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.mybatis.flex.datapermission.DataPermissionDialect; -import top.continew.starter.data.mybatis.flex.datapermission.DataPermissionFilter; +import top.continew.starter.data.mf.datapermission.DataPermissionDialect; +import top.continew.starter.data.mf.datapermission.DataPermissionFilter; /** * MyBatis Flex 自动配置 diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/base/BaseMapper.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/BaseMapper.java similarity index 97% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/base/BaseMapper.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/BaseMapper.java index 57217a4b..60f2fa1c 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/base/BaseMapper.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/BaseMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.base; +package top.continew.starter.data.mf.base; import cn.hutool.core.util.ClassUtil; import com.mybatisflex.core.query.QueryWrapper; diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/base/IBaseEnum.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/IBaseEnum.java similarity index 95% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/base/IBaseEnum.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/IBaseEnum.java index 748a7537..c517382b 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/base/IBaseEnum.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/base/IBaseEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.base; +package top.continew.starter.data.mf.base; import java.io.Serializable; diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermission.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermission.java similarity index 95% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermission.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermission.java index f8e2dbaf..977aa41a 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermission.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermission.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.datapermission; +package top.continew.starter.data.mf.datapermission; import java.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionAspect.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionAspect.java similarity index 96% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionAspect.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionAspect.java index f74c0860..b48a208a 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionAspect.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionAspect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.datapermission; +package top.continew.starter.data.mf.datapermission; import org.aspectj.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionCurrentUser.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionCurrentUser.java similarity index 97% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionCurrentUser.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionCurrentUser.java index 366b7b3e..b857f427 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionCurrentUser.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionCurrentUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.datapermission; +package top.continew.starter.data.mf.datapermission; import java.util.Set; diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionDialect.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionDialect.java similarity index 99% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionDialect.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionDialect.java index 1c696b16..579a4079 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionDialect.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionDialect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.datapermission; +package top.continew.starter.data.mf.datapermission; import cn.hutool.core.util.StrUtil; import com.mybatisflex.core.dialect.impl.CommonsDialectImpl; diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionFilter.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionFilter.java similarity index 94% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionFilter.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionFilter.java index e4fb0b19..1952c863 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionFilter.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataPermissionFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.datapermission; +package top.continew.starter.data.mf.datapermission; /** * 数据权限过滤器接口 diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataScope.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataScope.java similarity index 94% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataScope.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataScope.java index 3a137006..694c92c1 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataScope.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/datapermission/DataScope.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.datapermission; +package top.continew.starter.data.mf.datapermission; /** * 数据权限枚举 diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/service/IService.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/IService.java similarity index 93% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/service/IService.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/IService.java index 1643be77..1e328ab8 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/service/IService.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/IService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.service; +package top.continew.starter.data.mf.service; /** * 通用业务接口 diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/service/impl/ServiceImpl.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/impl/ServiceImpl.java similarity index 86% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/service/impl/ServiceImpl.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/impl/ServiceImpl.java index 0403d61b..326b172c 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/service/impl/ServiceImpl.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/impl/ServiceImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.service.impl; +package top.continew.starter.data.mf.service.impl; import top.continew.starter.core.util.ClassUtils; -import top.continew.starter.data.mybatis.flex.base.BaseMapper; -import top.continew.starter.data.mybatis.flex.service.IService; +import top.continew.starter.data.mf.base.BaseMapper; +import top.continew.starter.data.mf.service.IService; /** * 通用业务实现类 diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/util/QueryWrapperHelper.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java similarity index 99% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/util/QueryWrapperHelper.java rename to continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java index ba0fcf68..e51dc0d2 100644 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/util/QueryWrapperHelper.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.flex.util; +package top.continew.starter.data.mf.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.CharSequenceUtil; 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 new file mode 100644 index 00000000..138b056d --- /dev/null +++ b/continew-starter-data/continew-starter-data-mf/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +top.continew.starter.data.mf.autoconfigure.MybatisFlexAutoConfiguration \ No newline at end of file diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/resources/default-data-mybatis-flex.yml b/continew-starter-data/continew-starter-data-mf/src/main/resources/default-data-mybatis-flex.yml similarity index 100% rename from continew-starter-data/continew-starter-data-mybatis-flex/src/main/resources/default-data-mybatis-flex.yml rename to continew-starter-data/continew-starter-data-mf/src/main/resources/default-data-mybatis-flex.yml diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/pom.xml b/continew-starter-data/continew-starter-data-mp/pom.xml similarity index 96% rename from continew-starter-data/continew-starter-data-mybatis-plus/pom.xml rename to continew-starter-data/continew-starter-data-mp/pom.xml index f37d53bc..255247c7 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/pom.xml +++ b/continew-starter-data/continew-starter-data-mp/pom.xml @@ -9,7 +9,7 @@ ${revision} - continew-starter-data-mybatis-plus + continew-starter-data-mp ContiNew Starter 数据访问模块 - MyBatis Plus diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/ConditionalOnEnabledDataPermission.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/ConditionalOnEnabledDataPermission.java similarity index 94% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/ConditionalOnEnabledDataPermission.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/ConditionalOnEnabledDataPermission.java index 3873ace1..1639fabf 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/ConditionalOnEnabledDataPermission.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/ConditionalOnEnabledDataPermission.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.autoconfigure; +package top.continew.starter.data.mp.autoconfigure; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import top.continew.starter.core.constant.PropertiesConstants; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MyBatisPlusExtensionProperties.java similarity index 96% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MyBatisPlusExtensionProperties.java index a2d18df8..303db90f 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MyBatisPlusExtensionProperties.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.autoconfigure; +package top.continew.starter.data.mp.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.mybatis.plus.autoconfigure.idgenerator.MyBatisPlusIdGeneratorProperties; +import top.continew.starter.data.mp.autoconfigure.idgenerator.MyBatisPlusIdGeneratorProperties; /** * MyBatis Plus 扩展配置属性 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MybatisPlusAutoConfiguration.java similarity index 93% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MybatisPlusAutoConfiguration.java index 3f0c2d9e..5b81789a 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MybatisPlusAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.autoconfigure; +package top.continew.starter.data.mp.autoconfigure; import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusPropertiesCustomizer; @@ -38,10 +38,10 @@ 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.mybatis.plus.autoconfigure.idgenerator.MyBatisPlusIdGeneratorConfiguration; -import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; -import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionHandlerImpl; -import top.continew.starter.data.mybatis.plus.handler.MybatisBaseEnumTypeHandler; +import top.continew.starter.data.mp.autoconfigure.idgenerator.MyBatisPlusIdGeneratorConfiguration; +import top.continew.starter.data.mp.datapermission.DataPermissionFilter; +import top.continew.starter.data.mp.datapermission.DataPermissionHandlerImpl; +import top.continew.starter.data.mp.handler.MybatisBaseEnumTypeHandler; /** * MyBatis Plus 自动配置 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java similarity index 94% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java index ad3c1a8a..8a91fa44 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator; +package top.continew.starter.data.mp.autoconfigure.idgenerator; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import me.ahoo.cosid.snowflake.SnowflakeId; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java similarity index 97% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java index 3ecca0bf..31c9e0ee 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator; +package top.continew.starter.data.mp.autoconfigure.idgenerator; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java similarity index 87% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java index 63b9f60d..4519c7dc 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator; +package top.continew.starter.data.mp.autoconfigure.idgenerator; -import top.continew.starter.data.mybatis.plus.enums.MyBatisPlusIdGeneratorType; +import top.continew.starter.data.mp.enums.MyBatisPlusIdGeneratorType; /** * MyBatis ID 生成器配置属性 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/BaseMapper.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/base/BaseMapper.java similarity index 98% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/BaseMapper.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/base/BaseMapper.java index f4239e5b..1c5ad45c 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/BaseMapper.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/base/BaseMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.base; +package top.continew.starter.data.mp.base; import cn.hutool.core.util.ClassUtil; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermission.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermission.java similarity index 95% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermission.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermission.java index bbf0a659..06551af1 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermission.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermission.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.datapermission; +package top.continew.starter.data.mp.datapermission; import java.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionCurrentUser.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermissionCurrentUser.java similarity index 97% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionCurrentUser.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermissionCurrentUser.java index 18f0fad1..ebf4ef47 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionCurrentUser.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermissionCurrentUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.datapermission; +package top.continew.starter.data.mp.datapermission; import java.util.Set; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionFilter.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermissionFilter.java similarity index 94% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionFilter.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermissionFilter.java index 7e9dddec..062b7fd5 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionFilter.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermissionFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.datapermission; +package top.continew.starter.data.mp.datapermission; /** * 数据权限过滤器接口 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermissionHandlerImpl.java similarity index 99% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermissionHandlerImpl.java index b842512b..de8bcbdf 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataPermissionHandlerImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.datapermission; +package top.continew.starter.data.mp.datapermission; import cn.hutool.core.text.CharSequenceUtil; import com.baomidou.mybatisplus.core.toolkit.StringUtils; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataScope.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataScope.java similarity index 94% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataScope.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataScope.java index 7c48b339..5aa4333b 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataScope.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/datapermission/DataScope.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.datapermission; +package top.continew.starter.data.mp.datapermission; /** * 数据权限枚举 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/enums/MyBatisPlusIdGeneratorType.java similarity index 94% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/enums/MyBatisPlusIdGeneratorType.java index b7b100cd..eec60993 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/enums/MyBatisPlusIdGeneratorType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.enums; +package top.continew.starter.data.mp.enums; /** * MyBatis ID 生成器类型枚举 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/handler/MybatisBaseEnumTypeHandler.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/handler/MybatisBaseEnumTypeHandler.java similarity index 99% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/handler/MybatisBaseEnumTypeHandler.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/handler/MybatisBaseEnumTypeHandler.java index 59efabac..916679c1 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/handler/MybatisBaseEnumTypeHandler.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/handler/MybatisBaseEnumTypeHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.handler; +package top.continew.starter.data.mp.handler; import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.IEnum; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/IService.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/IService.java similarity index 93% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/IService.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/IService.java index 9a094911..d925dc51 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/IService.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/IService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.service; +package top.continew.starter.data.mp.service; /** * 通用业务接口 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java similarity index 91% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java index 63158108..8b93dfc9 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.service.impl; +package top.continew.starter.data.mp.service.impl; import cn.hutool.core.util.ClassUtil; import top.continew.starter.core.util.ReflectUtils; import top.continew.starter.core.util.validate.CheckUtils; -import top.continew.starter.data.mybatis.plus.base.BaseMapper; -import top.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mp.service.IService; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/util/QueryWrapperHelper.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java similarity index 99% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/util/QueryWrapperHelper.java rename to continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java index fbe48ed7..bffb0ef4 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/util/QueryWrapperHelper.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.data.mybatis.plus.util; +package top.continew.starter.data.mp.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 new file mode 100644 index 00000000..b04af5fe --- /dev/null +++ b/continew-starter-data/continew-starter-data-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +top.continew.starter.data.mp.autoconfigure.MybatisPlusAutoConfiguration \ No newline at end of file diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/default-data-mybatis-plus.yml b/continew-starter-data/continew-starter-data-mp/src/main/resources/default-data-mybatis-plus.yml similarity index 100% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/default-data-mybatis-plus.yml rename to continew-starter-data/continew-starter-data-mp/src/main/resources/default-data-mybatis-plus.yml diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/spy.properties b/continew-starter-data/continew-starter-data-mp/src/main/resources/spy.properties similarity index 100% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/spy.properties rename to continew-starter-data/continew-starter-data-mp/src/main/resources/spy.properties diff --git a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 650a0cf7..00000000 --- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -top.continew.starter.data.mybatis.flex.autoconfigure.MybatisFlexAutoConfiguration \ No newline at end of file diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 4e24a969..00000000 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -top.continew.starter.data.mybatis.plus.autoconfigure.MybatisPlusAutoConfiguration \ No newline at end of file diff --git a/continew-starter-data/pom.xml b/continew-starter-data/pom.xml index 59107d9c..8822500c 100644 --- a/continew-starter-data/pom.xml +++ b/continew-starter-data/pom.xml @@ -15,8 +15,8 @@ continew-starter-data-core - continew-starter-data-mybatis-plus - continew-starter-data-mybatis-flex + continew-starter-data-mp + continew-starter-data-mf diff --git a/continew-starter-dependencies/pom.xml b/continew-starter-dependencies/pom.xml index aecb8b5b..ff4d6309 100644 --- a/continew-starter-dependencies/pom.xml +++ b/continew-starter-dependencies/pom.xml @@ -373,14 +373,14 @@ top.continew - continew-starter-data-mybatis-plus + continew-starter-data-mp ${revision} top.continew - continew-starter-data-mybatis-flex + continew-starter-data-mf ${revision} diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/pom.xml b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/pom.xml index 8c5c25da..c215c212 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/pom.xml +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/pom.xml @@ -22,7 +22,7 @@ top.continew - continew-starter-data-mybatis-flex + continew-starter-data-mf \ No newline at end of file diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java index 34a5e8a3..f51d7493 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java @@ -33,9 +33,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.validate.ValidationUtils; -import top.continew.starter.data.mybatis.flex.base.BaseMapper; -import top.continew.starter.data.mybatis.flex.util.QueryWrapperHelper; -import top.continew.starter.data.mybatis.flex.service.impl.ServiceImpl; +import top.continew.starter.data.mf.base.BaseMapper; +import top.continew.starter.data.mf.util.QueryWrapperHelper; +import top.continew.starter.data.mf.service.impl.ServiceImpl; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.query.SortQuery; diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/pom.xml b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/pom.xml index a014c12c..67738e37 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/pom.xml +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/pom.xml @@ -22,7 +22,7 @@ top.continew - continew-starter-data-mybatis-plus + continew-starter-data-mp \ No newline at end of file diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java index 9e955632..0919e0f5 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java @@ -37,9 +37,9 @@ import top.continew.starter.core.util.ClassUtils; import top.continew.starter.core.util.ReflectUtils; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.core.util.validate.ValidationUtils; -import top.continew.starter.data.mybatis.plus.base.BaseMapper; -import top.continew.starter.data.mybatis.plus.service.impl.ServiceImpl; -import top.continew.starter.data.mybatis.plus.util.QueryWrapperHelper; +import top.continew.starter.data.mp.base.BaseMapper; +import top.continew.starter.data.mp.service.impl.ServiceImpl; +import top.continew.starter.data.mp.util.QueryWrapperHelper; import top.continew.starter.extension.crud.annotation.DictField; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.extension.crud.model.entity.BaseIdDO;