From 772ce20c956a7407d147a3fccad62ac65e33a88f Mon Sep 17 00:00:00 2001
From: "liu.shuai" <769741679@qq.com>
Date: Fri, 1 Apr 2022 14:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90M=E3=80=91master=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  5 +++
 springboot-learning-jdbctemplate/pom.xml      | 43 +++++++++++++++++++
 .../SpringBootLearningApplication.java        |  0
 .../lsqingfeng/springboot/base/Result.java    |  0
 .../springboot/base/ResultCode.java           |  0
 .../springboot/base/ResultCodeEnum.java       |  0
 .../springboot/config/MyConfig.java           |  0
 .../springboot/config/ThirdWeatherConfig.java |  0
 .../springboot/config/WebMvcConfig.java       |  1 -
 .../controller/FirstController.java           |  0
 .../springboot/controller/JdbcController.java |  0
 .../controller/SecondController.java          |  0
 .../controller/ThirdExceptionController.java  |  0
 .../lsqingfeng/springboot/entity/User.java    |  0
 .../springboot/exception/BizException.java    |  0
 .../exception/GlobalExceptionHandler.java     |  0
 .../interceptor/TokenInterceptor.java         |  0
 .../springboot}/jdbcTemplate/UserDao.java     |  2 +-
 .../jdbcTemplate/impl/UserDaoImpl.java        |  2 +-
 .../springboot/service/UserService.java       |  0
 .../service/impl/UserServiceImpl.java         |  0
 .../com/lsqingfeng/springboot/vo/User.java    |  0
 .../src}/main/resources/application.yml       |  0
 springboot-learning-jpa/pom.xml               | 19 ++++++++
 24 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 springboot-learning-jdbctemplate/pom.xml
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/SpringBootLearningApplication.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/base/Result.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/base/ResultCode.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/base/ResultCodeEnum.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/config/MyConfig.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/config/ThirdWeatherConfig.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/config/WebMvcConfig.java (93%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/controller/FirstController.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/controller/JdbcController.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/controller/SecondController.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/controller/ThirdExceptionController.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/entity/User.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/exception/BizException.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/exception/GlobalExceptionHandler.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/interceptor/TokenInterceptor.java (100%)
 rename {src/main/java/com/lsqingfeng/springboot/dao => springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot}/jdbcTemplate/UserDao.java (93%)
 rename {src/main/java/com/lsqingfeng/springboot/dao => springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot}/jdbcTemplate/impl/UserDaoImpl.java (96%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/service/UserService.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/service/impl/UserServiceImpl.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/java/com/lsqingfeng/springboot/vo/User.java (100%)
 rename {src => springboot-learning-jdbctemplate/src}/main/resources/application.yml (100%)
 create mode 100644 springboot-learning-jpa/pom.xml

diff --git a/pom.xml b/pom.xml
index 331ff52..12ae657 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,12 @@
 
     <groupId>com.lsqingfeng.springboot</groupId>
     <artifactId>springboot-learning</artifactId>
+    <packaging>pom</packaging>
     <version>1.0.0</version>
+    <modules>
+        <module>springboot-learning-jdbctemplate</module>
+        <module>springboot-learning-jpa</module>
+    </modules>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/springboot-learning-jdbctemplate/pom.xml b/springboot-learning-jdbctemplate/pom.xml
new file mode 100644
index 0000000..66a300e
--- /dev/null
+++ b/springboot-learning-jdbctemplate/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>springboot-learning</artifactId>
+        <groupId>com.lsqingfeng.springboot</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>springboot-learning-jdbctemplate</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.22</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- jdbcTemplate -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+
+        <!-- MySQL连接 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/lsqingfeng/springboot/SpringBootLearningApplication.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/SpringBootLearningApplication.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/SpringBootLearningApplication.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/SpringBootLearningApplication.java
diff --git a/src/main/java/com/lsqingfeng/springboot/base/Result.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/base/Result.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/base/Result.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/base/Result.java
diff --git a/src/main/java/com/lsqingfeng/springboot/base/ResultCode.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/base/ResultCode.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/base/ResultCode.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/base/ResultCode.java
diff --git a/src/main/java/com/lsqingfeng/springboot/base/ResultCodeEnum.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/base/ResultCodeEnum.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/base/ResultCodeEnum.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/base/ResultCodeEnum.java
diff --git a/src/main/java/com/lsqingfeng/springboot/config/MyConfig.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/config/MyConfig.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/config/MyConfig.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/config/MyConfig.java
diff --git a/src/main/java/com/lsqingfeng/springboot/config/ThirdWeatherConfig.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/config/ThirdWeatherConfig.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/config/ThirdWeatherConfig.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/config/ThirdWeatherConfig.java
diff --git a/src/main/java/com/lsqingfeng/springboot/config/WebMvcConfig.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/config/WebMvcConfig.java
similarity index 93%
rename from src/main/java/com/lsqingfeng/springboot/config/WebMvcConfig.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/config/WebMvcConfig.java
index a5ce6c5..fd26138 100644
--- a/src/main/java/com/lsqingfeng/springboot/config/WebMvcConfig.java
+++ b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/config/WebMvcConfig.java
@@ -1,7 +1,6 @@
 package com.lsqingfeng.springboot.config;
 
 import com.lsqingfeng.springboot.interceptor.TokenInterceptor;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
diff --git a/src/main/java/com/lsqingfeng/springboot/controller/FirstController.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/controller/FirstController.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/controller/FirstController.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/controller/FirstController.java
diff --git a/src/main/java/com/lsqingfeng/springboot/controller/JdbcController.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/controller/JdbcController.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/controller/JdbcController.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/controller/JdbcController.java
diff --git a/src/main/java/com/lsqingfeng/springboot/controller/SecondController.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/controller/SecondController.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/controller/SecondController.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/controller/SecondController.java
diff --git a/src/main/java/com/lsqingfeng/springboot/controller/ThirdExceptionController.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/controller/ThirdExceptionController.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/controller/ThirdExceptionController.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/controller/ThirdExceptionController.java
diff --git a/src/main/java/com/lsqingfeng/springboot/entity/User.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/entity/User.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/entity/User.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/entity/User.java
diff --git a/src/main/java/com/lsqingfeng/springboot/exception/BizException.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/exception/BizException.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/exception/BizException.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/exception/BizException.java
diff --git a/src/main/java/com/lsqingfeng/springboot/exception/GlobalExceptionHandler.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/exception/GlobalExceptionHandler.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/exception/GlobalExceptionHandler.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/exception/GlobalExceptionHandler.java
diff --git a/src/main/java/com/lsqingfeng/springboot/interceptor/TokenInterceptor.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/interceptor/TokenInterceptor.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/interceptor/TokenInterceptor.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/interceptor/TokenInterceptor.java
diff --git a/src/main/java/com/lsqingfeng/springboot/dao/jdbcTemplate/UserDao.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/jdbcTemplate/UserDao.java
similarity index 93%
rename from src/main/java/com/lsqingfeng/springboot/dao/jdbcTemplate/UserDao.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/jdbcTemplate/UserDao.java
index d022b82..b01eeec 100644
--- a/src/main/java/com/lsqingfeng/springboot/dao/jdbcTemplate/UserDao.java
+++ b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/jdbcTemplate/UserDao.java
@@ -1,4 +1,4 @@
-package com.lsqingfeng.springboot.dao.jdbcTemplate;
+package com.lsqingfeng.springboot.jdbcTemplate;
 
 import com.lsqingfeng.springboot.entity.User;
 
diff --git a/src/main/java/com/lsqingfeng/springboot/dao/jdbcTemplate/impl/UserDaoImpl.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/jdbcTemplate/impl/UserDaoImpl.java
similarity index 96%
rename from src/main/java/com/lsqingfeng/springboot/dao/jdbcTemplate/impl/UserDaoImpl.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/jdbcTemplate/impl/UserDaoImpl.java
index b2658aa..f76627b 100644
--- a/src/main/java/com/lsqingfeng/springboot/dao/jdbcTemplate/impl/UserDaoImpl.java
+++ b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/jdbcTemplate/impl/UserDaoImpl.java
@@ -1,4 +1,4 @@
-package com.lsqingfeng.springboot.dao.jdbcTemplate.impl;
+package com.lsqingfeng.springboot.jdbcTemplate.impl;
 
 import com.lsqingfeng.springboot.dao.jdbcTemplate.UserDao;
 import com.lsqingfeng.springboot.entity.User;
diff --git a/src/main/java/com/lsqingfeng/springboot/service/UserService.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/service/UserService.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/service/UserService.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/service/UserService.java
diff --git a/src/main/java/com/lsqingfeng/springboot/service/impl/UserServiceImpl.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/service/impl/UserServiceImpl.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/service/impl/UserServiceImpl.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/service/impl/UserServiceImpl.java
diff --git a/src/main/java/com/lsqingfeng/springboot/vo/User.java b/springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/vo/User.java
similarity index 100%
rename from src/main/java/com/lsqingfeng/springboot/vo/User.java
rename to springboot-learning-jdbctemplate/src/main/java/com/lsqingfeng/springboot/vo/User.java
diff --git a/src/main/resources/application.yml b/springboot-learning-jdbctemplate/src/main/resources/application.yml
similarity index 100%
rename from src/main/resources/application.yml
rename to springboot-learning-jdbctemplate/src/main/resources/application.yml
diff --git a/springboot-learning-jpa/pom.xml b/springboot-learning-jpa/pom.xml
new file mode 100644
index 0000000..da01c76
--- /dev/null
+++ b/springboot-learning-jpa/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>springboot-learning</artifactId>
+        <groupId>com.lsqingfeng.springboot</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>springboot-learning-jpa</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
-- 
GitLab