Skip to content

Commit cf53d82

Browse files
charlesvhecharlesvhe
committed
升级到spring cloud F版
1 parent 50d6404 commit cf53d82

File tree

24 files changed

+305
-229
lines changed

24 files changed

+305
-229
lines changed

‎venus-cloud-feign-dependencies/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<properties>
1414
<spring.boot.version>2.0.1.RELEASE</spring.boot.version>
15-
<spring.cloud.version>Finchley.RC1</spring.cloud.version>
15+
<spring.cloud.version>Finchley.RELEASE</spring.cloud.version>
1616
<springfox-swagger2.version>2.8.0</springfox-swagger2.version>
1717
</properties>
1818

‎venus-cloud-feign-sample/consumer/pom.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<groupId>cn.springcloud.feign</groupId>
7+
<artifactId>venus-cloud-feign-sample</artifactId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>venus-cloud-feign-sample-consumer</artifactId>
13+
<packaging>pom</packaging>
14+
<modules>
15+
<module>service</module>
16+
</modules>
17+
</project>

‎venus-cloud-feign-sample/consumer/service/pom.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<groupId>cn.springcloud.feign</groupId>
7+
<artifactId>venus-cloud-feign-sample</artifactId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>venus-cloud-feign-sample-consumer-service</artifactId>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.springframework.cloud</groupId>
17+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
18+
</dependency>
19+
<dependency>
20+
<groupId>cn.springcloud.feign</groupId>
21+
<artifactId>venus-cloud-feign-sample-provider-api</artifactId>
22+
</dependency>
23+
<dependency>
24+
<groupId>cn.springcloud.feign</groupId>
25+
<artifactId>venus-cloud-starter-feign</artifactId>
26+
</dependency>
27+
</dependencies>
28+
</project>

‎venus-cloud-feign-sample/consumer/service/src/main/java/cn/springcloud/feign/sample/consumer/ConsumerApplication.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package cn.springcloud.feign.sample.consumer;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
6+
import org.springframework.cloud.openfeign.EnableFeignClients;
7+
8+
@EnableFeignClients(basePackages = "cn.springcloud.feign.sample")
9+
@SpringBootApplication
10+
@EnableDiscoveryClient
11+
public class ConsumerApplication {
12+
public static void main(String[] args) {
13+
SpringApplication.run(ConsumerApplication.class, args);
14+
}
15+
16+
}

‎venus-cloud-feign-sample/consumer/service/src/main/java/cn/springcloud/feign/sample/consumer/service/TestService.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package cn.springcloud.feign.sample.consumer.service;
2+
3+
import cn.springcloud.feign.sample.provider.service.ProviderService;
4+
import cn.springcloud.feign.sample.provider.vo.Pojo;
5+
import org.springframework.beans.factory.annotation.Autowired;
6+
import org.springframework.web.bind.annotation.GetMapping;
7+
import org.springframework.web.bind.annotation.RestController;
8+
9+
import java.util.Date;
10+
11+
@RestController
12+
public class TestService {
13+
14+
@Autowired
15+
private ProviderService providerService;
16+
17+
18+
@GetMapping("/test")
19+
public String test() {
20+
Pojo pojo = new Pojo();
21+
pojo.setName("charles");
22+
pojo.setAge(18);
23+
pojo.setBirthday(new Date());
24+
return "Test " + providerService.hello(1L, null);
25+
}
26+
27+
}

‎venus-cloud-feign-sample/consumer/service/src/main/resources/application.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
spring.application.name=consumer
2+
server.port=28080
3+
4+
eureka.client.serviceUrl.defaultZone=http://localhost:8761/eureka/
5+
eureka.instance.preferIpAddress=true

‎venus-cloud-feign-sample/eureka/pom.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<groupId>cn.springcloud.feign</groupId>
7+
<artifactId>venus-cloud-feign-sample</artifactId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>venus-cloud-feign-sample-eureka</artifactId>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.springframework.cloud</groupId>
17+
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
18+
</dependency>
19+
</dependencies>
20+
</project>

‎venus-cloud-feign-sample/eureka/src/main/java/cn/springcloud/dubbo/demo/eureka/EurekaApplication.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package cn.springcloud.dubbo.demo.eureka;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
6+
7+
@SpringBootApplication
8+
@EnableEurekaServer
9+
public class EurekaApplication {
10+
public static void main(String[] args) {
11+
SpringApplication.run(EurekaApplication.class, args);
12+
}
13+
14+
}

