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

This commit is contained in:
2025-07-04 21:15:28 +08:00
parent 78a7904c2f
commit 223236aad3
59 changed files with 105 additions and 107 deletions

View File

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

View File

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

View File

@@ -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;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.continew.starter.data.core.enums;
package top.continew.starter.data.enums;
/**
* 查询类型枚举

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

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

View File

@@ -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;

View File

@@ -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;

View File

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

View File

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

View File

@@ -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;

View File

@@ -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;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.continew.starter.data.mf.datapermission;
package top.continew.starter.data.datapermission;
/**
* 数据权限过滤器接口

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.continew.starter.data.mf.datapermission;
package top.continew.starter.data.datapermission;
/**
* 数据权限枚举

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.continew.starter.data.mf.service;
package top.continew.starter.data.service;
/**
* 通用业务接口

View File

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

View File

@@ -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;

View File

@@ -1 +1 @@
top.continew.starter.data.mf.autoconfigure.MybatisFlexAutoConfiguration
top.continew.starter.data.autoconfigure.MybatisFlexAutoConfiguration

View File

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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

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

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.continew.starter.data.mp.enums;
package top.continew.starter.data.enums;
/**
* MyBatis ID 生成器类型枚举

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1 +1 @@
top.continew.starter.data.mp.autoconfigure.MybatisPlusAutoConfiguration
top.continew.starter.data.autoconfigure.MybatisPlusAutoConfiguration

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.continew.license.model;
package top.continew.starter.license.model;
import net.lingala.zip4j.ZipFile;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.continew.license.model;
package top.continew.starter.license.model;
/**
* config参数

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.continew.license.model;
package top.continew.starter.license.model;
import de.schlichtherle.license.AbstractKeyStoreParam;

View File

@@ -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;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.continew.license.model;
package top.continew.starter.license.model;
import java.util.Date;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.continew.license.model;
package top.continew.starter.license.model;
import java.util.Set;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;
/**

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1 +1 @@
top.continew.license.autoconfigure.LicenseGenerateAutoConfiguration
top.continew.starter.license.autoconfigure.LicenseGenerateAutoConfiguration

View File

@@ -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;
/**

View File

@@ -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;

View File

@@ -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;

View File

@@ -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

View File

@@ -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;

View File

@@ -1 +1 @@
top.continew.license.autoconfigure.LicenseVerifyAutoConfiguration
top.continew.starter.license.autoconfigure.LicenseVerifyAutoConfiguration