diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml
index ec9e3cb5..81a2aafb 100644
--- a/continew-admin-common/pom.xml
+++ b/continew-admin-common/pom.xml
@@ -17,24 +17,30 @@
公共模块（存放公共工具类，公共配置等）
-
+
top.charles7c.continew
- continew-starter-api-doc
+ continew-starter-data-mybatis-plus
-
+
top.charles7c.continew
continew-starter-cache-redisson
-
+
top.charles7c.continew
continew-starter-json-jackson
+
+
+ top.charles7c.continew
+ continew-starter-api-doc
+
+
@@ -66,31 +72,12 @@
sa-token-jwt
-
-
-
- com.baomidou
- mybatis-plus-spring-boot3-starter
-
-
-
-
- com.baomidou
- dynamic-datasource-spring-boot3-starter
-
-
com.mysql
mysql-connector-j
-
-
- p6spy
- p6spy
-
-
diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MybatisPlusConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MybatisPlusConfiguration.java
index ba4a5629..3fbf1ca1 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MybatisPlusConfiguration.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MybatisPlusConfiguration.java
@@ -38,26 +38,8 @@ import cn.hutool.core.net.NetUtil;
* @since 2022/12/22 19:51
*/
@Configuration
-@MapperScan("${mybatis-plus.mapper-package}")
public class MybatisPlusConfiguration {
- /**
- * 插件配置
- *
- * @return /
- */
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor() {
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- // 数据权限插件
- interceptor.addInnerInterceptor(new DataPermissionInterceptor(new DataPermissionHandlerImpl()));
- // 分页插件
- interceptor.addInnerInterceptor(paginationInnerInterceptor());
- // 防全表更新与删除插件
- interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
- return interceptor;
- }
-
/**
* 元对象处理器配置（插入或修改时自动填充）
*/
@@ -65,26 +47,4 @@ public class MybatisPlusConfiguration {
public MetaObjectHandler metaObjectHandler() {
return new MyBatisPlusMetaObjectHandler();
}
-
- /**
- * ID 生成器配置，仅在主键类型（idType）配置为 ASSIGN_ID 或 ASSIGN_UUID 时有效（使用网卡信息绑定雪花生成器，防止集群雪花 ID 重复）
- */
- @Bean
- public IdentifierGenerator idGenerator() {
- return new DefaultIdentifierGenerator(NetUtil.getLocalhost());
- }
-
- /**
- * 分页插件配置（...）
- */
- private PaginationInnerInterceptor paginationInnerInterceptor() {
- // 对于单一数据库类型来说，都建议配置该值，避免每次分页都去抓取数据库类型
- // PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
- PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(DbType.MYSQL);
- // 溢出总页数后是否进行处理，默认不处理
- paginationInnerInterceptor.setOverflow(false);
- // 单页分页条数限制，默认无限制
- paginationInnerInterceptor.setMaxLimit(-1L);
- return paginationInnerInterceptor;
- }
}
diff --git a/continew-admin-webapi/src/main/resources/config/application.yml b/continew-admin-webapi/src/main/resources/config/application.yml
index e8ca6fcb..738b4422 100644
--- a/continew-admin-webapi/src/main/resources/config/application.yml
+++ b/continew-admin-webapi/src/main/resources/config/application.yml
@@ -120,9 +120,6 @@ sa-token:
--- ### MyBatis Plus 配置
mybatis-plus:
- # Mapper 接口扫描包配置（该配置为自定义配置，非 MP 配置，不支持多包，如有需要可通过注解配置或提升扫描包层级）
- # 该配置目前的唯一使用场景为：@MapperScan("${mybatis-plus.mapper-package}")
- mapper-package: ${project.basePackage}.**.mapper
# Mapper XML 文件目录配置
mapper-locations: classpath*:/mapper/**/*Mapper.xml
# 类型别名扫描包配置
@@ -154,6 +151,17 @@ mybatis-plus:
logic-delete-value: 1
# 逻辑未删除全局值（默认 0，表示未删除）
logic-not-delete-value: 0
+ ## 扩展配置
+ extension:
+ enabled: true
+ # Mapper 接口扫描包配置
+ mapper-package: ${project.basePackage}.**.mapper
+ # 数据权限实现
+ data-permission-handler-impl: top.charles7c.cnadmin.common.config.mybatis.DataPermissionHandlerImpl
+ # 分页插件配置
+ pagination:
+ enabled: true
+ db-type: mysql
--- ### 服务器配置
server:
diff --git a/continew-admin-webapi/src/main/resources/spy.properties b/continew-admin-webapi/src/main/resources/spy.properties
deleted file mode 100644
index ec1e289b..00000000
--- a/continew-admin-webapi/src/main/resources/spy.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-# P6Spy 配置（SQL 性能分析组件） #
-############################################################################
-modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
-# 自定义日志打印
-logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
-#日志输出到控制台
-appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
-# 使用日志系统记录 SQL
-#appender=com.p6spy.engine.spy.appender.Slf4JLogger
-# 设置 P6Spy Driver 代理
-deregisterdrivers=true
-# 取消 JDBC URL 前缀
-useprefix=true
-# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
-excludecategories=info,debug,result,commit,resultset
-# 日期格式
-dateformat=yyyy-MM-dd HH:mm:ss
-# SQL语句打印时间格式
-databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss
-# 实际驱动可多个
-#driverlist=org.h2.Driver
-# 是否启用慢 SQL 记录
-outagedetection=true
-# 慢 SQL 记录标准 2 秒
-outagedetectioninterval=2
-# 是否过滤 Log
-filter=true
-# 过滤 Log 时所排除的 SQL 关键字，以逗号分隔
-exclude=SELECT 1
diff --git a/pom.xml b/pom.xml
index ceb471fe..ca89902c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,6 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
+
top.charles7c.continew
continew-starter
@@ -30,11 +33,6 @@
2.1.0-SNAPSHOT
1.37.0
-
- 3.5.4
- 4.2.0
- 3.9.1
-
3.0.4
1.16.5
@@ -71,28 +69,6 @@
-
-
-
- com.baomidou
- mybatis-plus-spring-boot3-starter
- ${mybatis-plus.version}
-
-
-
-
- com.baomidou
- dynamic-datasource-spring-boot3-starter
- ${dynamic-ds.version}
-
-
-
-
- p6spy
- p6spy
- ${p6spy.version}
-
-