去除SelectPage与SelectMapsPage注入.

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisXMLScriptBuilder.java

@@ -145,20 +145,6 @@ public class MybatisXMLScriptBuilder extends BaseBuilder {
         return new MixedSqlNode(contents);
     }
 
-    static class WrapperXnode {
-
-        private final XNode xNode;
-
-        WrapperXnode(XNode xNode) {
-            this.xNode = xNode;
-        }
-
-        public String getStringBody(String def) {
-            return xNode.getStringBody(def);
-        }
-
-    }
-
     private interface NodeHandler {
         void handleNode(XNode nodeToHandle, List<SqlNode> targetContents);
     }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/enums/SqlMethod.java

@@ -65,8 +65,10 @@ public enum SqlMethod {
     SELECT_ONE("selectOne", "查询满足条件一条数据", "<script>%s SELECT %s FROM %s %s %s\n</script>"),
     SELECT_COUNT("selectCount", "查询满足条件总记录数", "<script>%s SELECT COUNT(%s) AS total FROM %s %s %s\n</script>"),
     SELECT_LIST("selectList", "查询满足条件所有数据", "<script>%s SELECT %s FROM %s %s %s %s\n</script>"),
+    @Deprecated
     SELECT_PAGE("selectPage", "查询满足条件所有数据（并翻页）", "<script>%s SELECT %s FROM %s %s %s %s\n</script>"),
     SELECT_MAPS("selectMaps", "查询满足条件所有数据", "<script>%s SELECT %s FROM %s %s %s %s\n</script>"),
+    @Deprecated
     SELECT_MAPS_PAGE("selectMapsPage", "查询满足条件所有数据（并翻页）", "<script>\n%s SELECT %s FROM %s %s %s %s\n</script>"),
     SELECT_OBJS("selectObjs", "查询满足条件所有数据", "<script>%s SELECT %s FROM %s %s %s %s\n</script>");
 

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/DefaultSqlInjector.java

@@ -42,10 +42,8 @@ public class DefaultSqlInjector extends AbstractSqlInjector {
             .add(new SelectByMap())
             .add(new SelectCount())
             .add(new SelectMaps())
-            .add(new SelectMapsPage())
             .add(new SelectObjs())
-            .add(new SelectList())
-            .add(new SelectPage());
+            .add(new SelectList());
         if (tableInfo.havePK()) {
             builder.add(new DeleteById())
                 .add(new DeleteBatchByIds())

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectMapsPage.java

@@ -27,9 +27,11 @@ import java.util.Map;
  * 查询满足条件所有数据（并翻页）
  *
  * @author hubin
+ * @deprecated 3.5.3 {@link  com.baomidou.mybatisplus.core.mapper.BaseMapper#selectMaps(com.baomidou.mybatisplus.core.metadata.IPage, com.baomidou.mybatisplus.core.conditions.Wrapper)}
  * @since 2018-04-06
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class SelectMapsPage extends AbstractMethod {
 
     public SelectMapsPage() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectPage.java

@@ -15,8 +15,11 @@
  */
 package com.baomidou.mybatisplus.core.injector.methods;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlSource;
@@ -26,8 +29,10 @@ import org.apache.ibatis.mapping.SqlSource;
  *
  * @author hubin
  * @since 2018-04-06
+ * @deprecated 3.5.3 {@link BaseMapper#selectList(IPage, Wrapper)}
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class SelectPage extends AbstractMethod {
 
     public SelectPage() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/mapper/BaseMapper.java

@@ -220,12 +220,32 @@ public interface BaseMapper<T> extends Mapper<T> {
     List<T> selectList(@Param(Constants.WRAPPER) Wrapper<T> queryWrapper);
 
     /**
-     * 根据 Wrapper 条件，查询全部记录
+     * 根据 entity 条件，查询全部记录（并翻页）
      *
+     * @param page         分页查询条件
      * @param queryWrapper 实体对象封装操作类（可以为 null）
+     * @since 3.5.3
+     */
+    List<T> selectList(IPage<T> page, @Param(Constants.WRAPPER) Wrapper<T> queryWrapper);
+
+
+    /**
+     * 根据 Wrapper 条件，查询全部记录
+     *
+     * @param queryWrapper 实体对象封装操作类
      */
     List<Map<String, Object>> selectMaps(@Param(Constants.WRAPPER) Wrapper<T> queryWrapper);
 
+    /**
+     * 根据 Wrapper 条件，查询全部记录（并翻页）
+     *
+     * @param page         分页查询条件
+     * @param queryWrapper 实体对象封装操作类
+     * @since 3.5.3
+     */
+    List<Map<String, Object>> selectMaps(IPage<? extends Map<String, Object>> page, @Param(Constants.WRAPPER) Wrapper<T> queryWrapper);
+
+
     /**
      * 根据 Wrapper 条件，查询全部记录
      * <p>注意： 只返回第一个字段的值</p>
@@ -237,10 +257,14 @@ public interface BaseMapper<T> extends Mapper<T> {
     /**
      * 根据 entity 条件，查询全部记录（并翻页）
      *
-     * @param page         分页查询条件（可以为 RowBounds.DEFAULT）
+     * @param page         分页查询条件
      * @param queryWrapper 实体对象封装操作类（可以为 null）
      */
-    <P extends IPage<T>> P selectPage(P page, @Param(Constants.WRAPPER) Wrapper<T> queryWrapper);
+    default <P extends IPage<T>> P selectPage(P page, @Param(Constants.WRAPPER) Wrapper<T> queryWrapper) {
+        List<T> list = selectList(page, queryWrapper);
+        page.setRecords(list);
+        return page;
+    }
 
     /**
      * 根据 Wrapper 条件，查询全部记录（并翻页）
@@ -248,5 +272,10 @@ public interface BaseMapper<T> extends Mapper<T> {
      * @param page         分页查询条件
      * @param queryWrapper 实体对象封装操作类
      */
-    <P extends IPage<Map<String, Object>>> P selectMapsPage(P page, @Param(Constants.WRAPPER) Wrapper<T> queryWrapper);
+    default <P extends IPage<Map<String, Object>>> P selectMapsPage(P page, @Param(Constants.WRAPPER) Wrapper<T> queryWrapper) {
+        List<Map<String, Object>> list = selectMaps(page, queryWrapper);
+        page.setRecords(list);
+        return page;
+    }
+
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/activerecord/Model.java

@@ -211,7 +211,7 @@ public abstract class Model<T extends Model<?>> implements Serializable {
         map.put("page", page);
         SqlSession sqlSession = sqlSession();
         try {
-            page.setRecords(sqlSession.selectList(sqlStatement(SqlMethod.SELECT_PAGE), map));
+            page.setRecords(sqlSession.selectList(sqlStatement(SqlMethod.SELECT_LIST), map));
         } finally {
             closeSqlSession(sqlSession);
         }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisSqlSessionFactoryBean.java

@@ -20,10 +20,8 @@ import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
 import com.baomidou.mybatisplus.core.MybatisXMLConfigBuilder;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import lombok.Setter;
 import org.apache.ibatis.builder.xml.XMLMapperBuilder;
 import org.apache.ibatis.cache.Cache;