2.2.1 RELEASE

Author: zhangrongfan

README.md

@@ -21,14 +21,14 @@ Maven:
 <dependency>
     <groupId>cn.mybatisboost</groupId>
     <artifactId>mybatis-boost-spring-boot-starter</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
 </dependency>
 ```
 
 Gradle:
 ```gradle
 compile 'org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2'
-compile 'cn.mybatisboost:mybatis-boost-spring-boot-starter:2.2.0'
+compile 'cn.mybatisboost:mybatis-boost-spring-boot-starter:2.2.1'
 ```
 
 在手动创建SqlSessionFactory Bean的情况下，请确保MybatisBoost的Mybatis Plugin有被加载。

mybatis-boost-core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>2.2.0</version>
+        <version>2.2.1</version>
     </parent>
 
     <artifactId>mybatis-boost-core</artifactId>

mybatis-boost-spring-boot-autoconfigure/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>2.2.0</version>
+        <version>2.2.1</version>
     </parent>
 
     <artifactId>mybatis-boost-spring-boot-autoconfigure</artifactId>

mybatis-boost-spring-boot-autoconfigure/src/main/java/cn/mybatisboost/spring/boot/autoconfigure/JsonConfiguration.java

@@ -5,11 +5,14 @@
 import cn.mybatisboost.core.preprocessor.AutoParameterMappingPreprocessor;
 import cn.mybatisboost.core.preprocessor.MybatisCacheRemovingPreprocessor;
 import cn.mybatisboost.core.preprocessor.ParameterNormalizationPreprocessor;
+import cn.mybatisboost.json.JsonResultSetsHandler;
+import cn.mybatisboost.json.JsonTypeHandler;
 import cn.mybatisboost.lang.LanguageSqlProvider;
 import cn.mybatisboost.limiter.LimiterSqlProvider;
 import cn.mybatisboost.mapper.MapperSqlProvider;
 import cn.mybatisboost.metric.MetricInterceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.boot.autoconfigure.ConfigurationCustomizer;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -22,7 +25,7 @@
 @ConditionalOnClass(SqlSessionFactory.class)
 @Configuration
 @EnableConfigurationProperties(MybatisBoostProperties.class)
-@Import({NosqlConfiguration.class, JsonConfiguration.class})
+@Import(NosqlConfiguration.class)
 public class MybatisBoostAutoConfiguration {
 
     private final MybatisBoostProperties properties;
@@ -85,4 +88,20 @@ public DispatcherInterceptor mybatisBoostInterceptor(cn.mybatisboost.core.Config
         }
         return dispatcherInterceptor;
     }
+
+    @ConditionalOnClass(ConfigurationCustomizer.class)
+    @ConditionalOnProperty(name = "mybatisboost.json.enabled", matchIfMissing = true)
+    @Configuration
+    public static class JsonConfiguration implements ConfigurationCustomizer {
+
+        @Bean
+        public JsonResultSetsHandler jsonInterceptor() {
+            return new JsonResultSetsHandler();
+        }
+
+        @Override
+        public void customize(org.apache.ibatis.session.Configuration configuration) {
+            configuration.getTypeHandlerRegistry().register(JsonTypeHandler.class);
+        }
+    }
 }

mybatis-boost-spring-boot-autoconfigure/src/main/java/cn/mybatisboost/spring/boot/autoconfigure/MybatisBoostAutoConfiguration.java

@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>2.2.0</version>
+        <version>2.2.1</version>
     </parent>
 
     <artifactId>mybatis-boost-spring-boot-starter</artifactId>

mybatis-boost-spring-boot-starter/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>2.2.0</version>
+        <version>2.2.1</version>
     </parent>
 
     <artifactId>mybatis-boost-test</artifactId>

mybatis-boost-test/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cn.mybatisboost</groupId>
     <artifactId>mybatis-boost</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <packaging>pom</packaging>
 
     <name>MybatisBoost</name>