feat: mybatis plus plugin update (#890)

* refactor: update es and upgrade file * fix: Fixed the issue of reading a large number of files OOM and upgraded the ES version * refactor: update compile jdk version * refactor: update file coll * refactor: mybatis plus plugin supported page
XiaoMi · Sep 3, 2024 · 82c2441 · 82c2441
1 parent bd03aa7
commit 82c2441
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...tion/src/main/java/com/xiaomi/youpin/docean/plugin/configuration/ConfigurationPlugin.java b/...tion/src/main/java/com/xiaomi/youpin/docean/plugin/configuration/ConfigurationPlugin.java
@@ -38,7 +38,7 @@
  * @author shanwb
  * @date 2022-09-13
  */
-@DOceanPlugin(order = Integer.MAX_VALUE)
+@DOceanPlugin(order = Integer.MAX_VALUE - 2)
 @Slf4j
 public class ConfigurationPlugin implements IPlugin {
 

diff --git a/...mybatis-plus/src/main/java/com/xiaomi/youpin/docean/plugin/mybatisplus/MybatisPlugin.java b/...mybatis-plus/src/main/java/com/xiaomi/youpin/docean/plugin/mybatisplus/MybatisPlugin.java
@@ -16,6 +16,7 @@
 
 package com.xiaomi.youpin.docean.plugin.mybatisplus;
 
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.xiaomi.youpin.docean.Aop;
 import com.xiaomi.youpin.docean.Ioc;
 import com.xiaomi.youpin.docean.anno.DOceanPlugin;
@@ -33,6 +34,7 @@
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.util.CollectionUtils;
 
 import javax.sql.DataSource;
 import java.lang.reflect.InvocationHandler;
@@ -47,7 +49,7 @@
 /**
  * @author [email protected]
  */
-@DOceanPlugin
+@DOceanPlugin(order = Integer.MAX_VALUE - 1)
 @Slf4j
 public class MybatisPlugin implements IPlugin {
 
@@ -93,6 +95,11 @@ private void addDAO(Ioc ioc, String beanName, String mapperLocation, boolean one
                 bean.setPlugins(new Interceptor[]{interceptor});
             }
 
+            Set<MybatisPlusInterceptor> plusInterceptors = ioc.getBeans(MybatisPlusInterceptor.class);
+            if (!CollectionUtils.isEmpty(plusInterceptors)) {
+                bean.setPlugins(plusInterceptors.toArray(new Interceptor[]{}));
+            }
+
             SqlSessionFactory factory = bean.buildSqlSessionFactory();
 
             ioc.putBean("mybatis_" + beanName + config.getName(), factory);