Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/i3plus-core-apiservice/src/main/resources/application-dev.properties

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.controller;
 
-import cn.estsh.i3plus.icloud.core.controller.DemoCoreCloudInterface;
+import cn.estsh.i3plus.icloud.core.sdk.ICoreDemoCloud;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
@@ -18,7 +18,7 @@ public class DemoCloudController {
     private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class);
 
     @Autowired
-    DemoCoreCloudInterface demoCloudInterface;
+    ICoreDemoCloud coreDemoCloud;
 
     @GetMapping(value="/test")
     @ApiOperation(value="测试",notes = "测试")
@@ -26,22 +26,22 @@ public class DemoCloudController {
         LOGGER.info("【接受数据】{}",test);
 
         try {
-            demoCloudInterface.testGet("get = " + test);
+            coreDemoCloud.testGet("get = " + test);
         }catch (Exception e){
             LOGGER.error("XXXX --> get调用出错：" + e.getMessage(),e);
         }
         try {
-            demoCloudInterface.testPost("post = " + test);
+            coreDemoCloud.testPost("post = " + test);
         }catch (Exception e){
             LOGGER.error("XXXX --> post调用出错：" + e.getMessage(),e);
         }
         try {
-            demoCloudInterface.testPut("testPut = " + test);
+            coreDemoCloud.testPut("testPut = " + test);
         }catch (Exception e){
             LOGGER.error("XXXX --> testPut调用出错：" + e.getMessage(),e);
         }
         try {
-            demoCloudInterface.testDelete("delete = " + test);
+            coreDemoCloud.testDelete("delete = " + test);
         }catch (Exception e){
             LOGGER.error("XXXX --> delete调用出错：" + e.getMessage(),e);
         }

modules/i3plus-core-apiservice/src/main/resources/application-dev.properties

@@ -29,15 +29,15 @@ eureka.client.enabled=true
 #默认微服主机
 eureka.client.serviceUrl.defaultZone:http://192.168.1.20:8000/eureka/
 #本服务主机ip
-eureka.instance.ip-address=192.168.1.20
+eureka.instance.ip-address=192.168.1.25
 #本服务实例ID
-#eureka.instance.instance-id=${project.name}:${server.port}
+eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
 #本服务主机名
 eureka.instance.hostname=${eureka.instance.ip-address}
+#本服务状态页面
+eureka.instance.status-page-url=http://${eureka.instance.ip-address}:${server.port}/swagger-ui.html
 #显示本服务ip
 eureka.instance.prefer-ip-address=true
-#服务中心查看的状态页面
-eureka.instance.status-page-url=http://${eureka.instance.ip-address}:${server.port}/swagger-ui.html
 #心跳间隔周期，宕机限制（秒），90秒没反应视为宕机
 eureka.instance.lease-expiration-duration-in-seconds=90
 #心跳周期