diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml
index 92f0c8b..2d4d3b5 100644
--- a/modules/i3plus-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@@ -14,7 +14,13 @@
jar
+
+
+ i3plus.surface
+ i3plus-icloud-core
+
+
i3plus.pojo
i3plus-pojo-platform
@@ -29,16 +35,12 @@
i3plus-pojo-base
-
- i3plus.core
- i3plus-core-icloud
-
-
i3plus.core
i3plus-core-api
+
impp.framework
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 e3ef47a..7417df5 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,11 +1,7 @@
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.icloud.core.controller.DemoCloudInterface;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
-import cn.estsh.impp.framework.boot.exception.ImppBusiException;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,12 +10,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
@RestController
@RequestMapping("/cloud")
@Api(description="分布式服务测试")
public class DemoCloudController {
+
private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class);
@Autowired
@@ -82,4 +77,11 @@ public class DemoCloudController {
LOGGER.info("【delete接受数据】{}",test);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}
+
+ @PutMapping(value="/test-cloud-put")
+ @ApiOperation(value="测试cloudput",notes = "测试cloudput")
+ public ResultBean putTestCloud(String test) {
+ LOGGER.info("【put--->{}",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 099ddd9..f820166 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
@@ -1,6 +1,7 @@
#项目端口
server.port=8080
+################ 授权过滤配置 ################
#用户登陆路径
filter.shiro.user.loginuri = /login
#系统管理员登陆路径
@@ -15,21 +16,25 @@ filter.shiro.admin.filteruri = /adoperate/*
#用户授权过滤路径
filter.shiro.saadmin.filteruri = /saoperate/*
-
+################ 跨域提交 ################
#是否允许前端跨域提交impp.web.cross.hosts
-impp.web.cross = false
-#允许前端跨域提交ip地址,多个以逗号分隔
-impp.web.cross.hosts = http://localhost
+impp.web.cross = true
+#允许前端跨域提交的域名,多个以逗号分隔
+#impp.web.cross.hosts = http://localhost
################ 云配置 (以projectName作为应用名) ################
#是否开启客户端
-eureka.client.enabled=true
-ribbon.eureka.enable=true
+#eureka.client.enabled=true
+#ribbon.eureka.enable=true
#默认主机
-eureka.client.serviceUrl.defaultZone:http://192.168.1.123:8000/eureka
+eureka.client.serviceUrl.defaultZone:http://192.168.1.123:8000/eureka/
+#显示服务ip
+eureka.instance.prefer-ip-address=true
#本服务实例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.status-page-url=http://${eureka.instance.ip-address}:${server.port}/swagger-ui.html
diff --git a/modules/i3plus-core-icloud/pom.xml b/modules/i3plus-core-icloud/pom.xml
deleted file mode 100644
index 458bab6..0000000
--- a/modules/i3plus-core-icloud/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
- i3plus-core
- i3plus.core
- 1.0-SNAPSHOT
- ../../pom.xml
-
- 4.0.0
-
- i3plus-core-icloud
- jar
-
-
-
- org.springframework
- spring-web
-
-
-
-
- org.springframework.cloud
- spring-cloud-starter-openfeign
-
-
-
- i3plus.pojo
- i3plus-pojo-base
-
-
-
-
-
-
-
-
- org.springframework.cloud
- spring-cloud-dependencies
- ${spring-cloud.version}
- pom
- import
-
-
-
-
-
\ 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
deleted file mode 100644
index 80c4585..0000000
--- a/modules/i3plus-core-icloud/src/main/java/cn/estsh/i3plus/core/api/controller/DemoCloudInterface.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.estsh.i3plus.core.api.controller;
-
-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;
-
-//CommonEnumUtil
-@FeignClient(name="core",path="/cloud")
-public interface DemoCloudInterface {
-
- @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
deleted file mode 100644
index 9fdabce..0000000
--- a/modules/i3plus-core-icloud/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-ribbon.eureka.enabled=true
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dec18ca..243ba4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,6 @@
modules/i3plus-core-api
modules/i3plus-core-apiservice
- modules/i3plus-core-icloud
@@ -23,7 +22,7 @@
- CORE
+ i3core
UTF-8
UTF-8
1.8
@@ -101,7 +100,14 @@
${project.version}
-
+
+
+ i3plus.surface
+ i3plus-icloud-core
+ ${project.version}
+
+
+
mysql
mysql-connector-java