From a4fde176f49f306ec2a645872bd1497f1718f071 Mon Sep 17 00:00:00 2001
From: macro <zhenghong1991@126.com>
Date: Tue, 22 Oct 2019 15:52:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9mall-search=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E7=9A=84=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mall-demo/pom.xml                             |  2 +-
 .../controller/FeignSearchController.java     | 31 +++++++++++++++++++
 .../mall/demo/service/FeignSearchService.java | 18 +++++++++++
 mall-portal/pom.xml                           |  2 +-
 pom.xml                                       |  2 ++
 5 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 mall-demo/src/main/java/com/macro/mall/demo/controller/FeignSearchController.java
 create mode 100644 mall-demo/src/main/java/com/macro/mall/demo/service/FeignSearchService.java

diff --git a/mall-demo/pom.xml b/mall-demo/pom.xml
index ff533cf..d3f8042 100644
--- a/mall-demo/pom.xml
+++ b/mall-demo/pom.xml
@@ -9,7 +9,7 @@
     <packaging>jar</packaging>
 
     <name>mall-demo</name>
-    <description>Demo project for Spring Boot</description>
+    <description>mall-demo project for mall</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/mall-demo/src/main/java/com/macro/mall/demo/controller/FeignSearchController.java b/mall-demo/src/main/java/com/macro/mall/demo/controller/FeignSearchController.java
new file mode 100644
index 0000000..a7b9655
--- /dev/null
+++ b/mall-demo/src/main/java/com/macro/mall/demo/controller/FeignSearchController.java
@@ -0,0 +1,31 @@
+package com.macro.mall.demo.controller;
+
+import com.macro.mall.common.api.CommonResult;
+import com.macro.mall.demo.service.FeignSearchService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Feign调用mall-search接口示例
+ * Created by macro on 2019/10/22.
+ */
+@Api(tags = "FeignSearchController", description = "Feign调用mall-search接口示例")
+@RestController
+@RequestMapping("/feign/search")
+public class FeignSearchController {
+
+    @Autowired
+    private FeignSearchService feignSearchService;
+
+    @ApiOperation(value = "简单商品搜索")
+    @RequestMapping(value = "/justSearch", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult search(@RequestParam(required = false) String keyword,
+                               @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+                               @RequestParam(required = false, defaultValue = "5") Integer pageSize) {
+
+        return feignSearchService.search(keyword, pageNum, pageSize);
+    }
+}
diff --git a/mall-demo/src/main/java/com/macro/mall/demo/service/FeignSearchService.java b/mall-demo/src/main/java/com/macro/mall/demo/service/FeignSearchService.java
new file mode 100644
index 0000000..1b9a73f
--- /dev/null
+++ b/mall-demo/src/main/java/com/macro/mall/demo/service/FeignSearchService.java
@@ -0,0 +1,18 @@
+package com.macro.mall.demo.service;
+
+import com.macro.mall.common.api.CommonResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * Created by macro on 2019/10/22.
+ */
+@FeignClient("mall-search")
+public interface FeignSearchService {
+
+    @GetMapping("/esProduct/search/simple")
+    CommonResult search(@RequestParam(required = false) String keyword,
+                        @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+                        @RequestParam(required = false, defaultValue = "5") Integer pageSize);
+}
diff --git a/mall-portal/pom.xml b/mall-portal/pom.xml
index 068df6e..e0d9e30 100644
--- a/mall-portal/pom.xml
+++ b/mall-portal/pom.xml
@@ -9,7 +9,7 @@
     <packaging>jar</packaging>
 
     <name>mall-portal</name>
-    <description>Demo project for Spring Boot</description>
+    <description>mall-portal project for mall</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/pom.xml b/pom.xml
index 54852e5..fa6062b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,8 @@
         <module>mall-search</module>
         <module>mall-portal</module>
         <module>mall-registry</module>
+        <module>mall-monitor</module>
+        <module>mall-gateway</module>
     </modules>
 
     <parent>