chore: 简化 package，对于互斥包不再单独命名，例如：data.mp、data.mf，统一为 data

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

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

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;
 

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;
 
 /**
  * 查询类型枚举

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;
 

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;

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;

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;

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;

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 自动配置

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;

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;
 

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

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

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;
 

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;

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;
 
 /**
  * 数据权限过滤器接口

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;
 
 /**
  * 数据权限枚举

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;
 
 /**
  * 通用业务接口

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;
 
 /**
  * 通用业务实现类

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;

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
+top.continew.starter.data.autoconfigure.MybatisFlexAutoConfiguration

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 扩展配置属性

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;
 

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;

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;

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 生成器配置属性

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 生成器类型枚举

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;

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;

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;

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;
 

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;

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;

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
+top.continew.starter.data.autoconfigure.MybatisPlusAutoConfiguration