From 6fad589ed6a3f71b3099440c2f2bcdc3dac918cd Mon Sep 17 00:00:00 2001
From: macro <zhenghong1991@126.com>
Date: Fri, 18 Oct 2019 17:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9mall-portal=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

---
 .../demo/controller/FeignAdminController.java |  5 +---
 .../controller/FeignPortalController.java     | 30 +++++++++++++++++++
 .../mall/demo/service/FeignPortalService.java | 20 +++++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 mall-demo/src/main/java/com/macro/mall/demo/controller/FeignPortalController.java
 create mode 100644 mall-demo/src/main/java/com/macro/mall/demo/service/FeignPortalService.java

diff --git a/mall-demo/src/main/java/com/macro/mall/demo/controller/FeignAdminController.java b/mall-demo/src/main/java/com/macro/mall/demo/controller/FeignAdminController.java
index 265a320..90595b7 100644
--- a/mall-demo/src/main/java/com/macro/mall/demo/controller/FeignAdminController.java
+++ b/mall-demo/src/main/java/com/macro/mall/demo/controller/FeignAdminController.java
@@ -7,13 +7,10 @@ package com.macro.mall.demo.controller;
 import com.macro.mall.common.api.CommonResult;
 import com.macro.mall.demo.dto.UmsAdminLoginParam;
 import com.macro.mall.demo.service.FeignAdminService;
-import com.macro.mall.model.PmsBrand;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Feign调用mall-admin接口示例
  */
@@ -29,7 +26,7 @@ public class FeignAdminController {
         return adminService.login(loginParam);
     }
 
-    @GetMapping("/brand/listAll")
+    @GetMapping("/getBrandList")
     public CommonResult getBrandList(){
         return adminService.getList();
     }
diff --git a/mall-demo/src/main/java/com/macro/mall/demo/controller/FeignPortalController.java b/mall-demo/src/main/java/com/macro/mall/demo/controller/FeignPortalController.java
new file mode 100644
index 0000000..783982e
--- /dev/null
+++ b/mall-demo/src/main/java/com/macro/mall/demo/controller/FeignPortalController.java
@@ -0,0 +1,30 @@
+package com.macro.mall.demo.controller;
+
+import com.macro.mall.common.api.CommonResult;
+import com.macro.mall.demo.service.FeignPortalService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Feign调用mall-portal接口示例
+ * Created by macro on 2019/10/18.
+ */
+@Api(tags = "FeignPortalController", description = "Feign调用mall-portal接口示例")
+@RestController
+@RequestMapping("/feign/portal")
+public class FeignPortalController {
+
+    @Autowired
+    private FeignPortalService portalService;
+
+    @PostMapping("/login")
+    public CommonResult login(@RequestParam String username, @RequestParam String password) {
+        return portalService.login(username,password);
+    }
+
+    @GetMapping("/cartList")
+    public CommonResult cartList() {
+        return portalService.list();
+    }
+}
diff --git a/mall-demo/src/main/java/com/macro/mall/demo/service/FeignPortalService.java b/mall-demo/src/main/java/com/macro/mall/demo/service/FeignPortalService.java
new file mode 100644
index 0000000..6b604ae
--- /dev/null
+++ b/mall-demo/src/main/java/com/macro/mall/demo/service/FeignPortalService.java
@@ -0,0 +1,20 @@
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * Created by macro on 2019/10/18.
+ */
+@FeignClient("mall-portal")
+public interface FeignPortalService {
+
+    @PostMapping("/sso/login")
+    CommonResult login(@RequestParam String username, @RequestParam String password);
+
+    @GetMapping("/cart/list")
+    CommonResult list();
+}