From 70f4a9fb4530cca281dcc8bc9804badbf42a1d6d Mon Sep 17 00:00:00 2001
From: ZhouXY108 <luquanlion@outlook.com>
Date: Thu, 8 Dec 2022 18:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20MybatisUtil=20=E7=9A=84?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=8C=E5=B9=B6=E6=9B=B4=E5=90=8D=E4=B8=BA?=
 =?UTF-8?q?=20MyBatisContextUtil=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/MyBatisAutoConfiguration.java     | 17 -----------
 .../plusone/mybatis/MyBatisContextUtil.java   | 16 +++++++++++
 .../plusone/mybatis/MyBatisPlusConfig.java    |  2 +-
 .../zhouxy/plusone/mybatis/MybatisUtil.java   | 28 -------------------
 4 files changed, 17 insertions(+), 46 deletions(-)
 delete mode 100644 plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisAutoConfiguration.java
 create mode 100644 plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisContextUtil.java
 delete mode 100644 plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MybatisUtil.java

diff --git a/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisAutoConfiguration.java b/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisAutoConfiguration.java
deleted file mode 100644
index 2191a44..0000000
--- a/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisAutoConfiguration.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package xyz.zhouxy.plusone.mybatis;
-
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@EnableAutoConfiguration
-public class MyBatisAutoConfiguration {
-
-    @Bean
-    MybatisUtil mybatisUtil(SqlSessionFactory sqlSessionFactory) {
-        return MybatisUtil.getInstance()
-                .setSqlSessionFactory(sqlSessionFactory);
-    }
-}
diff --git a/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisContextUtil.java b/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisContextUtil.java
new file mode 100644
index 0000000..994d281
--- /dev/null
+++ b/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisContextUtil.java
@@ -0,0 +1,16 @@
+package xyz.zhouxy.plusone.mybatis;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+
+import xyz.zhouxy.plusone.spring.SpringContextHolder;
+
+public final class MyBatisContextUtil {
+
+    private MyBatisContextUtil() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static SqlSessionFactory getSqlSessionFactory() {
+        return SpringContextHolder.getContext().getBean(SqlSessionFactory.class);
+    }
+}
diff --git a/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisPlusConfig.java b/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisPlusConfig.java
index 0ba5c2c..fb7cf82 100644
--- a/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisPlusConfig.java
+++ b/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MyBatisPlusConfig.java
@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class MyBatisPlusConfig {
     @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+    MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
         interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
diff --git a/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MybatisUtil.java b/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MybatisUtil.java
deleted file mode 100644
index 7a33ff5..0000000
--- a/plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/mybatis/MybatisUtil.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package xyz.zhouxy.plusone.mybatis;
-
-import org.apache.ibatis.session.SqlSessionFactory;
-
-public final class MybatisUtil {
-
-    private SqlSessionFactory sqlSessionFactory;
-
-    private MybatisUtil() {
-    }
-
-    MybatisUtil setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
-        this.sqlSessionFactory = sqlSessionFactory;
-        return this;
-    }
-
-    private static final class Holder {
-        private static final MybatisUtil INSTANCE = new MybatisUtil();
-    }
-
-    public static MybatisUtil getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    public static SqlSessionFactory getSqlSessionFactory() {
-        return MybatisUtil.getInstance().sqlSessionFactory;
-    }
-}