🎨 适配重构后的mybatis-pageable

Author: hengboy

api-boot-project/api-boot-autoconfigure/pom.xml

@@ -88,8 +88,8 @@
 
         <!--MinBox Dependencies-->
         <dependency>
-            <groupId>com.gitee.hengboy</groupId>
-            <artifactId>mybatis-pageable-core</artifactId>
+            <groupId>org.minbox.framework</groupId>
+            <artifactId>mybatis-pageable</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/pageable/ApiBootMyBatisPageableProperties.java

@@ -17,8 +17,8 @@
 
 package org.minbox.framework.api.boot.autoconfigure.pageable;
 
-import com.gitee.hengboy.mybatis.pageable.common.enums.DialectEnum;
 import lombok.Data;
+import org.minbox.framework.mybatis.pageable.common.DataBaseDialect;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
@@ -43,9 +43,9 @@ public class ApiBootMyBatisPageableProperties {
     /**
      * The database dialect
      * <p>
-     * default use {@link DialectEnum#MYSQL}
+     * default use {@link DataBaseDialect#MYSQL}
      */
-    private DialectEnum dialect = DialectEnum.MYSQL;
+    private DataBaseDialect dialect = DataBaseDialect.MYSQL;
 
     /**
      * Convert this instance to {@link Properties}

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/pageable/ApiBootMybatisPageableAutoConfiguration.java

@@ -17,10 +17,10 @@
 
 package org.minbox.framework.api.boot.autoconfigure.pageable;
 
-import com.gitee.hengboy.mybatis.pageable.config.PageableConfigurer;
-import com.gitee.hengboy.mybatis.pageable.interceptor.MyBatisExecutePageableInterceptor;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.minbox.framework.mybatis.pageable.common.configure.PageableConfigurer;
+import org.minbox.framework.mybatis.pageable.interceptor.MyBatisExecutePageableInterceptor;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -91,8 +91,8 @@ void addInterceptors() {
      * @param sqlSessionFactory The {@link SqlSessionFactory} instance
      */
     void addPreInterceptors(SqlSessionFactory sqlSessionFactory) {
-        if (allowPageableConfigurer() && pageableConfigurer.prePlugins() != null) {
-            loopAddInterceptor(pageableConfigurer.prePlugins(), sqlSessionFactory);
+        if (allowPageableConfigurer() && pageableConfigurer.getPrePlugins() != null) {
+            loopAddInterceptor(pageableConfigurer.getPrePlugins(), sqlSessionFactory);
         }
     }
 
@@ -102,8 +102,8 @@ void addPreInterceptors(SqlSessionFactory sqlSessionFactory) {
      * @param sqlSessionFactory The {@link SqlSessionFactory} instance
      */
     void addPostInterceptors(SqlSessionFactory sqlSessionFactory) {
-        if (allowPageableConfigurer() && pageableConfigurer.postPlugins() != null) {
-            loopAddInterceptor(pageableConfigurer.postPlugins(), sqlSessionFactory);
+        if (allowPageableConfigurer() && pageableConfigurer.getPostPlugins() != null) {
+            loopAddInterceptor(pageableConfigurer.getPostPlugins(), sqlSessionFactory);
         }
     }
 

api-boot-project/api-boot-starters/api-boot-starter-mybatis-pageable/pom.xml

@@ -49,10 +49,9 @@
             <groupId>org.minbox.framework</groupId>
             <artifactId>api-boot-starter</artifactId>
         </dependency>
-        <!--ApiBoot Mybatis Pageable-->
         <dependency>
-            <groupId>com.gitee.hengboy</groupId>
-            <artifactId>mybatis-pageable-core</artifactId>
+            <groupId>org.minbox.framework</groupId>
+            <artifactId>mybatis-pageable</artifactId>
         </dependency>
     </dependencies>
 

api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/service/ArticleInfoService.java

@@ -3,8 +3,6 @@
 import com.gitee.hengboy.mybatis.enhance.dsl.serach.Searchable;
 import com.gitee.hengboy.mybatis.enhance.dsl.update.filter.SetFilter;
 import com.gitee.hengboy.mybatis.enhance.sort.SortEnum;
-import com.gitee.hengboy.mybatis.pageable.Page;
-import com.gitee.hengboy.mybatis.pageable.request.PageableRequest;
 import org.minbox.framework.knowledge.library.common.base.BaseService;
 import org.minbox.framework.knowledge.library.common.constants.Constant;
 import org.minbox.framework.knowledge.library.common.dsl.DArticleInfoEntity;
@@ -18,6 +16,8 @@
 import org.minbox.framework.knowledge.library.service.comment.service.CommentService;
 import org.minbox.framework.knowledge.library.service.constants.ResourceType;
 import org.minbox.framework.knowledge.library.service.user.service.UserLikeRecordService;
+import org.minbox.framework.mybatis.pageable.Page;
+import org.minbox.framework.mybatis.pageable.request.PageableRequest;
 import org.minbox.framework.resource.annotation.ResourceField;
 import org.minbox.framework.resource.annotation.ResourceLoad;
 import org.minbox.framework.resource.enums.ResourceStoreEvent;

api-boot-samples/api-boot-sample-mybatis-pageable/src/main/java/org/minbox/framework/api/boot/sample/MybatisPageableSampleController.java

@@ -17,7 +17,7 @@
 
 package org.minbox.framework.api.boot.sample;
 
-import com.gitee.hengboy.mybatis.pageable.Page;
+import org.minbox.framework.mybatis.pageable.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

api-boot-samples/api-boot-sample-mybatis-pageable/src/main/java/org/minbox/framework/api/boot/sample/MybatisPageableSampleService.java

@@ -17,8 +17,8 @@
 
 package org.minbox.framework.api.boot.sample;
 
-import com.gitee.hengboy.mybatis.pageable.Page;
-import com.gitee.hengboy.mybatis.pageable.request.PageableRequest;
+import org.minbox.framework.mybatis.pageable.Page;
+import org.minbox.framework.mybatis.pageable.request.PageableRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;