diff --git a/pom.xml b/pom.xml
index 38e8f91eccb481c745d1c3757c22cf3e562f1be6..7442469c239198bad5388fb1451a142752150ea5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,6 @@
         <spring.version>4.3.10.RELEASE</spring.version>
         <mybatis-spring.version>1.3.1</mybatis-spring.version>
         <mybatis.version>3.4.5</mybatis.version>
-        <pagehelper.version>4.1.6</pagehelper.version>
         <commons-dbcp.version>1.4</commons-dbcp.version>
         <mysql-connector-java.version>5.1.32</mysql-connector-java.version>
 
@@ -163,11 +162,6 @@
                 <artifactId>mysql-connector-java</artifactId>
                 <version>${mysql-connector-java.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper</artifactId>
-                <version>${pagehelper.version}</version>
-            </dependency>
 
             <!-- commons -->
             <dependency>
diff --git a/whatsmars-spring-boot/pom.xml b/whatsmars-spring-boot/pom.xml
index 6595852f1cb26921d8324fa8e3b9d247960f55fc..e44b6e18c0d37d77d689adb2d2b20f921e9d9a09 100644
--- a/whatsmars-spring-boot/pom.xml
+++ b/whatsmars-spring-boot/pom.xml
@@ -70,7 +70,8 @@
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.3</version>
         </dependency>
 
         <dependency>
diff --git a/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/config/MybatisConfig.java b/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/config/MybatisConfig.java
deleted file mode 100644
index 6cdf3118d559f48d3c376236bb2690671a06aa0e..0000000000000000000000000000000000000000
--- a/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/config/MybatisConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.hongxi.whatsmars.spring.boot.config;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.SqlUtilConfig;
-import org.apache.ibatis.plugin.Interceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MybatisConfig {
-
-    @Bean
-    public Interceptor pageHelper() {
-        PageHelper pageHelper = new PageHelper();
-        SqlUtilConfig sqlUtilConfig = new SqlUtilConfig();
-        sqlUtilConfig.setDialect("mysql");
-        sqlUtilConfig.setOffsetAsPageNum(true);
-        sqlUtilConfig.setRowBoundsWithCount(true);
-        sqlUtilConfig.setPageSizeZero(true);
-        sqlUtilConfig.setReasonable(false);
-        sqlUtilConfig.setSupportMethodsArguments(false);
-        pageHelper.setSqlUtilConfig(sqlUtilConfig);
-        return pageHelper;
-    }
-}
diff --git a/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/controller/NewController.java b/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/controller/NewController.java
index e9bf4bab48c4c2a68ee7d19b052bb4fb877ae12d..6d944bb6cd645db541af43829a07d768e261e422 100644
--- a/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/controller/NewController.java
+++ b/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/controller/NewController.java
@@ -9,8 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by shenhongxi on 2017/11/16.
@@ -71,4 +70,40 @@ public class NewController {
         returnItems.setStatus(200);
         return returnItems;
     }
+
+    @GetMapping("/findByNicknameAndGender")
+    public ReturnItems<User> findByNicknameAndGender(@RequestParam String nickname,
+                                                     @RequestParam Integer gender) {
+        ReturnItems<User> returnItems = new ReturnItems<>();
+        List<User> users = userService.findByNicknameAndGender(nickname, gender);
+        returnItems.setItems(users);
+        returnItems.setTotal(users == null ? 0 : users.size());
+        returnItems.setStatus(200);
+        return returnItems;
+    }
+
+    @PostMapping("/addUsers")
+    public HttpStatus addUsers() {
+        List<User> users = new ArrayList<>();
+        Date now = new Date();
+        long t = now.getTime();
+        User user = new User();
+        user.setUsername("tb" + t++);
+        user.setNickname("hongxi");
+        user.setGender(1);
+        user.setAge(28);
+        user.setCreateDate(now);
+        user.setUpdateDate(now);
+        users.add(user);
+        user = new User();
+        user.setUsername("tb" + t++);
+        user.setNickname("lilei");
+        user.setGender(1);
+        user.setAge(27);
+        user.setCreateDate(now);
+        user.setUpdateDate(now);
+        users.add(user);
+        userService.insertBatch(users);
+        return HttpStatus.OK;
+    }
 }
diff --git a/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/dao/UserMapper.java b/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/dao/UserMapper.java
index 0a9a6379312472bdffb13f949656081345473141..20274ca222f6ac7d8b9ac8f2050ea100d001a4d9 100644
--- a/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/dao/UserMapper.java
+++ b/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/dao/UserMapper.java
@@ -1,5 +1,6 @@
 package org.hongxi.whatsmars.spring.boot.dao;
 
+import org.apache.ibatis.annotations.Param;
 import org.hongxi.whatsmars.spring.boot.model.User;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -24,4 +25,7 @@ public interface UserMapper {
     void update(User user);
 
     void delete(Long id);
+
+    List<User> findByNicknameAndGender(@Param("nickname") String nickname, @Param("gender") Integer gender);
+
 }
diff --git a/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/service/UserService.java b/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/service/UserService.java
index 5c5f7c2350a30fed49be275ebbfa6dc0fcaba554..927966623da61b63ef15017fd3c0c3ff9be75db4 100644
--- a/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/service/UserService.java
+++ b/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/service/UserService.java
@@ -24,4 +24,6 @@ public interface UserService {
 
     void add(List<User> users);
 
+    List<User> findByNicknameAndGender(String nickname, Integer gender);
+
 }
