From 8768c8bd908711e2ed52792db07238a669cba612 Mon Sep 17 00:00:00 2001
From: zlt <zltdiablo@163.com>
Date: Tue, 19 Nov 2019 13:12:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20mybatis-plus=20=E5=88=B0?=
 =?UTF-8?q?=203.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               |  2 +-
 .../central/db/config/DefaultMybatisPlusConfig.java   | 11 -----------
 .../com/central/db/config/TenantAutoConfigure.java    |  2 +-
 .../src/main/resources/application-dev.properties     |  5 ++++-
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7f35ead..cd6dd11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <redisson.version>3.9.1</redisson.version>
         <easyCaptcha.version>1.6.2</easyCaptcha.version>
         <hutool.version>4.6.1</hutool.version>
-        <mybatis-plus-boot-starter.version>3.1.2</mybatis-plus-boot-starter.version>
+        <mybatis-plus-boot-starter.version>3.2.0</mybatis-plus-boot-starter.version>
         <aliyun-sdk-oss>3.4.2</aliyun-sdk-oss>
         <qiniu-java-sdk>7.2.18</qiniu-java-sdk>
         <easypoi.version>4.1.0</easypoi.version>
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 91f4919..6594694 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 54322c3..40f38d6 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 574760e..1ad980e 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
-- 
GitLab