diff --git a/common/common-framework/pom.xml b/common/common-framework/pom.xml
index d7ec41bd7..82ed1d073 100644
--- a/common/common-framework/pom.xml
+++ b/common/common-framework/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.5.0</version>
+            <version>3.5.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/web/AdminMVCAutoConfiguration.java b/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/web/AdminMVCAutoConfiguration.java
index 66811dc6e..f2c947b57 100644
--- a/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/web/AdminMVCAutoConfiguration.java
+++ b/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/web/AdminMVCAutoConfiguration.java
@@ -41,7 +41,7 @@ public class AdminMVCAutoConfiguration implements WebMvcConfigurer {
     }
 
     @Bean
-    @ConditionalOnMissingBean(GlobalResponseBodyHandler.class)
+    @ConditionalOnMissingBean(GlobalExceptionHandler.class)
     public GlobalExceptionHandler globalExceptionHandler() {
         return new GlobalExceptionHandler();
     }
diff --git a/pom.xml b/pom.xml
index 815a20695..46eb2efa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
         <springfox-swagger.version>2.9.2</springfox-swagger.version>
         <swagger-bootstrap-ui.version>1.9.3</swagger-bootstrap-ui.version>
         <mybatis-spring-boot-starter.version>2.0.0</mybatis-spring-boot-starter.version>
+        <mybatis-plus.version>3.1.1</mybatis-plus.version>
         <xxl-job.version>2.0.1</xxl-job.version>
         <guava.version>27.0.1-jre</guava.version>
         <rocketmq-spring-boot-starter.version>2.0.1</rocketmq-spring-boot-starter.version>
@@ -141,6 +142,11 @@
                 <artifactId>mybatis-spring-boot-starter</artifactId>
                 <version>${mybatis-spring-boot-starter.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.google.guava</groupId>
diff --git a/system/system-service-impl/pom.xml b/system/system-service-impl/pom.xml
index ab75ffb7e..4a85eda25 100644
--- a/system/system-service-impl/pom.xml
+++ b/system/system-service-impl/pom.xml
@@ -21,10 +21,6 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jdbc</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.dubbo</groupId>
@@ -44,8 +40,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
 
         <dependency>
diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AccessLogMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AccessLogMapper.java
index 947e79c9c..f7c19272f 100644
--- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AccessLogMapper.java
+++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AccessLogMapper.java
@@ -1,11 +1,10 @@
 package cn.iocoder.mall.admin.dao;
 
 import cn.iocoder.mall.admin.dataobject.AccessLogDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface AccessLogMapper {
-
-    void insert(AccessLogDO entity);
+public interface AccessLogMapper extends BaseMapper<AccessLogDO> {
 
 }
diff --git a/system/system-service-impl/src/main/resources/config/application.yaml b/system/system-service-impl/src/main/resources/config/application.yaml
index aaf7532f0..2cf22d7ee 100644
--- a/system/system-service-impl/src/main/resources/config/application.yaml
+++ b/system/system-service-impl/src/main/resources/config/application.yaml
@@ -7,9 +7,19 @@ spring:
     password: ${MALL_MYSQL_PASSWORD}
 
 # mybatis
-mybatis:
-  config-location: classpath:mybatis-config.xml
-  mapper-locations: classpath:mapper/*.xml
+#mybatis:
+#  config-location: classpath:mybatis-config.xml
+#  mapper-locations: classpath:mapper/*.xml
+#  type-aliases-package: cn.iocoder.mall.admin.dataobject
+
+# mybatis-plus
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
+  global-config:
+    db-config:
+      id-type: auto
+  mapper-locations: classpath*:mapper/*.xml
   type-aliases-package: cn.iocoder.mall.admin.dataobject
 
 # dubbo
diff --git a/user/user-service-impl/src/main/resources/config/application.yaml b/user/user-service-impl/src/main/resources/config/application.yaml
index e469d9354..4d4edb0fb 100644
--- a/user/user-service-impl/src/main/resources/config/application.yaml
+++ b/user/user-service-impl/src/main/resources/config/application.yaml
@@ -7,9 +7,18 @@ spring:
     password: ${MALL_MYSQL_PASSWORD}
 
 # mybatis
-mybatis:
-  config-location: classpath:mybatis-config.xml
-  mapper-locations: classpath:mapper/*.xml
+#mybatis:
+#  config-location: classpath:mybatis-config.xml
+#  mapper-locations: classpath:mapper/*.xml
+#  type-aliases-package: cn.iocoder.mall.user.biz.dataobject
+
+# mybatis-plus
+mybatis-plus:
+  configuration:
+    mapUnderscoreToCamelCase: true # 虽然默认为 true ，但是还是显示去指定下。
+  mapperLocations: classpath*:mapper/*.xml
+  typeAliasesPackage: cn.iocoder.mall.user.biz.dataobject
+  mapper-locations: classpath*:mapper/*.xml
   type-aliases-package: cn.iocoder.mall.user.biz.dataobject
 
 # dubbo