diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml
index 2ff810d..cb6d3a8 100644
--- a/modules/i3plus-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@@ -17,6 +17,11 @@
i3plus.pojo
+ i3plus-pojo-platform
+
+
+
+ i3plus.pojo
i3plus-pojo-model
@@ -24,6 +29,10 @@
i3plus-pojo-base
+
+ i3plus.core
+ i3plus-core-icloud
+
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java
index e151089..e3ef47a 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java
@@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.controller;
+import cn.estsh.i3plus.core.api.controller.DemoCloudInterface;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
@@ -10,9 +11,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -22,11 +22,64 @@ import java.util.List;
public class DemoCloudController {
private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class);
+ @Autowired
+ DemoCloudInterface demoCloudInterface;
+
@GetMapping(value="/test")
@ApiOperation(value="测试",notes = "测试")
public ResultBean simpleTest(String test) {
- LOGGER.info("【接受数据】{}" + test);
+ LOGGER.info("【接受数据】{}",test);
+
+ try {
+ demoCloudInterface.testGet("get = " + test);
+ }catch (Exception e){
+ LOGGER.error("XXXX --> get调用出错:" + e.getMessage(),e);
+ }
+ try {
+ demoCloudInterface.testPost("post = " + test);
+ }catch (Exception e){
+ LOGGER.error("XXXX --> post调用出错:" + e.getMessage(),e);
+ }
+ try {
+ demoCloudInterface.testPut("testPut = " + test);
+ }catch (Exception e){
+ LOGGER.error("XXXX --> testPut调用出错:" + e.getMessage(),e);
+ }
+ try {
+ demoCloudInterface.testDelete("delete = " + test);
+ }catch (Exception e){
+ LOGGER.error("XXXX --> delete调用出错:" + e.getMessage(),e);
+ }
+
test += "cloud return = ";
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}
+
+ @GetMapping(value="/test-get")
+ @ApiOperation(value="测试get",notes = "测试get")
+ public ResultBean testFeignGet(String test) {
+ LOGGER.info("【get接受数据】{}" ,test);
+ return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+ }
+
+ @PostMapping(value="/test-post")
+ @ApiOperation(value="测试post",notes = "测试post")
+ public ResultBean testFeignPost(String test) {
+ LOGGER.info("【post接受数据】{}" ,test);
+ return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+ }
+
+ @PostMapping(value="/test-put")
+ @ApiOperation(value="put接受数据",notes = "put接受数据")
+ public ResultBean testPut(String test) {
+ LOGGER.info("【put接受数据】{}", test);
+ return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+ }
+
+ @DeleteMapping(value="/test-delete")
+ @ApiOperation(value="delete接受数据",notes = "delete接受数据")
+ public ResultBean testDelete(String test) {
+ LOGGER.info("【delete接受数据】{}",test);
+ return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+ }
}
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
index 1a104b7..099ddd9 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
@@ -1,5 +1,5 @@
#项目端口
-server.port=8081
+server.port=8080
#用户登陆路径
filter.shiro.user.loginuri = /login
@@ -21,12 +21,15 @@ impp.web.cross = false
#允许前端跨域提交ip地址,多个以逗号分隔
impp.web.cross.hosts = http://localhost
-################ 云配置 ################
+################ 云配置 (以projectName作为应用名) ################
+#是否开启客户端
+eureka.client.enabled=true
+ribbon.eureka.enable=true
#默认主机
eureka.client.serviceUrl.defaultZone:http://192.168.1.123:8000/eureka
#本服务实例ID
eureka.instance.instance-id=${project.name}:${server.port}
-eureka.instance.hostname=${project.name}Server
+eureka.instance.hostname=192.168.1.138
eureka.instance.ip-address=192.168.1.138
#服务中心查看的状态页面
eureka.instance.status-page-url=http://${eureka.instance.ip-address}:${server.port}/swagger-ui.html