调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration

wangzhs
1 parent ef510f94
Showing 2 changed files with 7 additions and 19 deletions
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/MybatisPlusJoinConfiguration.java
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java
-package cn.iocoder.yudao.framework.mybatis.config;
-
-import com.baomidou.mybatisplus.core.injector.AbstractMethod;
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import icu.mhb.mybatisplus.plugln.injector.JoinDefaultSqlInjector;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.List;
-
-// TODO @升平：是不是作为 YudaoMybatisAutoConfiguration 的 bean 即可呀？然后 getMethodList 不用重写
-@Configuration
-public class MybatisPlusJoinConfiguration extends JoinDefaultSqlInjector {
-
-    @Override
-    public List<AbstractMethod> getMethodList(Class<?> mapperClass, TableInfo tableInfo) {
-        return super.getMethodList(mapperClass, tableInfo);
-    }
-
-}
@@ -5,12 +5,14 @@ import cn.iocoder.yudao.framework.mybatis.core.handler.DefaultDBFieldHandler;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
+import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
 import com.baomidou.mybatisplus.extension.incrementer.H2KeyGenerator;
 import com.baomidou.mybatisplus.extension.incrementer.KingbaseKeyGenerator;
 import com.baomidou.mybatisplus.extension.incrementer.OracleKeyGenerator;
 import com.baomidou.mybatisplus.extension.incrementer.PostgreKeyGenerator;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import icu.mhb.mybatisplus.plugln.injector.JoinDefaultSqlInjector;
 import org.apache.ibatis.annotations.Mapper;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -41,6 +43,11 @@ public class YudaoMybatisAutoConfiguration {
     }
     @Bean
+    public DefaultSqlInjector defaultSqlInjector() {
+        return new JoinDefaultSqlInjector(); // 使用Mybaits Plus Join定义的SQL注入器
+    }
+
+    @Bean
     @ConditionalOnProperty(prefix = "mybatis-plus.global-config.db-config", name = "id-type", havingValue = "INPUT")
     public IKeyGenerator keyGenerator(ConfigurableEnvironment environment) {
         DbType dbType = IdTypeEnvironmentPostProcessor.getDbType(environment);