I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core

Browse Source
yun-zuoyi
wei.peng 7 years ago
parent 03b7bc0803 b68025dda1
commit 239c9e83d7
7 changed files with 37 additions and 107 deletions
Show Stats Download Patch File Download Diff File

12
modules/i3plus-core-apiservice/pom.xml
Unescape Escape View File

@ -14,7 +14,13 @@
<packaging>jar</packaging>
<dependencies>
<!-- 微服调用 -->
<dependency>
<groupId>i3plus.surface</groupId>
<artifactId>i3plus-icloud-core</artifactId>
</dependency>
<!-- 对象 -->
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-platform</artifactId>
@ -29,16 +35,12 @@
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
<dependency>
<groupId>i3plus.core</groupId>
<artifactId>i3plus-core-icloud</artifactId>
</dependency>
<!-- api调用 -->
<dependency>
<groupId>i3plus.core</groupId>
<artifactId>i3plus-core-api</artifactId>
</dependency>
<!-- impp framework -->
<dependency>
<groupId>impp.framework</groupId>

16
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java
Unescape Escape View File

@ -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());
}
}

19
modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
Unescape Escape View File

@ -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

52
modules/i3plus-core-icloud/pom.xml
Unescape Escape View File

@ -1,52 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-core</artifactId>
<groupId>i3plus.core</groupId>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-core-icloud</artifactId>
<packaging>jar</packaging>
<dependencies>
<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>

32
modules/i3plus-core-icloud/src/main/java/cn/estsh/i3plus/core/api/controller/DemoCloudInterface.java
Unescape Escape View File

@ -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);
}

1
modules/i3plus-core-icloud/src/main/resources/application.properties
Unescape Escape View File

@ -1 +0,0 @@
ribbon.eureka.enabled=true

12
pom.xml
Unescape Escape View File

@ -11,7 +11,6 @@
<modules>
<module>modules/i3plus-core-api</module>
<module>modules/i3plus-core-apiservice</module>
<module>modules/i3plus-core-icloud</module>
</modules>
<parent>
@ -23,7 +22,7 @@
<properties>
<!--项目名称，需要修改，参照CommonEnumUtil.SOFT_TYPE-->
<project.name>CORE</project.name>
<project.name>i3core</project.name>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
@ -101,7 +100,14 @@
<version>${project.version}</version>
</dependency>
<!-- mysql -->
<!-- wei'fu微服调用 -->
<dependency>
<groupId>i3plus.surface</groupId>
<artifactId>i3plus-icloud-core</artifactId>
<version>${project.version}</version>
</dependency>
<!-- mysql -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>

Write Preview
Loading…
Cancel
Save