‎venus-cloud-feign-sample/eureka/src/main/resources/application.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
spring.application.name=eureka
2+
server.port=8761

‎venus-cloud-feign-sample/pom.xml‎

Lines changed: 23 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,49 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.springframework.boot</groupId>
6+
<artifactId>spring-boot-starter-parent</artifactId>
7+
<version>2.0.1.RELEASE</version>
8+
</parent>
49

510
<groupId>cn.springcloud.feign</groupId>
611
<artifactId>venus-cloud-feign-sample</artifactId>
712
<version>0.0.1-SNAPSHOT</version>
13+
<packaging>pom</packaging>
814

915
<name>venus-cloud-feign-sample</name>
1016
<url>http://maven.apache.org</url>
1117

18+
<modules>
19+
<module>eureka</module>
20+
<module>provider</module>
21+
<module>consumer</module>
22+
</modules>
23+
1224
<properties>
13-
<java.version>1.8</java.version>
14-
<maven.compiler.source>${java.version}</maven.compiler.source>
15-
<maven.compiler.target>${java.version}</maven.compiler.target>
16-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18-
<spring.boot.version>2.0.0.RELEASE</spring.boot.version>
19-
<spring.cloud.version>Finchley.RC1</spring.cloud.version>
25+
<spring.cloud.version>Finchley.RELEASE</spring.cloud.version>
2026
</properties>
2127

2228
<dependencyManagement>
2329
<dependencies>
24-
<dependency>
25-
<groupId>org.springframework.boot</groupId>
26-
<artifactId>spring-boot-dependencies</artifactId>
27-
<version>${spring.boot.version}</version>
28-
<type>pom</type>
29-
<scope>import</scope>
30-
</dependency>
31-
3230
<dependency>
3331
<groupId>org.springframework.cloud</groupId>
3432
<artifactId>spring-cloud-dependencies</artifactId>
3533
<version>${spring.cloud.version}</version>
3634
<type>pom</type>
3735
<scope>import</scope>
3836
</dependency>
37+
<dependency>
38+
<groupId>cn.springcloud.feign</groupId>
39+
<artifactId>venus-cloud-starter-feign</artifactId>
40+
<version>${project.version}</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>cn.springcloud.feign</groupId>
44+
<artifactId>venus-cloud-feign-sample-provider-api</artifactId>
45+
<version>${project.version}</version>
46+
</dependency>
3947
</dependencies>
4048
</dependencyManagement>
41-
42-
<dependencies>
43-
44-
<dependency>
45-
<groupId>cn.springcloud.feign</groupId>
46-
<artifactId>venus-cloud-feign</artifactId>
47-
<version>0.0.1-SNAPSHOT</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.springframework.boot</groupId>
51-
<artifactId>spring-boot-starter-web</artifactId>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.springframework.cloud</groupId>
55-
<artifactId>spring-cloud-starter-openfeign</artifactId>
56-
</dependency>
57-
<dependency>
58-
<groupId>io.springfox</groupId>
59-
<artifactId>springfox-swagger2</artifactId>
60-
<version>2.8.0</version>
61-
<scope>provided</scope>
62-
</dependency>
63-
64-
<dependency>
65-
<groupId>org.springframework.boot</groupId>
66-
<artifactId>spring-boot-starter-test</artifactId>
67-
<scope>test</scope>
68-
</dependency>
69-
</dependencies>
70-
<build>
71-
<plugins>
72-
<plugin>
73-
<groupId>org.springframework.boot</groupId>
74-
<artifactId>spring-boot-maven-plugin</artifactId>
75-
</plugin>
76-
</plugins>
77-
</build>
78-
79-
<!--spring cloud F版release后删除-->
80-
<repositories>
81-
<repository>
82-
<id>spring-milestones</id>
83-
<name>Spring Milestones</name>
84-
<url>https://repo.spring.io/libs-milestone</url>
85-
<snapshots>
86-
<enabled>false</enabled>
87-
</snapshots>
88-
</repository>
89-
</repositories>
90-
9149
</project>

0 commit comments

Comments
 (0)