✨ spring-boot-template-freemarker 完成

xkcoding · xkcoding · commit ef59e18d803e · 2018-10-09T16:56:19.000+08:00
diff --git a/spring-boot-demo-template-freemarker/.gitignore b/spring-boot-demo-template-freemarker/.gitignore
diff --git a/spring-boot-demo-template-freemarker/README.md b/spring-boot-demo-template-freemarker/README.md
@@ -1,4 +1,4 @@
-# spring-boot-template-freemarker
+# spring-boot-demo-template-freemarker
 
 > 本 demo 主要演示了 Spring Boot 项目如何集成 freemarker 模板引擎
 
diff --git a/spring-boot-demo-template-freemarker/pom.xml b/spring-boot-demo-template-freemarker/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.xkcoding</groupId>
-	<artifactId>spring-boot-template-freemarker</artifactId>
+	<artifactId>spring-boot-demo-template-freemarker</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>spring-boot-template-freemarker</name>
+	<name>spring-boot-demo-template-freemarker</name>
 	<description>Demo project for Spring Boot</description>
 
 	<parent>
@@ -55,7 +55,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>spring-boot-template-freemarker</finalName>
+		<finalName>spring-boot-demo-template-freemarker</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java b/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java
@@ -17,9 +17,9 @@
  * @modified: yangkai.shen
  */
 @SpringBootApplication
-public class SpringBootTemplateFreemarkerApplication {
+public class SpringBootDemoTemplateFreemarkerApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SpringBootTemplateFreemarkerApplication.class, args);
+		SpringApplication.run(SpringBootDemoTemplateFreemarkerApplication.class, args);
 	}
 }
diff --git a/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java b/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java
@@ -34,7 +34,7 @@ public ModelAndView index(HttpServletRequest request) {
 		if (ObjectUtil.isNull(user)) {
 			mv.setViewName("redirect:/user/login");
 		} else {
-			mv.setViewName("index");
+			mv.setViewName("page/index");
 			mv.addObject(user);
 		}
 
diff --git a/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java b/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java
@@ -40,6 +40,6 @@ public ModelAndView login(User user, HttpServletRequest request) {
 
 	@GetMapping("/login")
 	public ModelAndView login() {
-		return new ModelAndView("login");
+		return new ModelAndView("page/login");
 	}
 }
diff --git a/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java b/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java
diff --git a/spring-boot-demo-template-freemarker/src/main/resources/application.yml b/spring-boot-demo-template-freemarker/src/main/resources/application.yml
@@ -0,0 +1,8 @@
+server:
+  port: 8080
+  servlet:
+    context-path: /demo
+spring:
+  freemarker:
+    suffix: .ftl
+    cache: false
diff --git a/spring-boot-demo-template-freemarker/src/main/resources/templates/common/head.ftl b/spring-boot-demo-template-freemarker/src/main/resources/templates/common/head.ftl
diff --git a/spring-boot-demo-template-freemarker/src/main/resources/templates/page/index.ftl b/spring-boot-demo-template-freemarker/src/main/resources/templates/page/index.ftl
@@ -1,6 +1,6 @@
 <!doctype html>
 <html lang="en">
-<#include "./common/head.ftl">
+<#include "../common/head.ftl">
 <body>
 <div id="app" style="margin: 20px 20%">
 	欢迎登录，${user.name}！
diff --git a/spring-boot-demo-template-freemarker/src/main/resources/templates/page/login.ftl b/spring-boot-demo-template-freemarker/src/main/resources/templates/page/login.ftl
@@ -1,6 +1,6 @@
 <!doctype html>
 <html lang="en">
-<#include "./common/head.ftl">
+<#include "../common/head.ftl">
 <body>
 <div id="app" style="margin: 20px 20%">
 	<form action="/demo/user/login" method="post">
diff --git a/spring-boot-demo-template-freemarker/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java b/spring-boot-demo-template-freemarker/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java
@@ -7,7 +7,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class SpringBootTemplateFreemarkerApplicationTests {
+public class SpringBootDemoTemplateFreemarkerApplicationTests {
 
 	@Test
 	public void contextLoads() {
diff --git a/spring-boot-template-freemarker/src/main/resources/application.yml b/spring-boot-template-freemarker/src/main/resources/application.yml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# spring-boot-template-freemarker`
	`1`	`+# spring-boot-demo-template-freemarker`
`2`	`2`
`3`	`3`	`> 本 demo 主要演示了 Spring Boot 项目如何集成 freemarker 模板引擎`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@`
`17`	`17`	`* @modified: yangkai.shen`
`18`	`18`	`*/`
`19`	`19`	`@SpringBootApplication`
`20`		`-public class SpringBootTemplateFreemarkerApplication {`
	`20`	`+public class SpringBootDemoTemplateFreemarkerApplication {`
`21`	`21`
`22`	`22`	`public static void main(String[] args) {`
`23`		`- SpringApplication.run(SpringBootTemplateFreemarkerApplication.class, args);`
	`23`	`+ SpringApplication.run(SpringBootDemoTemplateFreemarkerApplication.class, args);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public ModelAndView index(HttpServletRequest request) {`
`34`	`34`	`if (ObjectUtil.isNull(user)) {`
`35`	`35`	`mv.setViewName("redirect:/user/login");`
`36`	`36`	`} else {`
`37`		`- mv.setViewName("index");`
	`37`	`+ mv.setViewName("page/index");`
`38`	`38`	`mv.addObject(user);`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ public ModelAndView login(User user, HttpServletRequest request) {`
`40`	`40`
`41`	`41`	`@GetMapping("/login")`
`42`	`42`	`public ModelAndView login() {`
`43`		`- return new ModelAndView("login");`
	`43`	`+ return new ModelAndView("page/login");`
`44`	`44`	`}`
`45`	`45`	`}`