diff --git a/README.md b/README.md index 2b43e55..dc88793 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
-
+
diff --git a/blade-starter-mybatis/src/main/java/org/springblade/core/mp/config/MybatisPlusConfiguration.java b/blade-starter-mybatis/src/main/java/org/springblade/core/mp/config/MybatisPlusConfiguration.java
index f208bd1..ca3776c 100644
--- a/blade-starter-mybatis/src/main/java/org/springblade/core/mp/config/MybatisPlusConfiguration.java
+++ b/blade-starter-mybatis/src/main/java/org/springblade/core/mp/config/MybatisPlusConfiguration.java
@@ -27,7 +27,7 @@ import org.apache.ibatis.logging.Log;
import org.apache.ibatis.logging.nologging.NoLoggingImpl;
import org.mybatis.spring.annotation.MapperScan;
import org.springblade.core.mp.intercept.QueryInterceptor;
-import org.springblade.core.mp.logger.SqlLogFilter;
+import org.springblade.core.mp.plugins.SqlLogInterceptor;
import org.springblade.core.mp.plugins.BladePaginationInterceptor;
import org.springblade.core.mp.props.MybatisPlusProperties;
import org.springblade.core.secure.utils.SecureUtil;
@@ -105,8 +105,8 @@ public class MybatisPlusConfiguration {
*/
@Bean
@ConditionalOnProperty(value = "blade.mybatis-plus.sql-log", matchIfMissing = true)
- public SqlLogFilter sqlLogFilter(MybatisPlusProperties properties) {
- return new SqlLogFilter(properties);
+ public SqlLogInterceptor sqlLogInterceptor(MybatisPlusProperties properties) {
+ return new SqlLogInterceptor(properties);
}
/**
@@ -117,9 +117,11 @@ public class MybatisPlusConfiguration {
public MybatisPlusPropertiesCustomizer mybatisPlusPropertiesCustomizer() {
return properties -> {
CoreConfiguration configuration = properties.getConfiguration();
- Class extends Log> logImpl = configuration.getLogImpl();
- if (logImpl == null) {
- configuration.setLogImpl(NoLoggingImpl.class);
+ if (configuration != null) {
+ Class extends Log> logImpl = configuration.getLogImpl();
+ if (logImpl == null) {
+ configuration.setLogImpl(NoLoggingImpl.class);
+ }
}
};
}
diff --git a/blade-starter-mybatis/src/main/java/org/springblade/core/mp/logger/SqlLogFilter.java b/blade-starter-mybatis/src/main/java/org/springblade/core/mp/plugins/SqlLogInterceptor.java
similarity index 97%
rename from blade-starter-mybatis/src/main/java/org/springblade/core/mp/logger/SqlLogFilter.java
rename to blade-starter-mybatis/src/main/java/org/springblade/core/mp/plugins/SqlLogInterceptor.java
index 323b44f..342cbd7 100644
--- a/blade-starter-mybatis/src/main/java/org/springblade/core/mp/logger/SqlLogFilter.java
+++ b/blade-starter-mybatis/src/main/java/org/springblade/core/mp/plugins/SqlLogInterceptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springblade.core.mp.logger;
+package org.springblade.core.mp.plugins;
import com.alibaba.druid.DbType;
import com.alibaba.druid.filter.FilterChain;
@@ -45,7 +45,7 @@ import java.util.List;
*/
@Slf4j
@RequiredArgsConstructor
-public class SqlLogFilter extends FilterEventAdapter {
+public class SqlLogInterceptor extends FilterEventAdapter {
private static final SQLUtils.FormatOption FORMAT_OPTION = new SQLUtils.FormatOption(false, false);
private final MybatisPlusProperties properties;
diff --git a/pom.xml b/pom.xml
index dd60812..2f25c56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@