Commit 7e0fb6cb56901e6c0820c428784231e26acb4595

Authored by wangzhs
1 parent ef510f94

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

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