From 89f13b93b4603b0ea841ba09948023d18b3b0740 Mon Sep 17 00:00:00 2001
From: "frin.fei" <123456>
Date: Thu, 15 Nov 2018 11:33:33 +0800
Subject: [PATCH] =?UTF-8?q?eureka=E3=80=81feign=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-core-icloud/pom.xml                 | 31 +++++++++++++++++++++-
 .../core/api/controller/DemoCloudInterface.java    | 28 +++++++++++++++----
 .../src/main/resources/application.properties      |  1 +
 pom.xml                                            | 12 ++++-----
 4 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100644 modules/i3plus-core-icloud/src/main/resources/application.properties

diff --git a/modules/i3plus-core-icloud/pom.xml b/modules/i3plus-core-icloud/pom.xml
index 12c8679..458bab6 100644
--- a/modules/i3plus-core-icloud/pom.xml
+++ b/modules/i3plus-core-icloud/pom.xml
@@ -14,10 +14,39 @@
     <packaging>jar</packaging>
 
     <dependencies>
-        <!-- impp framework -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+
+        <!-- impp framework
         <dependency>
             <groupId>impp.framework</groupId>
             <artifactId>impp-framework-boot</artifactId>
+        </dependency> -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
+
     </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <!--云依赖-->
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+
+    </dependencyManagement>
 </project>
\ No newline at end of file
diff --git a/modules/i3plus-core-icloud/src/main/java/cn/estsh/i3plus/core/api/controller/DemoCloudInterface.java b/modules/i3plus-core-icloud/src/main/java/cn/estsh/i3plus/core/api/controller/DemoCloudInterface.java
index 7bd0c4a..80c4585 100644
--- a/modules/i3plus-core-icloud/src/main/java/cn/estsh/i3plus/core/api/controller/DemoCloudInterface.java
+++ b/modules/i3plus-core-icloud/src/main/java/cn/estsh/i3plus/core/api/controller/DemoCloudInterface.java
@@ -1,14 +1,32 @@
 package cn.estsh.i3plus.core.api.controller;
 
-import cn.estsh.impp.framework.boot.util.ResultBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient("/cloud")
+//CommonEnumUtil
+@FeignClient(name="core",path="/cloud")
 public interface DemoCloudInterface {
 
-    @GetMapping(value="/test")
-    @ApiOperation(value="测试",notes = "测试")
-    ResultBean simpleTest(String test);
+    @RequestMapping(value="/test-get",method= RequestMethod.GET)
+    @ApiOperation(value="测试分布式调用GET",notes = "测试分布式调用GET")
+    BaseResultBean testGet(@RequestParam("test") String test);
+
+    @RequestMapping(value="/test-post",method= RequestMethod.POST)
+    @ApiOperation(value="测试分布式调用POST",notes = "测试分布式调用POST")
+    BaseResultBean testPost(@RequestParam("test") String test);
+
+
+    @RequestMapping(value="/test-put",method= RequestMethod.PUT)
+    @ApiOperation(value="测试分布式调用PUT",notes = "测试分布式调用PUT")
+    BaseResultBean testPut(@RequestParam("test") String test);
+
+
+    @RequestMapping(value="/test-delete",method= RequestMethod.DELETE)
+    @ApiOperation(value="测试分布式调用DELETE",notes = "测试分布式调用DELETE")
+    BaseResultBean testDelete(@RequestParam("test") String test);
 }
diff --git a/modules/i3plus-core-icloud/src/main/resources/application.properties b/modules/i3plus-core-icloud/src/main/resources/application.properties
new file mode 100644
index 0000000..9fdabce
--- /dev/null
+++ b/modules/i3plus-core-icloud/src/main/resources/application.properties
@@ -0,0 +1 @@
+ribbon.eureka.enabled=true
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 98ff20e..dec18ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,12 +44,6 @@
     </properties>
 
     <dependencies>
-        <!-- 外部对象模型 -->
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-wms</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -62,6 +56,12 @@
             </dependency>
 
             <dependency>
+                <groupId>i3plus.core</groupId>
+                <artifactId>i3plus-core-icloud</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-model</artifactId>
                 <version>${project.version}</version>