From 8c00e5e36f701857b498c452ecc2f95f152b7a1f Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Fri, 16 Nov 2018 15:45:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 f820166..43d8f44 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -23,19 +23,19 @@ impp.web.cross = true #impp.web.cross.hosts = http://localhost ################ 云配置 （以projectName作为应用名） ################ -#是否开启客户端 -#eureka.client.enabled=true +#是否开启微服 +eureka.client.enabled=true #ribbon.eureka.enable=true -#默认主机 -eureka.client.serviceUrl.defaultZone:http://192.168.1.123:8000/eureka/ -#显示服务ip -eureka.instance.prefer-ip-address=true +#本服务主机ip +eureka.instance.ip-address=192.168.1.20 +#默认微服主机 +eureka.client.serviceUrl.defaultZone:http://${eureka.instance.ip-address}:8000/eureka/ #本服务实例ID eureka.instance.instance-id=${project.name}:${server.port} #本服务主机名 -eureka.instance.hostname=192.168.1.138 -#本服务主机ip -eureka.instance.ip-address=192.168.1.138 +eureka.instance.hostname=${eureka.instance.ip-address} +#显示本服务ip +eureka.instance.prefer-ip-address=true #服务中心查看的状态页面 eureka.instance.status-page-url=http://${eureka.instance.ip-address}:${server.port}/swagger-ui.html #心跳间隔周期，宕机限制（秒），90秒没反应视为宕机 From 7ba41c5876ad1c47755de643e169d01fb21c5cdf Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Mon, 19 Nov 2018 11:20:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 43d8f44..1d99390 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -26,18 +26,18 @@ impp.web.cross = true #是否开启微服 eureka.client.enabled=true #ribbon.eureka.enable=true -#本服务主机ip -eureka.instance.ip-address=192.168.1.20 #默认微服主机 -eureka.client.serviceUrl.defaultZone:http://${eureka.instance.ip-address}:8000/eureka/ +eureka.client.serviceUrl.defaultZone:http://192.168.1.20:8000/eureka/ +#本服务主机ip +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 #心跳周期 From fe99b500287f2282eacbdfbb00796186925218e3 Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Mon, 19 Nov 2018 14:18:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=B3=A8=E5=86=8C=E4=B8=AD=E5=BF=83icloud=20center=20?= =?UTF-8?q?service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/DemoCloudController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 a39c5ff..52fdda4 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,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); } From a76a6ad4dbf20ef726a9633d1b84a935519fce08 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Mon, 19 Nov 2018 14:29:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 43d8f44..cc9fa87 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -26,12 +26,12 @@ impp.web.cross = true #是否开启微服 eureka.client.enabled=true #ribbon.eureka.enable=true +#默认微服主机 +eureka.client.serviceUrl.defaultZone:http://192.168.1.20:8000/eureka/ #本服务主机ip eureka.instance.ip-address=192.168.1.20 -#默认微服主机 -eureka.client.serviceUrl.defaultZone:http://${eureka.instance.ip-address}:8000/eureka/ #本服务实例ID -eureka.instance.instance-id=${project.name}:${server.port} +#eureka.instance.instance-id=${project.name}:${server.port} #本服务主机名 eureka.instance.hostname=${eureka.instance.ip-address} #显示本服务ip