Skip to content

Commit d7daac7

Browse files
itmuch001itmuch001
committed
升级到edgware，配套第二版
1 parent 543bf07 commit d7daac7

File tree

37 files changed

+81
-100
lines changed

37 files changed

+81
-100
lines changed

‎README.md

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,20 @@
1-
# 《Spring Cloud与Docker微服务架构实战》Docker章节（12-14章）配套代码
1+
# 《Spring Cloud与Docker微服务架构实战 第二版》Docker章节（12-14章）配套代码
22

3-
- 本Repo是《Spring Cloud与Docker微服务架构实战 - 周立》Docker章节（12-14章）的配套代码
4-
- 所有Docker Compose采用Version 2 file format编写。
3+
- 本Repo是《Spring Cloud与Docker微服务架构实战 **第二版**》Docker章节（12-14章）的配套代码，**第一版**的配套源码详见Camden分支。
4+
- 所有Docker Compose采用Version 3 file format编写。
55
- 1-11章配套代码详见：<http://git.oschina.net/itmuch/spring-cloud-docker-microservice-book-code>
66

77

88

99

10-
11-
12-
## 购书链接
13-
14-
* 京东购书链接
15-
16-
![](ad/jd-购书链接.png)
17-
18-
​
19-
20-
21-
22-
23-
24-
2510
## 交流
2611

