diff --git a/mall-admin/pom.xml b/mall-admin/pom.xml
index e65b610..8f32452 100644
--- a/mall-admin/pom.xml
+++ b/mall-admin/pom.xml
@@ -39,28 +39,23 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>1.2.0</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
+            <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
         <!--MyBatis分页插件-->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.10</version>
         </dependency>
         <!--Swagger-UI API文档生产工具-->
         <dependency>
diff --git a/mall-demo/pom.xml b/mall-demo/pom.xml
index e057c45..f399286 100644
--- a/mall-demo/pom.xml
+++ b/mall-demo/pom.xml
@@ -43,19 +43,25 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>1.2.0</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
+            <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--MyBatis分页插件-->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.10</version>
+        </dependency>
+        <!--Swagger-UI API文档生产工具-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
@@ -66,11 +72,7 @@
             <artifactId>springfox-swagger-ui</artifactId>
             <version>2.6.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.3</version>
-        </dependency>
+        <!--logstash日志收集插件-->
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
diff --git a/mall-mbg/pom.xml b/mall-mbg/pom.xml
index e80b80d..9e50890 100644
--- a/mall-mbg/pom.xml
+++ b/mall-mbg/pom.xml
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.4.2</version>
+            <version>3.4.6</version>
         </dependency>
         <!--Mysql数据库驱动-->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.46</version>
+            <version>8.0.15</version>
         </dependency>
     </dependencies>
 
diff --git a/mall-mbg/src/main/resources/generator.properties b/mall-mbg/src/main/resources/generator.properties
index 95c8f90..08697df 100644
--- a/mall-mbg/src/main/resources/generator.properties
+++ b/mall-mbg/src/main/resources/generator.properties
@@ -1,4 +1,4 @@
 jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.connectionURL=jdbc:mysql://localhost:3306/mall
+jdbc.connectionURL=jdbc:mysql://localhost:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 jdbc.userId=root
 jdbc.password=root
\ No newline at end of file
diff --git a/mall-mbg/src/main/resources/generatorConfig.xml b/mall-mbg/src/main/resources/generatorConfig.xml
index 29db84b..3df7185 100644
--- a/mall-mbg/src/main/resources/generatorConfig.xml
+++ b/mall-mbg/src/main/resources/generatorConfig.xml
@@ -24,6 +24,8 @@
                         connectionURL="${jdbc.connectionURL}"
                         userId="${jdbc.userId}"
                         password="${jdbc.password}">
+            <!--解决mysql驱动升级到8.0后不生成指定数据库代码的问题-->
+            <property name="nullCatalogMeansCurrent" value="true" />
         </jdbcConnection>
 
         <javaModelGenerator targetPackage="com.macro.mall.model" targetProject="mall-mbg\src\main\java"/>
diff --git a/mall-portal/pom.xml b/mall-portal/pom.xml
index a94eec3..999706f 100644
--- a/mall-portal/pom.xml
+++ b/mall-portal/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.10</version>
         </dependency>
         <!--Swagger-UI API文档生产工具-->
         <dependency>
@@ -68,12 +68,7 @@
         <!--redis依赖配置-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-redis</artifactId>
-            <version>1.3.8.RELEASE</version>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
         <!--集成druid连接池-->
         <dependency>
diff --git a/mall-portal/src/main/resources/application-dev.yml b/mall-portal/src/main/resources/application-dev.yml
index 2f047d1..f4e6d3d 100644
--- a/mall-portal/src/main/resources/application-dev.yml
+++ b/mall-portal/src/main/resources/application-dev.yml
@@ -38,7 +38,7 @@ spring:
         max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
         max-idle: 8 # 连接池中的最大空闲连接
         min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 0ms # 连接超时时间（毫秒）
+    timeout: 3000ms # 连接超时时间（毫秒）
 
   rabbitmq:
     host: localhost
diff --git a/mall-search/pom.xml b/mall-search/pom.xml
index 28de626..07c66ea 100644
--- a/mall-search/pom.xml
+++ b/mall-search/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.10</version>
         </dependency>
         <!--Swagger-UI API文档生产工具-->
         <dependency>