diff --git a/README.md b/README.md index 1523eb7..24e10a7 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,20 @@ -# 《Spring Cloud与Docker微服务架构实战》Docker章节（12-14章）配套代码 +# 《Spring Cloud与Docker微服务架构实战 第二版》Docker章节（12-14章）配套代码 -- 本Repo是《Spring Cloud与Docker微服务架构实战 - 周立》Docker章节（12-14章）的配套代码 -- 所有Docker Compose采用Version 2 file format编写。 +- 本Repo是《Spring Cloud与Docker微服务架构实战 **第二版**》Docker章节（12-14章）的配套代码，**第一版**的配套源码详见Camden分支。 +- 所有Docker Compose采用Version 3 file format编写。 - 1-11章配套代码详见： - - -## 购书链接 - -* 京东购书链接 - - ![](ad/jd-购书链接.png) - - ​ - - - - - - ## 交流 - QQ群：731548893，欢迎加入 - 个人博客：[http://www.itmuch.com](http://www.itmuch.com) -- Spring For Al社区： -- 微信公众号：往下翻^_^ +- 微信：![微信公众号](wx.jpg) -**敬请关注** +**持续更新Spring Cloud、Docker相关知识**，敬请关注！！ @@ -65,6 +49,3 @@ -## 全书目录 - -![目录](http://git.oschina.net/itmuch/spring-cloud-docker-microservice-book-code/raw/master/ad/catalog.png) \ No newline at end of file diff --git "a/ad/amz-\350\264\255\344\271\246\351\223\276\346\216\245.jpg" "b/ad/amz-\350\264\255\344\271\246\351\223\276\346\216\245.jpg" deleted file mode 100644 index 5dd3dfc..0000000 Binary files "a/ad/amz-\350\264\255\344\271\246\351\223\276\346\216\245.jpg" and /dev/null differ diff --git "a/ad/jd-\350\264\255\344\271\246\351\223\276\346\216\245.png" "b/ad/jd-\350\264\255\344\271\246\351\223\276\346\216\245.png" deleted file mode 100644 index b191686..0000000 Binary files "a/ad/jd-\350\264\255\344\271\246\351\223\276\346\216\245.png" and /dev/null differ diff --git a/docker-1-simple/docker-compose-easy.yml b/docker-1-simple/docker-compose-easy.yml index 91299af..f428cb4 100644 --- a/docker-1-simple/docker-compose-easy.yml +++ b/docker-1-simple/docker-compose-easy.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3' services: discovery: image: itmuch/microservice-discovery-eureka:0.0.1-SNAPSHOT diff --git a/docker-1-simple/docker-compose.yml b/docker-1-simple/docker-compose.yml index d599253..72c3db1 100644 --- a/docker-1-simple/docker-compose.yml +++ b/docker-1-simple/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2' # 表示该docker-compose.yml文件使用的是Version 2 file format +version: '3' # 表示该docker-compose.yml文件使用的是Version 2 file format services: # Version 2 file format的固定写法，为project定义服务。 microservice-discovery-eureka: # 指定服务名称 image: itmuch/microservice-discovery-eureka:0.0.1-SNAPSHOT # 指定服务所使用的镜像 diff --git a/docker-1-simple/microservice-consumer-movie-ribbon-hystrix/pom.xml b/docker-1-simple/microservice-consumer-movie-ribbon-hystrix/pom.xml index 7491365..3395b4b 100644 --- a/docker-1-simple/microservice-consumer-movie-ribbon-hystrix/pom.xml +++ b/docker-1-simple/microservice-consumer-movie-ribbon-hystrix/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -31,12 +31,12 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client org.springframework.cloud - spring-cloud-starter-hystrix + spring-cloud-starter-netflix-hystrix @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-1-simple/microservice-discovery-eureka/pom.xml b/docker-1-simple/microservice-discovery-eureka/pom.xml index c9f0d44..e711773 100644 --- a/docker-1-simple/microservice-discovery-eureka/pom.xml +++ b/docker-1-simple/microservice-discovery-eureka/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git "a/docker-1-simple/microservice-discovery-eureka/pom.xml-bak1-\345\277\253\351\200\237\345\205\245\351\227\250\357\274\214\346\234\200\347\256\200\345\215\225\347\232\204\347\244\272\344\276\213" "b/docker-1-simple/microservice-discovery-eureka/pom.xml-bak1-\345\277\253\351\200\237\345\205\245\351\227\250\357\274\214\346\234\200\347\256\200\345\215\225\347\232\204\347\244\272\344\276\213" index 3a5eecd..a86e529 100644 --- "a/docker-1-simple/microservice-discovery-eureka/pom.xml-bak1-\345\277\253\351\200\237\345\205\245\351\227\250\357\274\214\346\234\200\347\256\200\345\215\225\347\232\204\347\244\272\344\276\213" +++ "b/docker-1-simple/microservice-discovery-eureka/pom.xml-bak1-\345\277\253\351\200\237\345\205\245\351\227\250\357\274\214\346\234\200\347\256\200\345\215\225\347\232\204\347\244\272\344\276\213" @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git "a/docker-1-simple/microservice-discovery-eureka/pom.xml.bak2-\346\214\207\345\256\232Dockerfile" "b/docker-1-simple/microservice-discovery-eureka/pom.xml.bak2-\346\214\207\345\256\232Dockerfile" index f864552..bf0e48f 100644 --- "a/docker-1-simple/microservice-discovery-eureka/pom.xml.bak2-\346\214\207\345\256\232Dockerfile" +++ "b/docker-1-simple/microservice-discovery-eureka/pom.xml.bak2-\346\214\207\345\256\232Dockerfile" @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git "a/docker-1-simple/microservice-discovery-eureka/pom.xml.bak3-\347\273\221\345\256\232\346\237\220\344\270\252phase\350\277\220\350\241\214" "b/docker-1-simple/microservice-discovery-eureka/pom.xml.bak3-\347\273\221\345\256\232\346\237\220\344\270\252phase\350\277\220\350\241\214" index 7eba532..db3b010 100644 --- "a/docker-1-simple/microservice-discovery-eureka/pom.xml.bak3-\347\273\221\345\256\232\346\237\220\344\270\252phase\350\277\220\350\241\214" +++ "b/docker-1-simple/microservice-discovery-eureka/pom.xml.bak3-\347\273\221\345\256\232\346\237\220\344\270\252phase\350\277\220\350\241\214" @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git "a/docker-1-simple/microservice-discovery-eureka/pom.xml.bak4-\346\216\250\351\200\201\351\225\234\345\203\217\345\210\260Docker Hub" "b/docker-1-simple/microservice-discovery-eureka/pom.xml.bak4-\346\216\250\351\200\201\351\225\234\345\203\217\345\210\260Docker Hub" index 3b9a18a..e0c87aa 100644 --- "a/docker-1-simple/microservice-discovery-eureka/pom.xml.bak4-\346\216\250\351\200\201\351\225\234\345\203\217\345\210\260Docker Hub" +++ "b/docker-1-simple/microservice-discovery-eureka/pom.xml.bak4-\346\216\250\351\200\201\351\225\234\345\203\217\345\210\260Docker Hub" @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git "a/docker-1-simple/microservice-discovery-eureka/pom.xml.bak5-\344\275\277\347\224\250imageTags\346\214\207\345\256\232\346\240\207\347\255\276" "b/docker-1-simple/microservice-discovery-eureka/pom.xml.bak5-\344\275\277\347\224\250imageTags\346\214\207\345\256\232\346\240\207\347\255\276" index bd34ca1..20bf724 100644 --- "a/docker-1-simple/microservice-discovery-eureka/pom.xml.bak5-\344\275\277\347\224\250imageTags\346\214\207\345\256\232\346\240\207\347\255\276" +++ "b/docker-1-simple/microservice-discovery-eureka/pom.xml.bak5-\344\275\277\347\224\250imageTags\346\214\207\345\256\232\346\240\207\347\255\276" @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git a/docker-1-simple/microservice-gateway-zuul/pom.xml b/docker-1-simple/microservice-gateway-zuul/pom.xml index 1f2ba60..8cfd938 100644 --- a/docker-1-simple/microservice-gateway-zuul/pom.xml +++ b/docker-1-simple/microservice-gateway-zuul/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,11 +22,11 @@ org.springframework.cloud - spring-cloud-starter-zuul + spring-cloud-starter-netflix-zuul org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-1-simple/microservice-hystrix-dashboard/pom.xml b/docker-1-simple/microservice-hystrix-dashboard/pom.xml index 916f3e3..3ca1a7d 100644 --- a/docker-1-simple/microservice-hystrix-dashboard/pom.xml +++ b/docker-1-simple/microservice-hystrix-dashboard/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-hystrix-dashboard + spring-cloud-starter-netflix-hystrix-dashboard @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-1-simple/microservice-hystrix-turbine/pom.xml b/docker-1-simple/microservice-hystrix-turbine/pom.xml index afbae1d..884f882 100644 --- a/docker-1-simple/microservice-hystrix-turbine/pom.xml +++ b/docker-1-simple/microservice-hystrix-turbine/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-turbine + spring-cloud-starter-netflix-turbine @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-1-simple/microservice-provider-user/pom.xml b/docker-1-simple/microservice-provider-user/pom.xml index d83cd49..87f99a6 100644 --- a/docker-1-simple/microservice-provider-user/pom.xml +++ b/docker-1-simple/microservice-provider-user/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -39,7 +39,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -49,7 +49,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-2-eureka-ha/docker-compose-wrong.yml b/docker-2-eureka-ha/docker-compose-wrong.yml index 0572783..78ff64b 100644 --- a/docker-2-eureka-ha/docker-compose-wrong.yml +++ b/docker-2-eureka-ha/docker-compose-wrong.yml @@ -1,4 +1,4 @@ -version: "2" # 表示使用docker-compose.yml的Version 2 file format编写 +version: "3" # 表示使用docker-compose.yml的Version 3 file format编写 services: microservice-discovery-eureka-ha1: hostname: peer1 # 指定hostname diff --git a/docker-2-eureka-ha/docker-compose.yml b/docker-2-eureka-ha/docker-compose.yml index 0aad4b4..a60cd18 100644 --- a/docker-2-eureka-ha/docker-compose.yml +++ b/docker-2-eureka-ha/docker-compose.yml @@ -1,4 +1,4 @@ -version: "2" +version: "3" services: peer1: # 默认情况下，其他服务可使用服务名称连接到该服务。对于peer2节点，它需连接http://peer1:8761/eureka/，因此，我们可配置该服务的名称为peer1。 image: itmuch/microservice-discovery-eureka-ha:0.0.1-SNAPSHOT diff --git a/docker-2-eureka-ha/microservice-discovery-eureka-ha/pom.xml b/docker-2-eureka-ha/microservice-discovery-eureka-ha/pom.xml index 365b761..d3507bc 100644 --- a/docker-2-eureka-ha/microservice-discovery-eureka-ha/pom.xml +++ b/docker-2-eureka-ha/microservice-discovery-eureka-ha/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-3-complex/docker-compose.yml b/docker-3-complex/docker-compose.yml index 961f04e..52df38d 100644 --- a/docker-3-complex/docker-compose.yml +++ b/docker-3-complex/docker-compose.yml @@ -1,4 +1,4 @@ -version: "2" +version: "3" services: peer1: image: itmuch/microservice-discovery-eureka-ha:0.0.1-SNAPSHOT diff --git a/docker-3-complex/microservice-consumer-movie-ribbon-hystrix/pom.xml b/docker-3-complex/microservice-consumer-movie-ribbon-hystrix/pom.xml index a9f3cf7..b76ffeb 100644 --- a/docker-3-complex/microservice-consumer-movie-ribbon-hystrix/pom.xml +++ b/docker-3-complex/microservice-consumer-movie-ribbon-hystrix/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -31,12 +31,12 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client org.springframework.cloud - spring-cloud-starter-hystrix + spring-cloud-starter-netflix-hystrix @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-3-complex/microservice-discovery-eureka-ha/pom.xml b/docker-3-complex/microservice-discovery-eureka-ha/pom.xml index 365b761..d3507bc 100644 --- a/docker-3-complex/microservice-discovery-eureka-ha/pom.xml +++ b/docker-3-complex/microservice-discovery-eureka-ha/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-3-complex/microservice-gateway-zuul/pom.xml b/docker-3-complex/microservice-gateway-zuul/pom.xml index 5e66ed8..c2d54dc 100644 --- a/docker-3-complex/microservice-gateway-zuul/pom.xml +++ b/docker-3-complex/microservice-gateway-zuul/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,11 +22,11 @@ org.springframework.cloud - spring-cloud-starter-zuul + spring-cloud-starter-netflix-zuul org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-3-complex/microservice-hystrix-turbine/pom.xml b/docker-3-complex/microservice-hystrix-turbine/pom.xml index 882462e..943e2a2 100644 --- a/docker-3-complex/microservice-hystrix-turbine/pom.xml +++ b/docker-3-complex/microservice-hystrix-turbine/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-turbine + spring-cloud-starter-netflix-turbine @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-3-complex/microservice-provider-user/pom.xml b/docker-3-complex/microservice-provider-user/pom.xml index 325392e..3a1c2ee 100644 --- a/docker-3-complex/microservice-provider-user/pom.xml +++ b/docker-3-complex/microservice-provider-user/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -39,7 +39,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -49,7 +49,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-host/docker-compose.yml b/docker-host/docker-compose.yml index 97a4178..1b4752b 100644 --- a/docker-host/docker-compose.yml +++ b/docker-host/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3' services: microservice-discovery-eureka: image: itmuch/microservice-discovery-eureka:0.0.1-SNAPSHOT diff --git a/docker-host/microservice-consumer-movie-ribbon-hystrix/pom.xml b/docker-host/microservice-consumer-movie-ribbon-hystrix/pom.xml index 7491365..3395b4b 100644 --- a/docker-host/microservice-consumer-movie-ribbon-hystrix/pom.xml +++ b/docker-host/microservice-consumer-movie-ribbon-hystrix/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -31,12 +31,12 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client org.springframework.cloud - spring-cloud-starter-hystrix + spring-cloud-starter-netflix-hystrix @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-host/microservice-discovery-eureka/pom.xml b/docker-host/microservice-discovery-eureka/pom.xml index c9f0d44..e711773 100644 --- a/docker-host/microservice-discovery-eureka/pom.xml +++ b/docker-host/microservice-discovery-eureka/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git "a/docker-host/microservice-discovery-eureka/pom.xml-bak1-\345\277\253\351\200\237\345\205\245\351\227\250\357\274\214\346\234\200\347\256\200\345\215\225\347\232\204\347\244\272\344\276\213" "b/docker-host/microservice-discovery-eureka/pom.xml-bak1-\345\277\253\351\200\237\345\205\245\351\227\250\357\274\214\346\234\200\347\256\200\345\215\225\347\232\204\347\244\272\344\276\213" index 3a5eecd..a86e529 100644 --- "a/docker-host/microservice-discovery-eureka/pom.xml-bak1-\345\277\253\351\200\237\345\205\245\351\227\250\357\274\214\346\234\200\347\256\200\345\215\225\347\232\204\347\244\272\344\276\213" +++ "b/docker-host/microservice-discovery-eureka/pom.xml-bak1-\345\277\253\351\200\237\345\205\245\351\227\250\357\274\214\346\234\200\347\256\200\345\215\225\347\232\204\347\244\272\344\276\213" @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git "a/docker-host/microservice-discovery-eureka/pom.xml.bak2-\346\214\207\345\256\232Dockerfile" "b/docker-host/microservice-discovery-eureka/pom.xml.bak2-\346\214\207\345\256\232Dockerfile" index f864552..bf0e48f 100644 --- "a/docker-host/microservice-discovery-eureka/pom.xml.bak2-\346\214\207\345\256\232Dockerfile" +++ "b/docker-host/microservice-discovery-eureka/pom.xml.bak2-\346\214\207\345\256\232Dockerfile" @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git "a/docker-host/microservice-discovery-eureka/pom.xml.bak3-\347\273\221\345\256\232\346\237\220\344\270\252phase\350\277\220\350\241\214" "b/docker-host/microservice-discovery-eureka/pom.xml.bak3-\347\273\221\345\256\232\346\237\220\344\270\252phase\350\277\220\350\241\214" index 7eba532..db3b010 100644 --- "a/docker-host/microservice-discovery-eureka/pom.xml.bak3-\347\273\221\345\256\232\346\237\220\344\270\252phase\350\277\220\350\241\214" +++ "b/docker-host/microservice-discovery-eureka/pom.xml.bak3-\347\273\221\345\256\232\346\237\220\344\270\252phase\350\277\220\350\241\214" @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git "a/docker-host/microservice-discovery-eureka/pom.xml.bak4-\346\216\250\351\200\201\351\225\234\345\203\217\345\210\260Docker Hub" "b/docker-host/microservice-discovery-eureka/pom.xml.bak4-\346\216\250\351\200\201\351\225\234\345\203\217\345\210\260Docker Hub" index 3b9a18a..e0c87aa 100644 --- "a/docker-host/microservice-discovery-eureka/pom.xml.bak4-\346\216\250\351\200\201\351\225\234\345\203\217\345\210\260Docker Hub" +++ "b/docker-host/microservice-discovery-eureka/pom.xml.bak4-\346\216\250\351\200\201\351\225\234\345\203\217\345\210\260Docker Hub" @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git "a/docker-host/microservice-discovery-eureka/pom.xml.bak5-\344\275\277\347\224\250imageTags\346\214\207\345\256\232\346\240\207\347\255\276" "b/docker-host/microservice-discovery-eureka/pom.xml.bak5-\344\275\277\347\224\250imageTags\346\214\207\345\256\232\346\240\207\347\255\276" index bd34ca1..20bf724 100644 --- "a/docker-host/microservice-discovery-eureka/pom.xml.bak5-\344\275\277\347\224\250imageTags\346\214\207\345\256\232\346\240\207\347\255\276" +++ "b/docker-host/microservice-discovery-eureka/pom.xml.bak5-\344\275\277\347\224\250imageTags\346\214\207\345\256\232\346\240\207\347\255\276" @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git a/docker-host/microservice-gateway-zuul/pom.xml b/docker-host/microservice-gateway-zuul/pom.xml index 1f2ba60..8cfd938 100644 --- a/docker-host/microservice-gateway-zuul/pom.xml +++ b/docker-host/microservice-gateway-zuul/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,11 +22,11 @@ org.springframework.cloud - spring-cloud-starter-zuul + spring-cloud-starter-netflix-zuul org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-host/microservice-hystrix-dashboard/pom.xml b/docker-host/microservice-hystrix-dashboard/pom.xml index 916f3e3..3ca1a7d 100644 --- a/docker-host/microservice-hystrix-dashboard/pom.xml +++ b/docker-host/microservice-hystrix-dashboard/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-hystrix-dashboard + spring-cloud-starter-netflix-hystrix-dashboard @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-host/microservice-hystrix-turbine/pom.xml b/docker-host/microservice-hystrix-turbine/pom.xml index afbae1d..884f882 100644 --- a/docker-host/microservice-hystrix-turbine/pom.xml +++ b/docker-host/microservice-hystrix-turbine/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-turbine + spring-cloud-starter-netflix-turbine @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/docker-host/microservice-provider-user/pom.xml b/docker-host/microservice-provider-user/pom.xml index d83cd49..87f99a6 100644 --- a/docker-host/microservice-provider-user/pom.xml +++ b/docker-host/microservice-provider-user/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.9.RELEASE @@ -39,7 +39,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -49,7 +49,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Edgware.RELEASE pom import diff --git a/wx.jpg b/wx.jpg new file mode 100644 index 0000000..f7b3546 Binary files /dev/null and b/wx.jpg differ