From 4f83f6e645f6b12e2cd16c746a05becd2a4baa50 Mon Sep 17 00:00:00 2001
From: Yang Zhi <yangzhi@ddjf.com.cn>
Date: Fri, 13 Oct 2017 16:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    | 36 +++++++++++++++++++
 .../com/didispace/web/HelloController.java    |  2 +-
 .../java/com/didispace/ApplicationTests.java  |  3 +-
 Chapter3-1-3/pom.xml                          |  6 ++--
 .../com/didispace/web/HelloController.java    |  2 +-
 Chapter3-1-4/pom.xml                          |  6 ++--
 .../com/didispace/web/HelloController.java    |  2 +-
 Chapter3-1-5/pom.xml                          |  6 ++--
 8 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..353dd558
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,36 @@
+# maven ignore
+target/
+
+# eclipse ignore
+.settings/
+.project
+.classpath
+
+# idea ignore
+.idea/
+*.ipr
+*.iml
+*.iws
+
+# temp ignore
+*.log
+*.cache
+*.diff
+*.patch
+*.tmp
+
+# system ignore
+.DS_Store
+Thumbs.db
+
+# project ignore
+**/tmp
+pom.xml.versionsBackup
+
+# classes
+classes/
+
+#logs file
+logs/
+#temp file
+temp/
\ No newline at end of file
diff --git a/Chapter3-1-2/src/main/java/com/didispace/web/HelloController.java b/Chapter3-1-2/src/main/java/com/didispace/web/HelloController.java
index 07185c5e..3921cad3 100644
--- a/Chapter3-1-2/src/main/java/com/didispace/web/HelloController.java
+++ b/Chapter3-1-2/src/main/java/com/didispace/web/HelloController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  *
diff --git a/Chapter3-1-2/src/test/java/com/didispace/ApplicationTests.java b/Chapter3-1-2/src/test/java/com/didispace/ApplicationTests.java
index c5b2e60c..49eb821d 100755
--- a/Chapter3-1-2/src/test/java/com/didispace/ApplicationTests.java
+++ b/Chapter3-1-2/src/test/java/com/didispace/ApplicationTests.java
@@ -34,8 +34,7 @@ public class ApplicationTests {
 
 	@Before
 	public void setUp() throws Exception {
-		mvc = MockMvcBuilders.standaloneSetup(
-				new HelloController()).build();
+		mvc = MockMvcBuilders.standaloneSetup(new HelloController()).build();
 	}
 
 	@Test
diff --git a/Chapter3-1-3/pom.xml b/Chapter3-1-3/pom.xml
index 71d874b2..992339ed 100755
--- a/Chapter3-1-3/pom.xml
+++ b/Chapter3-1-3/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.didispace</groupId>
-	<artifactId>demo</artifactId>
+	<artifactId>Chapter3-1-3</artifactId>
 	<version>1.0.0</version>
 	<packaging>jar</packaging>
 
-	<name>demo</name>
-	<description>Spring Boot Web project</description>
+	<name>Chapter3-1-3</name>
+	<description>Spring Boot with FreeMarker</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
diff --git a/Chapter3-1-3/src/main/java/com/didispace/web/HelloController.java b/Chapter3-1-3/src/main/java/com/didispace/web/HelloController.java
index 11f8c65f..e2f09e5e 100644
--- a/Chapter3-1-3/src/main/java/com/didispace/web/HelloController.java
+++ b/Chapter3-1-3/src/main/java/com/didispace/web/HelloController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  *
diff --git a/Chapter3-1-4/pom.xml b/Chapter3-1-4/pom.xml
index c7f70586..e1de1174 100755
--- a/Chapter3-1-4/pom.xml
+++ b/Chapter3-1-4/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.didispace</groupId>
-	<artifactId>demo</artifactId>
+	<artifactId>Chapter3-1-4</artifactId>
 	<version>1.0.0</version>
 	<packaging>jar</packaging>
 
-	<name>demo</name>
-	<description>Spring Boot Web project</description>
+	<name>Chapter3-1-4</name>
+	<description>Spring Boot with Velocity</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
diff --git a/Chapter3-1-4/src/main/java/com/didispace/web/HelloController.java b/Chapter3-1-4/src/main/java/com/didispace/web/HelloController.java
index 11f8c65f..e2f09e5e 100644
--- a/Chapter3-1-4/src/main/java/com/didispace/web/HelloController.java
+++ b/Chapter3-1-4/src/main/java/com/didispace/web/HelloController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  *
diff --git a/Chapter3-1-5/pom.xml b/Chapter3-1-5/pom.xml
index 69068183..7e6758f0 100755
--- a/Chapter3-1-5/pom.xml
+++ b/Chapter3-1-5/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.didispace</groupId>
-	<artifactId>SpringBootWithSwagger</artifactId>
+	<artifactId>Chapter3-1-5</artifactId>
 	<version>1.0.0</version>
 	<packaging>jar</packaging>
 
-	<name>SpringBootWithSwagger</name>
-	<description>SpringBootWithSwagger</description>
+	<name>Chapter3-1-5</name>
+	<description>Spring Boot with Swagger2</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>