diff --git a/pom.xml b/pom.xml index 7f35ead6b5a98d651daf6ac30d2441f71b6df7fe..cd6dd11babcc6f9cf0ab52ade4b77fc54a5e2957 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 3.9.1 1.6.2 4.6.1 - 3.1.2 + 3.2.0 3.4.2 7.2.18 4.1.0 diff --git a/zlt-commons/zlt-db-spring-boot-starter/src/main/java/com/central/db/config/DefaultMybatisPlusConfig.java b/zlt-commons/zlt-db-spring-boot-starter/src/main/java/com/central/db/config/DefaultMybatisPlusConfig.java index 91f49190f6a855b501ee48d3246a3f969b101b7f..65946940fce1c09a56f5a3fd58e45dcc1ef6da00 100644 --- a/zlt-commons/zlt-db-spring-boot-starter/src/main/java/com/central/db/config/DefaultMybatisPlusConfig.java +++ b/zlt-commons/zlt-db-spring-boot-starter/src/main/java/com/central/db/config/DefaultMybatisPlusConfig.java @@ -3,7 +3,6 @@ package com.central.db.config; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.parser.ISqlParserFilter; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; -import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser; @@ -45,14 +44,4 @@ public class DefaultMybatisPlusConfig { } return paginationInterceptor; } - - /** - * 打印 sql,性能分析拦截器,不建议生产使用 - * 设置 dev test 环境开启 - */ - @Bean - @Profile({"dev","test"}) - public PerformanceInterceptor performanceInterceptor() { - return new PerformanceInterceptor(); - } } diff --git a/zlt-commons/zlt-db-spring-boot-starter/src/main/java/com/central/db/config/TenantAutoConfigure.java b/zlt-commons/zlt-db-spring-boot-starter/src/main/java/com/central/db/config/TenantAutoConfigure.java index 54322c3c3ef50d9180bb590a6fba91998b536b68..40f38d6efbc6401beae62f65eef9e9b61f327998 100644 --- a/zlt-commons/zlt-db-spring-boot-starter/src/main/java/com/central/db/config/TenantAutoConfigure.java +++ b/zlt-commons/zlt-db-spring-boot-starter/src/main/java/com/central/db/config/TenantAutoConfigure.java @@ -31,7 +31,7 @@ public class TenantAutoConfigure { * 获取租户id */ @Override - public Expression getTenantId() { + public Expression getTenantId(boolean where) { String tenant = TenantContextHolder.getTenant(); if (tenant != null) { return new StringValue(TenantContextHolder.getTenant()); diff --git a/zlt-config/src/main/resources/application-dev.properties b/zlt-config/src/main/resources/application-dev.properties index 574760ef296240fb156823374ee5f2e1ab15352e..1ad980e989d95ac0220a235a999ee9f1d373cc9b 100644 --- a/zlt-config/src/main/resources/application-dev.properties +++ b/zlt-config/src/main/resources/application-dev.properties @@ -24,4 +24,7 @@ zlt.fdfs.trackerList=${zlt.fdfs.web-url}:22122 zlt.trace.enable=true ##### 负载均衡隔离(version隔离,只适用于开发环境) -zlt.ribbon.isolation.enabled=true \ No newline at end of file +zlt.ribbon.isolation.enabled=true + +##### mybatis-plus打印完整sql(只适用于开发环境) +mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file