From 7db13fd882cfe8cffcd4367c4e654892e2db0968 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 26 Jun 2024 15:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MybatisPlusJoinAutoConfiguration.java         | 15 +++++++++++++--
 .../github/yulichang/adapter/AdapterHelper.java   |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index a7c4c3c..2df8780 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -135,8 +136,8 @@ public class MybatisPlusJoinAutoConfiguration {
         }
     }
 
-    private void info(String info) {
-        if (properties.getBanner()) {
+    private static void info(String info) {
+        if (ConfigProperties.banner) {
             logger.info(info);
         }
     }
@@ -175,6 +176,16 @@ public class MybatisPlusJoinAutoConfiguration {
         public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
             this.listableBeanFactory = beanFactory;
             SpringContentUtils.setSpringContext(this);
+
+            try {
+                String[] names = beanFactory.getBeanNamesForType(SqlSessionFactory.class);
+                for (String name : names) {
+                    BeanDefinition definition = beanFactory.getBeanDefinition(name);
+                    info(String.format("MPJ SqlSessionFactory bean definition: %s factoryBeanName: %s factoryMethodName: %s source: %s",
+                            name, definition.getFactoryBeanName(), definition.getFactoryMethodName(), definition.getSource()));
+                }
+            } catch (Exception ignore) {
+            }
         }
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java
index 0695e61..c697c1f 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java
@@ -23,7 +23,7 @@ public class AdapterHelper {
 
     static {
         String lastAdapter = "3.5.7";
-        String version = Optional.of(MybatisPlusVersion.getVersion()).orElse(lastAdapter);
+        String version = Optional.ofNullable(MybatisPlusVersion.getVersion()).orElse(lastAdapter);
 
         if (VersionUtils.compare(version, "3.5.6") >= 0) {
             adapter = new Adapter();