diff --git a/README.md b/README.md index 1523eb76702a371e5df964e687a7e9ebf9ad0182..43068293478ed598fde9ac6a6a5b608e62ad473d 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社区： -- 微信公众号：往下翻^_^ +- 微信：[![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) -**敬请关注** +**持续更新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 5dd3dfcdcdc7b7f7a110f2783daa6b7ce53c8bf7..0000000000000000000000000000000000000000 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 b191686ba7e1f4382a65c03cbab6de61a0b6711c..0000000000000000000000000000000000000000 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 91299af8cd6c6437ab1f609b5df2aa4e99f0e30d..f428cb4042efd5d9f3b615d4a2988f7588e86cb6 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 d5992537c3b15a2a0b7678e473090fb2cc7bca99..72c3db1eb00ee6a9e21a12d4c6c6080bb717492d 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 749136504b6f5af16f708fabcc517a36767f41a4..3395b4b391b61803c11eec6bcdceee33bde3d185 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 c9f0d44ee4b4df1cc2d824061443ae8ad32f70a5..e7117731cd6e44ff008c62e89af6d84d417aa308 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 3a5eecd538d6f95928ca17553799ac0fe3572e37..a86e5298e8b0835f31347fa4b43e9950c94e0472 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 f8645527b649e3f18828c48b1d50874cd290e058..bf0e48f13d11c5032dd3884be3b2dc79f7422e2e 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 7eba532aaba273efac6d1ec1768da9e8b9406b2b..db3b01060384da0c42b4dbfacd07be6c248bd4e6 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 3b9a18a526c63d6b4d31f481705ab30845d383c7..e0c87aa517d10b41300b428ded621a921b391c64 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 bd34ca19737f473d8a39cce409d83f040f5ec95f..20bf7244c7c428bbd239d96b93fd3e1f884a9c7c 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 1f2ba6047bc0ebe9a3b1c4364b6247cdbf4b8963..8cfd9384e427e1c5d708d5d078c582aa7cfb30a7 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 916f3e33dc9eac4686a1ddb09ffe4d5a9cab27dc..3ca1a7d85295cc5621dc1e7392318328f516f54a 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 afbae1d2463692bfb0f13493356047df9a9f9139..884f882bf53eff5e3630d6fc11a5d3fdf83a8d16 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 d83cd497d4cabf416bacf35548e792dd4ebc688d..87f99a6cbd8b3f440ca12f779e6a9c6b6b81a588 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 0572783bb546d636b6ea78b933bac7fb8e45ffa6..78ff64b768f471081802c6d9a40cc56ef07a1bf5 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 0aad4b43589afd7a5f5ec9810c3e7df9f66cd8f9..a60cd1866a3a1b6a13fff1baa3ef5f7cd2fb8901 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 365b761bcc4f0484fc76638fe1fe7ddc5ab0fc95..d3507bc6961d0e6efaaeaef34a3d53daf32e404c 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 961f04e83b2d6c2b8a7ccd1e6322d53a27976b29..52df38d3d6a51e1e9fd2a980a47f1d298a1084d2 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 a9f3cf722f59f178734e19c16bb9df3fbff7f3cc..b76ffeb0f2e1ee34ff728a8855449d70c9936f5f 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 365b761bcc4f0484fc76638fe1fe7ddc5ab0fc95..d3507bc6961d0e6efaaeaef34a3d53daf32e404c 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 5e66ed87429ea1690d098150ab227b55235d9e5d..c2d54dca58473d304eae1303725e847a7f0063d4 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 882462e01f8a42f85e9edb10bc3dd8502f6a78eb..943e2a2b3b56fa6809f4b5ae694c87d00ad6a803 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 325392e95f9c7c42957bb9538a2643511cdd1f92..3a1c2eeec9e839193d3db053623b50364c8ca950 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 97a4178d72f791057ecaf8975f1b25b6d276158f..1b4752bd81684dad0c0264e73143db21e8694d0f 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 749136504b6f5af16f708fabcc517a36767f41a4..3395b4b391b61803c11eec6bcdceee33bde3d185 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 c9f0d44ee4b4df1cc2d824061443ae8ad32f70a5..e7117731cd6e44ff008c62e89af6d84d417aa308 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 3a5eecd538d6f95928ca17553799ac0fe3572e37..a86e5298e8b0835f31347fa4b43e9950c94e0472 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 f8645527b649e3f18828c48b1d50874cd290e058..bf0e48f13d11c5032dd3884be3b2dc79f7422e2e 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 7eba532aaba273efac6d1ec1768da9e8b9406b2b..db3b01060384da0c42b4dbfacd07be6c248bd4e6 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 3b9a18a526c63d6b4d31f481705ab30845d383c7..e0c87aa517d10b41300b428ded621a921b391c64 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 bd34ca19737f473d8a39cce409d83f040f5ec95f..20bf7244c7c428bbd239d96b93fd3e1f884a9c7c 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 1f2ba6047bc0ebe9a3b1c4364b6247cdbf4b8963..8cfd9384e427e1c5d708d5d078c582aa7cfb30a7 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 916f3e33dc9eac4686a1ddb09ffe4d5a9cab27dc..3ca1a7d85295cc5621dc1e7392318328f516f54a 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 afbae1d2463692bfb0f13493356047df9a9f9139..884f882bf53eff5e3630d6fc11a5d3fdf83a8d16 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 d83cd497d4cabf416bacf35548e792dd4ebc688d..87f99a6cbd8b3f440ca12f779e6a9c6b6b81a588 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