add free marker

zhuzhengping911 · zhuzhengping911 · commit d381967a1a20 · 2017-04-16T22:23:00.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -112,6 +112,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+		<!--freemaker依赖 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-freemarker</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/com/controller/HelloWordController.java b/src/main/java/com/controller/HelloWordController.java
@@ -4,35 +4,38 @@
 import com.compont.ZzpProperties;
 import com.dao.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpSession;
+import java.util.Date;
+import java.util.Map;
 import java.util.UUID;
 
 /**
  * Created by zhuzhengping on 2017/2/1.
  * 第一个helloworld类
  */
-@SpringBootApplication
-@RestController //注解-该类返回的都是json格式
+@Controller("template.freemarkerController") //注解-该类返回的都是json格式
 public class HelloWordController {
 
     @Autowired
     private ZzpProperties zzpProperties;
     @Autowired
     private UserRepository userRepository;
 
-    @RequestMapping(value = "/hello",method = RequestMethod.GET)
-    public String HelloWorld(){
-        return "HelloWorld,SpringBoot!!!";
+    @RequestMapping(value = "/template/freemarker/welcome")
+    public String HelloWorld(Map<String,Object> map){
+
+        map.put("time",new Date());
+        map.put("message","zzp");
+        return "welcome";
     }
 
 
diff --git a/src/main/resources/templates/welcome.ftl b/src/main/resources/templates/welcome.ftl
@@ -0,0 +1,7 @@
+<!<!doctype html>
+<html lang="en">
+<body>
+    Date: ${time?date}<br>
+Message: ${message}
+</body>
+</html>
