From 1c1caeacc84fcb4b67eaf066ddab13b5486dc7f8 Mon Sep 17 00:00:00 2001
From: xiongneng <yidao620@gmail.com>
Date: Tue, 5 Oct 2021 00:24:06 +0800
Subject: [PATCH] update

---
 springboot-mybatis/src/main/resources/sql/schema.sql |  6 +++---
 springboot-restful/pom.xml                           | 12 +-----------
 .../test/java/com/xncoding/pos/ApplicationTests.java |  8 +++++---
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/springboot-mybatis/src/main/resources/sql/schema.sql b/springboot-mybatis/src/main/resources/sql/schema.sql
index 9b7a571..68bd392 100644
--- a/springboot-mybatis/src/main/resources/sql/schema.sql
+++ b/springboot-mybatis/src/main/resources/sql/schema.sql
@@ -1,6 +1,6 @@
-# CREATE DATABASE IF NOT EXISTS pos default charset utf8 COLLATE utf8_general_ci;
-# SET FOREIGN_KEY_CHECKS=0;
-# USE pos;
+CREATE DATABASE IF NOT EXISTS pos default charset utf8 COLLATE utf8_general_ci;
+SET FOREIGN_KEY_CHECKS=0;
+USE pos;
 
 -- 用户表
 DROP TABLE IF EXISTS `t_user`;
diff --git a/springboot-restful/pom.xml b/springboot-restful/pom.xml
index ca7c97f..6bbd768 100644
--- a/springboot-restful/pom.xml
+++ b/springboot-restful/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.4.RELEASE</version>
+        <version>2.5.5</version>
     </parent>
 
     <properties>
@@ -28,16 +28,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jetty</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/springboot-restful/src/test/java/com/xncoding/pos/ApplicationTests.java b/springboot-restful/src/test/java/com/xncoding/pos/ApplicationTests.java
index a1d41aa..0e93fba 100644
--- a/springboot-restful/src/test/java/com/xncoding/pos/ApplicationTests.java
+++ b/springboot-restful/src/test/java/com/xncoding/pos/ApplicationTests.java
@@ -4,11 +4,13 @@
 import com.xncoding.pos.model.BaseResponse;
 import com.xncoding.pos.model.User;
 import com.xncoding.pos.util.JacksonUtil;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
@@ -38,7 +40,7 @@
  */
 
 @AutoConfigureMockMvc
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class ApplicationTests {
     @Autowired