dungpv newest

pom.xml

@@ -25,18 +25,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-<<<<<<< HEAD
-
-=======
->>>>>>> ce3006b6a5fafbd06aecf7141c3e8b97909de200
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-security</artifactId>-->
-<!--        </dependency>-->
-<<<<<<< HEAD
-
-=======
->>>>>>> ce3006b6a5fafbd06aecf7141c3e8b97909de200
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -53,46 +41,13 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-<<<<<<< HEAD
-
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-security</artifactId>-->
-<!--        </dependency>-->
-
-
-<!--        &lt;!&ndash; https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>io.jsonwebtoken</groupId>-->
-<!--            <artifactId>jjwt</artifactId>-->
-<!--            <version>0.9.1</version>-->
-<!--        </dependency>-->
-
-        <!-- https://mvnrepository.com/artifact/log4j/log4j -->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
 
-=======
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.security</groupId>-->
-<!--            <artifactId>spring-security-test</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
->>>>>>> ce3006b6a5fafbd06aecf7141c3e8b97909de200
     </dependencies>
-
-
-
-
     <build>
         <plugins>
             <plugin>

src/main/resources/application.properties

-#server.port=8081
+server.port=8081
 # ===============================
 # DATABASE CONNECTION
 # ===============================
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/qtvp_01
 spring.datasource.username=root
-<<<<<<< HEAD
 spring.datasource.password=12345678
-=======
-spring.datasource.password=vanloc
->>>>>>> ce3006b6a5fafbd06aecf7141c3e8b97909de200
 
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update

src/test/java/com/itsol/quantrivanphong/QuantrivanphongApplicationTests.java

-package com.itsol.quantrivanphong;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class QuantrivanphongApplicationTests {
-
-    @Test
-    public void contextLoads() {
-    }
-
-}