diff --git a/pom.xml b/pom.xml
index d8e528ce863da5b212255a8fdf26a002ea132999..8fc355c23bd489f3fd81739afa5651267f084f9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,16 @@
commons-lang3
3.1
+
+ com.alibaba
+ fastjson
+ 1.2.83
+
+
+ org.jsoup
+ jsoup
+ 1.15.3
+
diff --git a/src/main/java/com/kwan/shuyu/controller/ContentController.java b/src/main/java/com/kwan/shuyu/controller/ContentController.java
new file mode 100644
index 0000000000000000000000000000000000000000..accb6d4d65e041be72b542c3ec5a16c78f445ca5
--- /dev/null
+++ b/src/main/java/com/kwan/shuyu/controller/ContentController.java
@@ -0,0 +1,61 @@
+package com.kwan.shuyu.controller;
+
+import com.kwan.shuyu.service.ContentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+public class ContentController {
+
+ @Autowired
+ private ContentService contentService;
+
+ /**
+ * 从京东爬取关键字信息(title、price、src)存放到es中
+ *
+ * @param keyword
+ * @return
+ * @throws Exception
+ */
+ @GetMapping("/parse/{keyword}")
+ @ResponseBody
+ public Boolean parse(@PathVariable String keyword) throws Exception {
+ return contentService.parseContent(keyword);
+ }
+
+ /**
+ * 从es中查询相关的信息 参数一:关键字 参数二:页码 参数三:显示条数
+ *
+ * @param keyword
+ * @param pageNo
+ * @param pageSize
+ * @return
+ * @throws IOException
+ */
+ @GetMapping("/search/{keyword}/{pageNo}/{pageSize}")
+ @ResponseBody
+ public List