兼容 spring boot 2.6.0

mybatis-mapper · Dec 12, 2021 · dbcb80a · dbcb80a
1 parent 5d00353
commit dbcb80a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/...va/io/mybatis/activerecord/spring/boot/autoconfigure/MapperProviderAutoConfiguration.java b/...va/io/mybatis/activerecord/spring/boot/autoconfigure/MapperProviderAutoConfiguration.java
@@ -18,7 +18,7 @@
 
 import io.mybatis.activerecord.spring.MapperProvider;
 import org.mybatis.spring.SqlSessionTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -53,12 +53,19 @@ public MapperProvider springMapperRegistry(SqlSessionTemplate sqlSessionTemplate
    * 自动注册为默认的 Mapper 提供者
    * <p>
    * 当使用多数据源时，需要通过 {@link org.springframework.context.annotation.Primary} 注解指定主要的默认的 {@link MapperProvider}
-   *
-   * @param mapperProvider
    */
-  @Autowired
-  public void registerDefaultSpringMapperRegistry(MapperProvider mapperProvider) {
-    mapperProvider.registerAsDefault();
+  @Configuration
+  public static class AutoRegisterConfiguration implements InitializingBean {
+    private final MapperProvider mapperProvider;
+
+    public AutoRegisterConfiguration(MapperProvider mapperProvider) {
+      this.mapperProvider = mapperProvider;
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+      mapperProvider.registerAsDefault();
+    }
   }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
   </modules>
 
   <properties>
-    <revision>1.0.3</revision>
+    <revision>1.0.4</revision>
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -72,8 +72,8 @@
     <mybatis-spring.version>2.0.6</mybatis-spring.version>
     <mybatis-spring-boot.version>2.2.0</mybatis-spring-boot.version>
 
-    <springframework.version>5.3.9</springframework.version>
-    <springboot.version>2.5.3</springboot.version>
+    <springframework.version>5.3.13</springframework.version>
+    <springboot.version>2.6.1</springboot.version>
 
     <log4j.version>1.2.17</log4j.version>
     <junit.version>4.13</junit.version>