diff --git a/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/service/impl/UserServiceImpl.java b/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/service/impl/UserServiceImpl.java
index 876233cd0c845bde2bcdec8fb9977e7afe1177b9..eff005f6fd738f853061c0e0bc795ab714220a24 100644
--- a/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/service/impl/UserServiceImpl.java
+++ b/whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/service/impl/UserServiceImpl.java
@@ -62,4 +62,9 @@ public class UserServiceImpl implements UserService {
             userMapper.insert(user);
         }
     }
+
+    @Override
+    public List<User> findByNicknameAndGender(String nickname, Integer gender) {
+        return userMapper.findByNicknameAndGender(nickname, gender);
+    }
 }
diff --git a/whatsmars-spring-boot/src/main/resources/application.yml b/whatsmars-spring-boot/src/main/resources/application.yml
index 7a602ddc2e875fd07fe0b8af16d0e7a4dec66b85..2a4397875d123101ba6dc663ea4177966ae9c98a 100644
--- a/whatsmars-spring-boot/src/main/resources/application.yml
+++ b/whatsmars-spring-boot/src/main/resources/application.yml
@@ -31,6 +31,12 @@ user:
   welcome: Hello, World!
   noFilterUrl: /,/login
 
+logging.level.tk.mybatis.pagehelper.mapper: WARN
+pagehelper:
+  closeConn: true
+  offset-as-page-num: false
+  autoDialect: true
+
 ---
 spring:
   profiles: dev
diff --git a/whatsmars-spring-boot/src/main/resources/mapper/UserMapper.xml b/whatsmars-spring-boot/src/main/resources/mapper/UserMapper.xml
index 801265b48d6a4418e5e5c3771247568ea4b9689f..d75c88d731b9524d00384f3f45de3d654c327762 100644
--- a/whatsmars-spring-boot/src/main/resources/mapper/UserMapper.xml
+++ b/whatsmars-spring-boot/src/main/resources/mapper/UserMapper.xml
@@ -18,7 +18,7 @@
     <insert id="insertBatch" parameterType="list">
         insert into user(username, nickname, gender, age, create_date, update_date) values
         <foreach collection="list" item="item" separator=",">
-            (#{username}, #{nickname}, #{gender}, #{age}, #{createDate}, #{updateDate})
+            (#{item.username}, #{item.nickname}, #{item.gender}, #{item.age}, #{item.createDate}, #{item.updateDate})
         </foreach>
     </insert>
 
@@ -38,4 +38,8 @@
         delete from user where id = #{id}
     </delete>
 
+    <select id="findByNicknameAndGender" resultType="User">
+        select * from user where nickname = #{nickname} and gender = #{gender}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/whatsmars-spring-boot/src/main/resources/mybatis-config.xml b/whatsmars-spring-boot/src/main/resources/mybatis-config.xml
index 1d5e260be053965fc2f92aa50c33acf7bd74a916..730b36507de2d24c09462401505981a19421e510 100644
--- a/whatsmars-spring-boot/src/main/resources/mybatis-config.xml
+++ b/whatsmars-spring-boot/src/main/resources/mybatis-config.xml
@@ -30,37 +30,6 @@
         <typeAlias type="org.hongxi.whatsmars.spring.boot.model.User" alias="User" />
     </typeAliases>
 
-    <plugins>
-        <!-- com.github.pagehelper为PageHelper类所在包名 -->
-        <plugin interceptor="com.github.pagehelper.PageHelper">
-            <!-- 4.0.0以后版本可以不设置该参数 -->
-            <property name="dialect" value="mysql"/>
-            <!-- 该参数默认为false -->
-            <!-- 设置为true时，会将RowBounds第一个参数offset当成pageNum页码使用 -->
-            <!-- 和startPage中的pageNum效果一样-->
-            <property name="offsetAsPageNum" value="true"/>
-            <!-- 该参数默认为false -->
-            <!-- 设置为true时，使用RowBounds分页会进行count查询 -->
-            <property name="rowBoundsWithCount" value="true"/>
-            <!-- 设置为true时，如果pageSize=0或者RowBounds.limit = 0就会查询出全部的结果 -->
-            <!-- （相当于没有执行分页查询，但是返回结果仍然是Page类型）-->
-            <property name="pageSizeZero" value="true"/>
-            <!-- 3.3.0版本可用 - 分页参数合理化，默认false禁用 -->
-            <!-- 启用合理化时，如果pageNum<1会查询第一页，如果pageNum>pages会查询最后一页 -->
-            <!-- 禁用合理化时，如果pageNum<1或pageNum>pages会返回空数据 -->
-            <property name="reasonable" value="false"/>
-            <!-- 3.5.0版本可用 - 为了支持startPage(Object params)方法 -->
-            <!-- 增加了一个`params`参数来配置参数映射，用于从Map或ServletRequest中取值 -->
-            <!-- 可以配置pageNum,pageSize,count,pageSizeZero,reasonable,orderBy,不配置映射的用默认值 -->
-            <!-- 不理解该含义的前提下，不要随便复制该配置 -->
-            <!--<property name="params" value="pageNum=pageHelperStart;pageSize=pageHelperRows;"/>-->
-            <!-- 支持通过Mapper接口参数来传递分页参数 -->
-            <property name="supportMethodsArguments" value="false"/>
-            <!-- always总是返回PageInfo类型,check检查返回类型是否为PageInfo,none返回Page -->
-            <property name="returnPageInfo" value="none"/>
-        </plugin>
-    </plugins>
-
     <mappers>
         <mapper resource="mapper/UserMapper.xml"/>