2712
- QQ群：731548893，欢迎加入
2813
- 个人博客：[http://www.itmuch.com](http://www.itmuch.com)
29-
- Spring For Al社区：<http://www.spring4all.com>
30-
- 微信公众号：往下翻^_^
14+
- 微信：[![img](https://gitee.com/itmuch/spring-cloud-docker-microservice-book-code/raw/master/wx.jpg)](https://gitee.com/itmuch/spring-cloud-docker-microservice-book-code/raw/master/wx.jpg)
3115

3216

33-
**敬请关注**
17+
**持续更新Spring Cloud、Docker相关知识**，敬请关注！！
3418

3519

3620

@@ -65,6 +49,3 @@
6549

6650

6751

68-
## 全书目录
69-
70-
![目录](http://git.oschina.net/itmuch/spring-cloud-docker-microservice-book-code/raw/master/ad/catalog.png)

‎ad/amz-购书链接.jpg

-151 KB
Binary file not shown.

‎ad/jd-购书链接.png

-143 KB
Binary file not shown.

‎docker-1-simple/docker-compose-easy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2'
1+
version: '3'
22
services:
33
discovery:
44
image: itmuch/microservice-discovery-eureka:0.0.1-SNAPSHOT

‎docker-1-simple/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2' # 表示该docker-compose.yml文件使用的是Version 2 file format
1+
version: '3' # 表示该docker-compose.yml文件使用的是Version 2 file format
22
services: # Version 2 file format的固定写法，为project定义服务。
33
microservice-discovery-eureka: # 指定服务名称
44
image: itmuch/microservice-discovery-eureka:0.0.1-SNAPSHOT # 指定服务所使用的镜像

‎docker-1-simple/microservice-consumer-movie-ribbon-hystrix/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.4.2.RELEASE</version>
14+
<version>1.5.9.RELEASE</version>
1515
</parent>
1616

1717
<properties>
@@ -31,12 +31,12 @@
3131

3232
<dependency>
3333
<groupId>org.springframework.cloud</groupId>
34-
<artifactId>spring-cloud-starter-eureka</artifactId>
34+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
3535
</dependency>
3636

3737
<dependency>
3838
<groupId>org.springframework.cloud</groupId>
39-
<artifactId>spring-cloud-starter-hystrix</artifactId>
39+
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
4040
</dependency>
4141
</dependencies>
4242

@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>org.springframework.cloud</groupId>
4848
<artifactId>spring-cloud-dependencies</artifactId>
49-
<version>Camden.SR2</version>
49+
<version>Edgware.RELEASE</version>
5050
<type>pom</type>
5151
<scope>import</scope>
5252
</dependency>

‎docker-1-simple/microservice-discovery-eureka/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.4.2.RELEASE</version>
14+
<version>1.5.9.RELEASE</version>
1515
</parent>
1616

1717
<properties>
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-eureka-server</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
2626
</dependency>
2727
</dependencies>
2828

@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.springframework.cloud</groupId>
3434
<artifactId>spring-cloud-dependencies</artifactId>
35-
<version>Camden.SR2</version>
35+
<version>Edgware.RELEASE</version>
3636
<type>pom</type>
3737
<scope>import</scope>
3838
</dependency>

‎docker-1-simple/microservice-discovery-eureka/pom.xml-bak1-快速入门，最简单的示例

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-eureka-server</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
2626
</dependency>
2727
</dependencies>
2828

‎docker-1-simple/microservice-discovery-eureka/pom.xml.bak2-指定Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-eureka-server</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
2626
</dependency>
2727
</dependencies>
2828

‎docker-1-simple/microservice-discovery-eureka/pom.xml.bak3-绑定某个phase运行

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-eureka-server</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
2626
</dependency>
2727
</dependencies>
2828

‎docker-1-simple/microservice-discovery-eureka/pom.xml.bak4-推送镜像到Docker Hub

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-eureka-server</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
2626
</dependency>
2727
</dependencies>
2828

‎docker-1-simple/microservice-discovery-eureka/pom.xml.bak5-使用imageTags指定标签

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-eureka-server</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
2626
</dependency>
2727
</dependencies>
2828

‎docker-1-simple/microservice-gateway-zuul/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.4.2.RELEASE</version>
14+
<version>1.5.9.RELEASE</version>
1515
</parent>
1616

1717
<properties>
@@ -22,11 +22,11 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-zuul</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.springframework.cloud</groupId>
29-
<artifactId>spring-cloud-starter-eureka</artifactId>
29+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
3030
</dependency>
3131
</dependencies>
3232

@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>org.springframework.cloud</groupId>
3838
<artifactId>spring-cloud-dependencies</artifactId>
39-
<version>Camden.SR2</version>
39+
<version>Edgware.RELEASE</version>
4040
<type>pom</type>
4141
<scope>import</scope>
4242
</dependency>

‎docker-1-simple/microservice-hystrix-dashboard/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.4.2.RELEASE</version>
14+
<version>1.5.9.RELEASE</version>
1515
</parent>
1616

1717
<properties>
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
2626
</dependency>
2727
</dependencies>
2828

@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.springframework.cloud</groupId>
3434
<artifactId>spring-cloud-dependencies</artifactId>
35-
<version>Camden.SR2</version>
35+
<version>Edgware.RELEASE</version>
3636
<type>pom</type>
3737
<scope>import</scope>
3838
</dependency>

‎docker-1-simple/microservice-hystrix-turbine/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.4.2.RELEASE</version>
14+
<version>1.5.9.RELEASE</version>
1515
</parent>
1616

1717
<properties>
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-turbine</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
2626
</dependency>
2727
</dependencies>
2828

@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.springframework.cloud</groupId>
3434
<artifactId>spring-cloud-dependencies</artifactId>
35-
<version>Camden.SR2</version>
35+
<version>Edgware.RELEASE</version>
3636
<type>pom</type>
3737
<scope>import</scope>
3838
</dependency>

‎docker-1-simple/microservice-provider-user/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.4.2.RELEASE</version>
14+
<version>1.5.9.RELEASE</version>
1515
</parent>
1616

1717
<properties>
@@ -39,7 +39,7 @@
3939

4040
<dependency>
4141
<groupId>org.springframework.cloud</groupId>
42-
<artifactId>spring-cloud-starter-eureka</artifactId>
42+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
4343
</dependency>
4444
</dependencies>
4545

@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>org.springframework.cloud</groupId>
5151
<artifactId>spring-cloud-dependencies</artifactId>
52-
<version>Camden.SR2</version>
52+
<version>Edgware.RELEASE</version>
5353
<type>pom</type>
5454
<scope>import</scope>
5555
</dependency>

‎docker-2-eureka-ha/docker-compose-wrong.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "2" # 表示使用docker-compose.yml的Version 2 file format编写
1+
version: "3" # 表示使用docker-compose.yml的Version 3 file format编写
22
services:
33
microservice-discovery-eureka-ha1:
44
hostname: peer1 # 指定hostname

‎docker-2-eureka-ha/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "2"
1+
version: "3"
22
services:
33
peer1: # 默认情况下，其他服务可使用服务名称连接到该服务。对于peer2节点，它需连接http://peer1:8761/eureka/，因此，我们可配置该服务的名称为peer1。
44
image: itmuch/microservice-discovery-eureka-ha:0.0.1-SNAPSHOT

‎docker-2-eureka-ha/microservice-discovery-eureka-ha/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.4.2.RELEASE</version>
14+
<version>1.5.9.RELEASE</version>
1515
</parent>
1616

1717
<properties>
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-eureka-server</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
2626
</dependency>
2727
</dependencies>
2828

@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.springframework.cloud</groupId>
3434
<artifactId>spring-cloud-dependencies</artifactId>
35-
<version>Camden.SR2</version>
35+
<version>Edgware.RELEASE</version>
3636
<type>pom</type>
3737
<scope>import</scope>
3838
</dependency>

‎docker-3-complex/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "2"
1+
version: "3"
22
services:
33
peer1:
44
image: itmuch/microservice-discovery-eureka-ha:0.0.1-SNAPSHOT

‎docker-3-complex/microservice-consumer-movie-ribbon-hystrix/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.4.2.RELEASE</version>
14+
<version>1.5.9.RELEASE</version>
1515
</parent>
1616

1717
<properties>
@@ -31,12 +31,12 @@
3131

3232
<dependency>
3333
<groupId>org.springframework.cloud</groupId>
34-
<artifactId>spring-cloud-starter-eureka</artifactId>
34+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
3535
</dependency>
3636

3737
<dependency>
3838
<groupId>org.springframework.cloud</groupId>
39-
<artifactId>spring-cloud-starter-hystrix</artifactId>
39+
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
4040
</dependency>
4141
</dependencies>
4242

@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>org.springframework.cloud</groupId>
4848
<artifactId>spring-cloud-dependencies</artifactId>
49-
<version>Camden.SR2</version>
49+
<version>Edgware.RELEASE</version>
5050
<type>pom</type>
5151
<scope>import</scope>
5252
</dependency>

‎docker-3-complex/microservice-discovery-eureka-ha/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.4.2.RELEASE</version>
14+
<version>1.5.9.RELEASE</version>
1515
</parent>
1616

1717
<properties>
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
25-
<artifactId>spring-cloud-starter-eureka-server</artifactId>
25+
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
2626
</dependency>
2727
</dependencies>
2828

@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.springframework.cloud</groupId>
3434
<artifactId>spring-cloud-dependencies</artifactId>
35-
<version>Camden.SR2</version>
35+
<version>Edgware.RELEASE</version>
3636
<type>pom</type>
3737
<scope>import</scope>
3838
</dependency>

0 commit comments

Comments
 (0)