diff --git a/README.md b/README.md index aac6bc568177e10a6d6f5ff3a5805cf409cdf029..5793ca92c824691f404f75287b7f52af4ffcc223 100644 --- a/README.md +++ b/README.md @@ -1,46 +1,25 @@ -# 《Spring Cloud与Docker微服务架构实战》1-11章配套代码 +# 《Spring Cloud与Docker微服务架构实战 第二版》1-11章配套代码 -* 本Repo是《Spring Cloud与Docker微服务架构实战》的配套代码 +* 本仓库是《Spring Cloud与Docker微服务架构实战 **第二版**》的配套代码，第一套的源码请看Camden分支。 * 包含60+个DEMO -* 覆盖的项目有Eureka、Ribbon、Feign、Hystrix、Zuul、Spring Cloud Config、Spring Cloud Bus、Spring Cloud Sleuth等，**其中，Sleuth一章的配套代码详见trace目录。其他代码都在根目录** +* 覆盖了 + * Eureka + * Ribbon + * Feign + * Hystrix + * Zuul + * Spring Cloud Config + * Spring Cloud Bus + * Spring Cloud Sleuth等学习示例，**其中，Sleuth一章的配套代码详见trace目录。其他代码都在根目录** * 12-14章配套代码详见： - - - -## 购书链接 - -* 京东购书链接 - - ![](ad/jd-购书链接.png) - - - - - - - ## 交流 -* QQ群：157525002（2000人群，已满）、**564840207（2000人群，欢迎加入）** +* QQ群：731548893，欢迎加入 * 个人博客：[http://www.itmuch.com](http://www.itmuch.com) * Spring For All 社区： -* 微信公众号：往下翻 ^_^ **敬请关注！！** - - - - - - -## 目录 - -* Word版本：[目录下载](ad/catalog.doc) - -* 图片版本 - -![](ad/catalog.png) 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/catalog.doc b/ad/catalog.doc deleted file mode 100644 index cdd3b67093ed6a753c96010314dd94c684e31e34..0000000000000000000000000000000000000000 Binary files a/ad/catalog.doc and /dev/null differ diff --git a/ad/catalog.png b/ad/catalog.png deleted file mode 100644 index 779a73557b70cd8d1c935730e32f8608aa4cd58b..0000000000000000000000000000000000000000 Binary files a/ad/catalog.png 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/additional-microservice-consumer-movie-ribbon-exception-but-no-fallback/pom.xml b/additional-microservice-consumer-movie-ribbon-exception-but-no-fallback/pom.xml index 7d609e43aaa70e7a5b29f436ec9dfe7d23616f3f..e30a690e9f6687e929a3cac5c60f23c3318778f3 100644 --- a/additional-microservice-consumer-movie-ribbon-exception-but-no-fallback/pom.xml +++ b/additional-microservice-consumer-movie-ribbon-exception-but-no-fallback/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud - spring-cloud-starter-hystrix + spring-cloud-starter-netflix-hystrix @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/additional-microservice-consumer-movie-ribbon-hystrix-get-the-exception/pom.xml b/additional-microservice-consumer-movie-ribbon-hystrix-get-the-exception/pom.xml index 944df7aa213ff8aa0b39858e01fd0c00ea5a9ae5..41274127093e6f26c775f1204700d025cd56204e 100644 --- a/additional-microservice-consumer-movie-ribbon-hystrix-get-the-exception/pom.xml +++ b/additional-microservice-consumer-movie-ribbon-hystrix-get-the-exception/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-client-authenticating/pom.xml b/microservice-config-client-authenticating/pom.xml index ce3b7d5b208d1f8324ad9d8164c1de5e079ad74a..8cb5a298168777e73485258372999f71493fd339 100644 --- a/microservice-config-client-authenticating/pom.xml +++ b/microservice-config-client-authenticating/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-client-eureka-authenticating/pom.xml b/microservice-config-client-eureka-authenticating/pom.xml index 815642503a7e8c0d80855c2b1fbebbc538b6d768..3cc05834c29de0a9737b883117254e1741a8ad05 100644 --- a/microservice-config-client-eureka-authenticating/pom.xml +++ b/microservice-config-client-eureka-authenticating/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -30,7 +30,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -40,7 +40,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-client-eureka/pom.xml b/microservice-config-client-eureka/pom.xml index e2200be30075c19dc3c3fdba26c9de937768296a..a670cc9497c993eebf6cedae227a10ea1ce77bab 100644 --- a/microservice-config-client-eureka/pom.xml +++ b/microservice-config-client-eureka/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -30,7 +30,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -40,7 +40,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-client-refresh-cloud-bus/pom.xml b/microservice-config-client-refresh-cloud-bus/pom.xml index f5002f768e0c62430e37612b4a8991d597cd093a..0c7e380d9d3e75c4c284e9f9f93518662b317427 100644 --- a/microservice-config-client-refresh-cloud-bus/pom.xml +++ b/microservice-config-client-refresh-cloud-bus/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -44,7 +44,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-client-refresh/pom.xml b/microservice-config-client-refresh/pom.xml index 167d1a6d37548918c3aa7a4e1abfded30b9e355d..dc0205cc2009480c4f2b91887e2995f7d6d24bc4 100644 --- a/microservice-config-client-refresh/pom.xml +++ b/microservice-config-client-refresh/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -40,7 +40,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-client/pom.xml b/microservice-config-client/pom.xml index 20152eeb0aa6b44bc23458a2d6baac5bfd5eebad..fc8d84fec9021f5aab182481e7f23e49dc623a8c 100644 --- a/microservice-config-client/pom.xml +++ b/microservice-config-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-server-authenticating/pom.xml b/microservice-config-server-authenticating/pom.xml index 08a5b2792ec241eca17d111f0ed13ee086009168..b13f4ecc26d05b8b76ec2a793982c3baa882f78b 100644 --- a/microservice-config-server-authenticating/pom.xml +++ b/microservice-config-server-authenticating/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-server-encryption-rsa/pom.xml b/microservice-config-server-encryption-rsa/pom.xml index 1722b5d17491327563013fb10f33b49838ab4068..a27c48d6b989d6b6046b26661e8f572b8b916ef7 100644 --- a/microservice-config-server-encryption-rsa/pom.xml +++ b/microservice-config-server-encryption-rsa/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-server-encryption/pom.xml b/microservice-config-server-encryption/pom.xml index 1949bbea513f52d312f2173a95197f4b6e71d7ab..7b003b367a00f56758b8d266c2260b966ee9a905 100644 --- a/microservice-config-server-encryption/pom.xml +++ b/microservice-config-server-encryption/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-server-eureka-authenticating/pom.xml b/microservice-config-server-eureka-authenticating/pom.xml index 8591a7dda6a9195eec58ade80eb4349ee0f31277..a940d9669bc38264365d0b72a82909f60de161d1 100644 --- a/microservice-config-server-eureka-authenticating/pom.xml +++ b/microservice-config-server-eureka-authenticating/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -26,7 +26,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client org.springframework.boot @@ -40,7 +40,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-server-eureka/pom.xml b/microservice-config-server-eureka/pom.xml index 360a12cdaabbc3feb094753e30dadfa8d6f2cd35..702ab54878547eee66ef3154ac491307272d0efb 100644 --- a/microservice-config-server-eureka/pom.xml +++ b/microservice-config-server-eureka/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -26,7 +26,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-server-health/pom.xml b/microservice-config-server-health/pom.xml index 1e02f6a38c08edfb4ac652fec01343ca9403d113..09ab123da297ca3aff01372d917c7071ae479f22 100644 --- a/microservice-config-server-health/pom.xml +++ b/microservice-config-server-health/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-server-refresh-cloud-bus/pom.xml b/microservice-config-server-refresh-cloud-bus/pom.xml index ad0e1584e04ff944625f297393846bb983b95f04..4403292037e47e0bda3ae07a5b01666ab04ce532 100644 --- a/microservice-config-server-refresh-cloud-bus/pom.xml +++ b/microservice-config-server-refresh-cloud-bus/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-config-server/pom.xml b/microservice-config-server/pom.xml index 177037fb91b731bce92f30c4ea4dc2c7629623e7..fb6242bcf20d17f591dcf0a32032ca73ddce1b31 100644 --- a/microservice-config-server/pom.xml +++ b/microservice-config-server/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-feign-customizing/pom.xml b/microservice-consumer-movie-feign-customizing/pom.xml index c5ea446f3aa0e49df3e6ff4cea2381e81d8b1e3c..4d8749c9864b6f8487eb24739ea47ab1a237de9f 100644 --- a/microservice-consumer-movie-feign-customizing/pom.xml +++ b/microservice-consumer-movie-feign-customizing/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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-feign + spring-cloud-starter-openfeign @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-feign-hystrix-fallback-factory/pom.xml b/microservice-consumer-movie-feign-hystrix-fallback-factory/pom.xml index 89956854b2c9350a7f678e15b27748ec1440f593..3dc1e1a49d0bbec82a89e39f0a24d3afbe82c9d4 100644 --- a/microservice-consumer-movie-feign-hystrix-fallback-factory/pom.xml +++ b/microservice-consumer-movie-feign-hystrix-fallback-factory/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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-feign + spring-cloud-starter-openfeign @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-feign-hystrix-fallback-factory/src/main/resources/application.yml b/microservice-consumer-movie-feign-hystrix-fallback-factory/src/main/resources/application.yml index 8e5980b70345c0a70222bb62483128a0a7fe35e8..76a8e42769bd5f0576b70550dec14a50d659953c 100644 --- a/microservice-consumer-movie-feign-hystrix-fallback-factory/src/main/resources/application.yml +++ b/microservice-consumer-movie-feign-hystrix-fallback-factory/src/main/resources/application.yml @@ -13,6 +13,10 @@ logging: level: feign: DEBUG -# 说明：请务必注意，在Spring Cloud Dalston中，Feign默认是不开启Hystrix的。 + +feign: + hystrix: + enabled: true +# 说明：请务必注意，从Spring Cloud Dalston开始，Feign默认是不开启Hystrix的。 # 因此，如使用Dalston请务必额外设置属性：feign.hystrix.enabled=true，否则断路器不会生效。 # 而，Spring Cloud Angel/Brixton/Camden中，Feign默认都是开启Hystrix的。无需设置该属性。 \ No newline at end of file diff --git a/microservice-consumer-movie-feign-hystrix-fallback-stream/pom.xml b/microservice-consumer-movie-feign-hystrix-fallback-stream/pom.xml index 21330dd695a92abd02f94e58607a2a4055838eb9..f688fac30894cb66291e21b19a18054eb482be08 100644 --- a/microservice-consumer-movie-feign-hystrix-fallback-stream/pom.xml +++ b/microservice-consumer-movie-feign-hystrix-fallback-stream/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -31,17 +31,17 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client org.springframework.cloud - spring-cloud-starter-feign + spring-cloud-starter-openfeign org.springframework.cloud - spring-cloud-starter-hystrix + spring-cloud-starter-netflix-hystrix @@ -51,7 +51,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-feign-hystrix-fallback-stream/src/main/resources/application.yml b/microservice-consumer-movie-feign-hystrix-fallback-stream/src/main/resources/application.yml index e7d9b121e7ed869554f8ff7f90b06140ce5365d4..9e686653f429cc98c1cebfaac17778c8dc4d8b1c 100644 --- a/microservice-consumer-movie-feign-hystrix-fallback-stream/src/main/resources/application.yml +++ b/microservice-consumer-movie-feign-hystrix-fallback-stream/src/main/resources/application.yml @@ -11,9 +11,9 @@ eureka: prefer-ip-address: true - - - -# 说明：请务必注意，在Spring Cloud Dalston中，Feign默认是不开启Hystrix的。 +feign: + hystrix: + enabled: true +# 说明：请务必注意，从Spring Cloud Dalston开始，Feign默认是不开启Hystrix的。 # 因此，如使用Dalston请务必额外设置属性：feign.hystrix.enabled=true，否则断路器不会生效。 # 而，Spring Cloud Angel/Brixton/Camden中，Feign默认都是开启Hystrix的。无需设置该属性。 \ No newline at end of file diff --git a/microservice-consumer-movie-feign-hystrix-fallback/pom.xml b/microservice-consumer-movie-feign-hystrix-fallback/pom.xml index 6ee542f0dae9308b3f4f6c3c1f2e9e45921d3c13..9aa272c168679cd871cf185f0d9501b0e11125c0 100644 --- a/microservice-consumer-movie-feign-hystrix-fallback/pom.xml +++ b/microservice-consumer-movie-feign-hystrix-fallback/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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-feign + spring-cloud-starter-openfeign @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-feign-hystrix-fallback/src/main/resources/application.yml b/microservice-consumer-movie-feign-hystrix-fallback/src/main/resources/application.yml index 8973da458f1034daf7d4157541168f3a5fa25ea5..cfd636b8b6522cd8d7e6594e952c6c7a94a9346b 100644 --- a/microservice-consumer-movie-feign-hystrix-fallback/src/main/resources/application.yml +++ b/microservice-consumer-movie-feign-hystrix-fallback/src/main/resources/application.yml @@ -10,7 +10,9 @@ eureka: instance: prefer-ip-address: true - -# 说明：请务必注意，在Spring Cloud Dalston中，Feign默认是不开启Hystrix的。 +feign: + hystrix: + enabled: true +# 说明：请务必注意，从Spring Cloud Dalston开始，Feign默认是不开启Hystrix的。 # 因此，如使用Dalston请务必额外设置属性：feign.hystrix.enabled=true，否则断路器不会生效。 # 而，Spring Cloud Angel/Brixton/Camden中，Feign默认都是开启Hystrix的。无需设置该属性。 \ No newline at end of file diff --git a/microservice-consumer-movie-feign-logging/pom.xml b/microservice-consumer-movie-feign-logging/pom.xml index 9c7d741813826918e2c9673ce943aede31f0ea6d..fa3510556f2c38bdbc3fb9ec4e8950453c3128dc 100644 --- a/microservice-consumer-movie-feign-logging/pom.xml +++ b/microservice-consumer-movie-feign-logging/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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-feign + spring-cloud-starter-openfeign @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-feign-manual/pom.xml b/microservice-consumer-movie-feign-manual/pom.xml index 164027519c822ebab674c545cc839a5854b052dc..1cae0d8bcf0cfbb6305ae89ce7dbd37e1a4cd790 100644 --- a/microservice-consumer-movie-feign-manual/pom.xml +++ b/microservice-consumer-movie-feign-manual/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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-feign + spring-cloud-starter-openfeign @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-feign-multiple-params/pom.xml b/microservice-consumer-movie-feign-multiple-params/pom.xml index 16b72be114793377ee07a864977922785fbc08b2..15f244f8ed064fc47d4f0b552a880c0ade421c33 100644 --- a/microservice-consumer-movie-feign-multiple-params/pom.xml +++ b/microservice-consumer-movie-feign-multiple-params/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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-feign + spring-cloud-starter-openfeign @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-feign/pom.xml b/microservice-consumer-movie-feign/pom.xml index c45ca9920768e2abc6dfc20f8c9b8cf02111c442..7731ad79585e2ae3759a6486908dbfd45d666e1c 100644 --- a/microservice-consumer-movie-feign/pom.xml +++ b/microservice-consumer-movie-feign/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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-feign + spring-cloud-starter-openfeign @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-ribbon-customizing-properties/pom.xml b/microservice-consumer-movie-ribbon-customizing-properties/pom.xml index 832ed6096a8baa93909e660a263a2cd1cf84d7ea..b5ce4816a8c1390bcef3479f2a64ed73e66eb580 100644 --- a/microservice-consumer-movie-ribbon-customizing-properties/pom.xml +++ b/microservice-consumer-movie-ribbon-customizing-properties/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-ribbon-customizing/pom.xml b/microservice-consumer-movie-ribbon-customizing/pom.xml index 5a460e040a6b1c49e7c65cd5f29e6393d51090c2..f7dc32c7e167e123d86ce409cd1e5f45b1283ef4 100644 --- a/microservice-consumer-movie-ribbon-customizing/pom.xml +++ b/microservice-consumer-movie-ribbon-customizing/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-ribbon-hystrix-turbine-mq/pom.xml b/microservice-consumer-movie-ribbon-hystrix-turbine-mq/pom.xml index 890b8eae632e4615cb4b000927cf20d2f5e44e4d..7351992d9a9b5b623cc0522329d3c4d9ff5e1349 100644 --- a/microservice-consumer-movie-ribbon-hystrix-turbine-mq/pom.xml +++ b/microservice-consumer-movie-ribbon-hystrix-turbine-mq/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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 @@ -55,7 +55,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-ribbon-hystrix/pom.xml b/microservice-consumer-movie-ribbon-hystrix/pom.xml index 2cd94008e5dca26d068b00bdda9620e203520ca3..411b1bcb977fd498b7be0a5bb6c7cde8e35cc66a 100644 --- a/microservice-consumer-movie-ribbon-hystrix/pom.xml +++ b/microservice-consumer-movie-ribbon-hystrix/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-ribbon/pom.xml b/microservice-consumer-movie-ribbon/pom.xml index e6841b9256b06d82746d463bd1742fdd1f521dd1..55b1a1e9a35086679bb801964bfbc8654c7af2d7 100644 --- a/microservice-consumer-movie-ribbon/pom.xml +++ b/microservice-consumer-movie-ribbon/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-understanding-metadata/pom.xml b/microservice-consumer-movie-understanding-metadata/pom.xml index 468aeca0edd4c48a42a6ea70b5b1331d7b3ec24e..cd635d2418c8c6bfe0badec87ffd364cdc76367a 100644 --- a/microservice-consumer-movie-understanding-metadata/pom.xml +++ b/microservice-consumer-movie-understanding-metadata/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie-without-eureka/pom.xml b/microservice-consumer-movie-without-eureka/pom.xml index 867061a1a7200c8791de2880f02994e2232b764a..b801bc235c6fcbd874de046455b22c60758d9e06 100644 --- a/microservice-consumer-movie-without-eureka/pom.xml +++ b/microservice-consumer-movie-without-eureka/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud - spring-cloud-starter-ribbon + spring-cloud-starter-netflix-ribbon @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-consumer-movie/pom.xml b/microservice-consumer-movie/pom.xml index 134fefc3f12be56afea4f53a4c81109b197d9681..cedcf8b0d541c3d6fe9eae55614fd91f5a2a164b 100644 --- a/microservice-consumer-movie/pom.xml +++ b/microservice-consumer-movie/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-discovery-eureka-authenticating/pom.xml b/microservice-discovery-eureka-authenticating/pom.xml index bf7cb6ec52dc33aeb7cf68c38db30d401491f10e..2a8ea1e093677a62bb0749d9c03d6ebbb19e6297 100644 --- a/microservice-discovery-eureka-authenticating/pom.xml +++ b/microservice-discovery-eureka-authenticating/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server org.springframework.boot @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-discovery-eureka-authenticating/src/main/resources/application.yml b/microservice-discovery-eureka-authenticating/src/main/resources/application.yml index 2d5c15446a4fe45c603d8eebf40b5b3aeadeb0f1..7984d08137e8013e5a2060785621493580a35888 100644 --- a/microservice-discovery-eureka-authenticating/src/main/resources/application.yml +++ b/microservice-discovery-eureka-authenticating/src/main/resources/application.yml @@ -11,7 +11,7 @@ eureka: registerWithEureka: false fetchRegistry: false serviceUrl: - defaultZone: http://localhost:8761/eureka/ + defaultZone: http://user:password123@localhost:8761/eureka/ # 参考文档：http://projects.spring.io/spring-cloud/docs/1.0.3/spring-cloud.html#_standalone_mode # 参考文档：http://my.oschina.net/buwei/blog/618756 \ No newline at end of file diff --git a/microservice-discovery-eureka-ha/pom.xml b/microservice-discovery-eureka-ha/pom.xml index e28f40748168308f930d3984c8c5547edaf84793..c8ae5fd60d36bbdade869b28066101b059d1f5f3 100644 --- a/microservice-discovery-eureka-ha/pom.xml +++ b/microservice-discovery-eureka-ha/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-discovery-eureka-ha/src/main/resources/application-easy.yml b/microservice-discovery-eureka-ha/src/main/resources/application-easy.yml new file mode 100644 index 0000000000000000000000000000000000000000..586b0089fcf19cb373f0d639136c9c2d0a496669 --- /dev/null +++ b/microservice-discovery-eureka-ha/src/main/resources/application-easy.yml @@ -0,0 +1,23 @@ +spring: + application: + name: microservice-discovery-eureka-ha +eureka: + client: + serviceUrl: + defaultZone: http://peer2:8762/eureka/,http://peer1:8761/eureka/ +--- +spring: + profiles: peer1 +server: + port: 8761 +eureka: + instance: + hostname: peer1 +--- +spring: + profiles: peer2 +server: + port: 8762 +eureka: + instance: + hostname: peer2 \ No newline at end of file diff --git a/microservice-discovery-eureka/pom.xml b/microservice-discovery-eureka/pom.xml index 893e58cd0eb7adcb0036e67819456629684836a7..3c7ae21656eadbc8d7567d42a5d2e47971da64e2 100644 --- a/microservice-discovery-eureka/pom.xml +++ b/microservice-discovery-eureka/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-file-upload/pom.xml b/microservice-file-upload/pom.xml index dc83f9be25ed4b260050679664abb691022ce185..37323c5601768bfc890fe767d22769ca99e002ab 100644 --- a/microservice-file-upload/pom.xml +++ b/microservice-file-upload/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -26,7 +26,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client org.springframework.boot @@ -40,7 +40,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-gateway-zuul-aggregation/pom.xml b/microservice-gateway-zuul-aggregation/pom.xml index 8aa9914cf29c2ffa889aea33a0fba13ec16d4875..de2d7a48f74c32926d962f618c271201aad13511 100644 --- a/microservice-gateway-zuul-aggregation/pom.xml +++ b/microservice-gateway-zuul-aggregation/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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 @@ -44,7 +44,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-gateway-zuul-fallback/pom.xml b/microservice-gateway-zuul-fallback/pom.xml index c65e11fcc520aadd2f5207d9d0229e02d558341b..caa9d369482d521c3d189ff66867bf6625f69119 100644 --- a/microservice-gateway-zuul-fallback/pom.xml +++ b/microservice-gateway-zuul-fallback/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-gateway-zuul-fallback/src/main/java/com/itmuch/cloud/study/fallback/MyFallbackProvider.java b/microservice-gateway-zuul-fallback/src/main/java/com/itmuch/cloud/study/fallback/MyFallbackProvider.java new file mode 100644 index 0000000000000000000000000000000000000000..f6cc73099c41f3de0a090c40037d76c23d603a67 --- /dev/null +++ b/microservice-gateway-zuul-fallback/src/main/java/com/itmuch/cloud/study/fallback/MyFallbackProvider.java @@ -0,0 +1,74 @@ +package com.itmuch.cloud.study.fallback; + +import com.netflix.hystrix.exception.HystrixTimeoutException; +import org.springframework.cloud.netflix.zuul.filters.route.FallbackProvider; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.stereotype.Component; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; + +@Component +public class MyFallbackProvider implements FallbackProvider { + @Override + public String getRoute() { + // 表明是为哪个微服务提供回退，*表示为所有微服务提供回退 + return "*"; + } + + @Override + public ClientHttpResponse fallbackResponse(Throwable cause) { + if (cause instanceof HystrixTimeoutException) { + return response(HttpStatus.GATEWAY_TIMEOUT); + } else { + return this.fallbackResponse(); + } + } + + @Override + public ClientHttpResponse fallbackResponse() { + return this.response(HttpStatus.INTERNAL_SERVER_ERROR); + } + + private ClientHttpResponse response(final HttpStatus status) { + return new ClientHttpResponse() { + @Override + public HttpStatus getStatusCode() throws IOException { + return status; + } + + @Override + public int getRawStatusCode() throws IOException { + return status.value(); + } + + @Override + public String getStatusText() throws IOException { + return status.getReasonPhrase(); + } + + @Override + public void close() { + } + + @Override + public InputStream getBody() throws IOException { + return new ByteArrayInputStream("服务不可用，请稍后再试。".getBytes()); + } + + @Override + public HttpHeaders getHeaders() { + // headers设定 + HttpHeaders headers = new HttpHeaders(); + MediaType mt = new MediaType("application", "json", Charset.forName("UTF-8")); + headers.setContentType(mt); + return headers; + } + }; + } +} diff --git a/microservice-gateway-zuul-fallback/src/main/java/com/itmuch/cloud/study/fallback/UserFallbackProvider.java b/microservice-gateway-zuul-fallback/src/main/java/com/itmuch/cloud/study/fallback/UserFallbackProvider.java index 1f8fa9eed8582f3468356e9cda13b8a3d115601e..35a98d87add51b2533e912b9c10e9223406af7eb 100644 --- a/microservice-gateway-zuul-fallback/src/main/java/com/itmuch/cloud/study/fallback/UserFallbackProvider.java +++ b/microservice-gateway-zuul-fallback/src/main/java/com/itmuch/cloud/study/fallback/UserFallbackProvider.java @@ -5,14 +5,19 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.client.ClientHttpResponse; -import org.springframework.stereotype.Component; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; -@Component +/** + * Edgware版本之前的写法，在Edgware版本已经废弃。仅供参考。 + * + * @see MyFallbackProvider + */ +@Deprecated +//@Component public class UserFallbackProvider implements ZuulFallbackProvider { @Override public String getRoute() { @@ -55,7 +60,7 @@ public class UserFallbackProvider implements ZuulFallbackProvider { public HttpHeaders getHeaders() { // headers设定 HttpHeaders headers = new HttpHeaders(); - MediaType mt = new MediaType("application","json", Charset.forName("UTF-8")); + MediaType mt = new MediaType("application", "json", Charset.forName("UTF-8")); headers.setContentType(mt); return headers; diff --git a/microservice-gateway-zuul-file-upload/pom.xml b/microservice-gateway-zuul-file-upload/pom.xml index 7a84cab64f513961cfbb1165df1edc6182fbaaea..15d6b3e501ca951bc6676f7449ec81a81e6d6825 100644 --- a/microservice-gateway-zuul-file-upload/pom.xml +++ b/microservice-gateway-zuul-file-upload/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-gateway-zuul-filter-groovy/pom.xml b/microservice-gateway-zuul-filter-groovy/pom.xml index ba06684206d298d74388705bbad460f1c75426fc..0416dce2c2411a802a4cb08a6a996853cf1b6d5f 100644 --- a/microservice-gateway-zuul-filter-groovy/pom.xml +++ b/microservice-gateway-zuul-filter-groovy/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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 @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-gateway-zuul-filter/pom.xml b/microservice-gateway-zuul-filter/pom.xml index 25cfb542107e35609c1e22c3b3550326548e179c..29ebd5fcf806599ee85f6ad41b16ecb54d109392 100644 --- a/microservice-gateway-zuul-filter/pom.xml +++ b/microservice-gateway-zuul-filter/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-gateway-zuul-filter/src/main/java/com/itmuch/cloud/study/filters/pre/PreRequestLogFilter.java b/microservice-gateway-zuul-filter/src/main/java/com/itmuch/cloud/study/filters/pre/PreRequestLogFilter.java index e0bc3d4a5fb35bffc819dc96abfea3e665149284..4c8c633a04e1ac097375eeea40ca00c26557475e 100644 --- a/microservice-gateway-zuul-filter/src/main/java/com/itmuch/cloud/study/filters/pre/PreRequestLogFilter.java +++ b/microservice-gateway-zuul-filter/src/main/java/com/itmuch/cloud/study/filters/pre/PreRequestLogFilter.java @@ -1,24 +1,24 @@ package com.itmuch.cloud.study.filters.pre; -import javax.servlet.http.HttpServletRequest; - +import com.netflix.zuul.ZuulFilter; +import com.netflix.zuul.context.RequestContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants; -import com.netflix.zuul.ZuulFilter; -import com.netflix.zuul.context.RequestContext; +import javax.servlet.http.HttpServletRequest; public class PreRequestLogFilter extends ZuulFilter { private static final Logger LOGGER = LoggerFactory.getLogger(PreRequestLogFilter.class); @Override public String filterType() { - return "pre"; + return FilterConstants.PRE_TYPE; } @Override public int filterOrder() { - return 1; + return FilterConstants.PRE_DECORATION_FILTER_ORDER - 1; } @Override diff --git a/microservice-gateway-zuul-reg-exp/pom.xml b/microservice-gateway-zuul-reg-exp/pom.xml index 94883b4289c3cec90b759674afe7e6b4417ef87d..61a157d9c5ef70709ccbee9bc2f8e21134ee757e 100644 --- a/microservice-gateway-zuul-reg-exp/pom.xml +++ b/microservice-gateway-zuul-reg-exp/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-gateway-zuul/pom.xml b/microservice-gateway-zuul/pom.xml index 07e18d54bb40a69a478549e4909710fd6ac65797..a1dfe77497234cd774e63ee771830991400fc544 100644 --- a/microservice-gateway-zuul/pom.xml +++ b/microservice-gateway-zuul/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-gateway-zuul/src/main/resources/application.yml b/microservice-gateway-zuul/src/main/resources/application.yml index 75c418f8b91d165e609f09291f10f398384969ec..d3b86c3d8ec9586044bfc743798670bdb0ad8f2e 100644 --- a/microservice-gateway-zuul/src/main/resources/application.yml +++ b/microservice-gateway-zuul/src/main/resources/application.yml @@ -8,4 +8,7 @@ eureka: service-url: defaultZone: http://localhost:8761/eureka/ instance: - prefer-ip-address: true \ No newline at end of file + prefer-ip-address: true +management: + security: + enabled: false diff --git "a/microservice-gateway-zuul/src/main/resources/application.yml.bak10_\346\234\254\345\234\260\350\275\254\345\217\221" "b/microservice-gateway-zuul/src/main/resources/application.yml.bak10_\346\234\254\345\234\260\350\275\254\345\217\221" new file mode 100644 index 0000000000000000000000000000000000000000..6a18e33d817f836178ac4667e1353ea397b84996 --- /dev/null +++ "b/microservice-gateway-zuul/src/main/resources/application.yml.bak10_\346\234\254\345\234\260\350\275\254\345\217\221" @@ -0,0 +1,19 @@ +server: + port: 8040 +spring: + application: + name: microservice-gateway-zuul +eureka: + client: + service-url: + defaultZone: http://localhost:8761/eureka/ + instance: + prefer-ip-address: true +zuul: + routes: + route-name: + path: /path-a/** + url: forward:/path-b +management: + security: + enabled: false \ No newline at end of file diff --git "a/microservice-gateway-zuul/src/main/resources/application.yml.bak1_\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241\350\267\257\345\276\204" "b/microservice-gateway-zuul/src/main/resources/application.yml.bak1_\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241\350\267\257\345\276\204" index 24de917f78f040eb8a26a91d6d4f82ede2f25c4e..710a36a0a01ad5518cc27311aa84216c597e168e 100644 --- "a/microservice-gateway-zuul/src/main/resources/application.yml.bak1_\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241\350\267\257\345\276\204" +++ "b/microservice-gateway-zuul/src/main/resources/application.yml.bak1_\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241\350\267\257\345\276\204" @@ -12,3 +12,6 @@ eureka: zuul: routes: microservice-provider-user: /user/** +management: + security: + enabled: false \ No newline at end of file diff --git "a/microservice-gateway-zuul/src/main/resources/application.yml.bak2_\345\277\275\347\225\245\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241" "b/microservice-gateway-zuul/src/main/resources/application.yml.bak2_\345\277\275\347\225\245\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241" index df741a6e3e261ea5e3b96110c6f2fdec73b2473a..6093b8268ea4e13b69202314ff2e22127a65e328 100644 --- "a/microservice-gateway-zuul/src/main/resources/application.yml.bak2_\345\277\275\347\225\245\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241" +++ "b/microservice-gateway-zuul/src/main/resources/application.yml.bak2_\345\277\275\347\225\245\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241" @@ -11,3 +11,6 @@ eureka: prefer-ip-address: true zuul: ignored-services: microservice-provider-user,microservice-consumer-movie +management: + security: + enabled: false \ No newline at end of file diff --git "a/microservice-gateway-zuul/src/main/resources/application.yml.bak3_\345\277\275\347\225\245\346\211\200\346\234\211\345\276\256\346\234\215\345\212\241\357\274\214\345\217\252\350\267\257\347\224\261\346\214\207\345\256\232\347\232\204\345\276\256\346\234\215\345\212\241" "b/microservice-gateway-zuul/src/main/resources/application.yml.bak3_\345\277\275\347\225\245\346\211\200\346\234\211\345\276\256\346\234\215\345\212\241\357\274\214\345\217\252\350\267\257\347\224\261\346\214\207\345\256\232\347\232\204\345\276\256\346\234\215\345\212\241" index 51e78b8d778049d5efeccca4a656877b7f53abc8..598cfad41f265354ce576a06db077cf5501d0485 100644 --- "a/microservice-gateway-zuul/src/main/resources/application.yml.bak3_\345\277\275\347\225\245\346\211\200\346\234\211\345\276\256\346\234\215\345\212\241\357\274\214\345\217\252\350\267\257\347\224\261\346\214\207\345\256\232\347\232\204\345\276\256\346\234\215\345\212\241" +++ "b/microservice-gateway-zuul/src/main/resources/application.yml.bak3_\345\277\275\347\225\245\346\211\200\346\234\211\345\276\256\346\234\215\345\212\241\357\274\214\345\217\252\350\267\257\347\224\261\346\214\207\345\256\232\347\232\204\345\276\256\346\234\215\345\212\241" @@ -13,3 +13,6 @@ zuul: ignored-services: '*' # 使用'*'可忽略所有微服务 routes: microservice-provider-user: /user/** +management: + security: + enabled: false \ No newline at end of file diff --git "a/microservice-gateway-zuul/src/main/resources/application.yml.bak4_\345\220\214\346\227\266\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241\347\232\204serviceId\345\222\214\345\257\271\345\272\224\350\267\257\345\276\204" "b/microservice-gateway-zuul/src/main/resources/application.yml.bak4_\345\220\214\346\227\266\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241\347\232\204serviceId\345\222\214\345\257\271\345\272\224\350\267\257\345\276\204" index e81510578df5829bca6175d59c7272b0821e88ad..4590bbb22ed9eabe52abd6eca6ee2c990880e0d0 100644 --- "a/microservice-gateway-zuul/src/main/resources/application.yml.bak4_\345\220\214\346\227\266\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241\347\232\204serviceId\345\222\214\345\257\271\345\272\224\350\267\257\345\276\204" +++ "b/microservice-gateway-zuul/src/main/resources/application.yml.bak4_\345\220\214\346\227\266\346\214\207\345\256\232\345\276\256\346\234\215\345\212\241\347\232\204serviceId\345\222\214\345\257\271\345\272\224\350\267\257\345\276\204" @@ -14,3 +14,6 @@ zuul: user-route: # 该配置方式中，user-route只是给路由一个名称，可以任意起名。 service-id: microservice-provider-user path: /user/** # service-id对应的路径 +management: + security: + enabled: false \ No newline at end of file diff --git "a/microservice-gateway-zuul/src/main/resources/application.yml.bak5_\345\220\214\346\227\266\346\214\207\345\256\232path\345\222\214url" "b/microservice-gateway-zuul/src/main/resources/application.yml.bak5_\345\220\214\346\227\266\346\214\207\345\256\232path\345\222\214url" index 271253314a9fd235f167a384c4288867ddb5e4c4..3d1ea0bf303833f133e7e5c1a377e536d106dd7e 100644 --- "a/microservice-gateway-zuul/src/main/resources/application.yml.bak5_\345\220\214\346\227\266\346\214\207\345\256\232path\345\222\214url" +++ "b/microservice-gateway-zuul/src/main/resources/application.yml.bak5_\345\220\214\346\227\266\346\214\207\345\256\232path\345\222\214url" @@ -14,3 +14,6 @@ zuul: user-route: # 该配置方式中，user-route只是给路由一个名称，可以任意起名。 url: http://localhost:8000/ # 指定的url path: /user/** # url对应的路径。 +management: + security: + enabled: false \ No newline at end of file diff --git "a/microservice-gateway-zuul/src/main/resources/application.yml.bak6_\345\220\214\346\227\266\346\214\207\345\256\232path\345\222\214URL\357\274\214\345\271\266\344\270\224\344\270\215\347\240\264\345\235\217Zuul\347\232\204Hystrix\343\200\201Ribbon\347\211\271\346\200\247\343\200\202" "b/microservice-gateway-zuul/src/main/resources/application.yml.bak6_\345\220\214\346\227\266\346\214\207\345\256\232path\345\222\214URL\357\274\214\345\271\266\344\270\224\344\270\215\347\240\264\345\235\217Zuul\347\232\204Hystrix\343\200\201Ribbon\347\211\271\346\200\247\343\200\202" index d9d6ebea6feabd9a8161d7fda3992074720083dd..857ed3ab95c9413672d1f5fe887fcc366d2c972f 100644 --- "a/microservice-gateway-zuul/src/main/resources/application.yml.bak6_\345\220\214\346\227\266\346\214\207\345\256\232path\345\222\214URL\357\274\214\345\271\266\344\270\224\344\270\215\347\240\264\345\235\217Zuul\347\232\204Hystrix\343\200\201Ribbon\347\211\271\346\200\247\343\200\202" +++ "b/microservice-gateway-zuul/src/main/resources/application.yml.bak6_\345\220\214\346\227\266\346\214\207\345\256\232path\345\222\214URL\357\274\214\345\271\266\344\270\224\344\270\215\347\240\264\345\235\217Zuul\347\232\204Hystrix\343\200\201Ribbon\347\211\271\346\200\247\343\200\202" @@ -20,3 +20,6 @@ ribbon: microservice-provider-user: ribbon: listOfServers: localhost:8000,localhost:8001 +management: + security: + enabled: false \ No newline at end of file diff --git "a/microservice-gateway-zuul/src/main/resources/application.yml.bak8_\344\270\272Zuul\346\267\273\345\212\240\346\230\240\345\260\204\345\211\215\347\274\2001" "b/microservice-gateway-zuul/src/main/resources/application.yml.bak8_\344\270\272Zuul\346\267\273\345\212\240\346\230\240\345\260\204\345\211\215\347\274\2001" index 851a0530e57d15ac38888727efcee78f3eb43d4c..9bf9cd56847cf6b983954fa2ba92a44028aa3cdf 100644 --- "a/microservice-gateway-zuul/src/main/resources/application.yml.bak8_\344\270\272Zuul\346\267\273\345\212\240\346\230\240\345\260\204\345\211\215\347\274\2001" +++ "b/microservice-gateway-zuul/src/main/resources/application.yml.bak8_\344\270\272Zuul\346\267\273\345\212\240\346\230\240\345\260\204\345\211\215\347\274\2001" @@ -17,5 +17,9 @@ zuul: logging: level: com.netflix: DEBUG - -# 访问Zuul的/api/microservice-provider-user/1路径，请求将会被转发到microservice-provider-user的/api/1，，可以查看日志打印，有助于理解。 \ No newline at end of file +management: + security: + enabled: false + +# 访问Zuul的/api/microservice-provider-user/1路径，请求将会被转发到microservice-provider-user的/api/1，可查看日志打印，有助于理解。 + diff --git "a/microservice-gateway-zuul/src/main/resources/application.yml.bak8_\344\270\272Zuul\346\267\273\345\212\240\346\230\240\345\260\204\345\211\215\347\274\2002" "b/microservice-gateway-zuul/src/main/resources/application.yml.bak8_\344\270\272Zuul\346\267\273\345\212\240\346\230\240\345\260\204\345\211\215\347\274\2002" index a879f8d315483a45428be0b158e97b1583b5ce3b..cb06927d62a22ac9621d4512cfbcae1791bdb7fb 100644 --- "a/microservice-gateway-zuul/src/main/resources/application.yml.bak8_\344\270\272Zuul\346\267\273\345\212\240\346\230\240\345\260\204\345\211\215\347\274\2002" +++ "b/microservice-gateway-zuul/src/main/resources/application.yml.bak8_\344\270\272Zuul\346\267\273\345\212\240\346\230\240\345\260\204\345\211\215\347\274\2002" @@ -17,5 +17,10 @@ zuul: logging: level: com.netflix: DEBUG - -# 这样访问Zuul的/user/1路径，请求将会被转发到microservice-provider-user的/user/1，可以查看日志打印，有助于理解。 \ No newline at end of file + +management: + security: + enabled: false + + +# 这样访问Zuul的/user/1路径，请求将会被转发到microservice-provider-user的/user/1，可查看日志打印，有助于理解。 \ No newline at end of file diff --git "a/microservice-gateway-zuul/src/main/resources/application.yml.bak9_\345\277\275\347\225\245\346\237\220\344\272\233\350\267\257\345\276\204" "b/microservice-gateway-zuul/src/main/resources/application.yml.bak9_\345\277\275\347\225\245\346\237\220\344\272\233\350\267\257\345\276\204" index 81b5a0e20d233018fd5ed8dd954947c9b2e0cb62..c4d305b816fb2a153f18b82a268bf903a1bf7cfd 100644 --- "a/microservice-gateway-zuul/src/main/resources/application.yml.bak9_\345\277\275\347\225\245\346\237\220\344\272\233\350\267\257\345\276\204" +++ "b/microservice-gateway-zuul/src/main/resources/application.yml.bak9_\345\277\275\347\225\245\346\237\220\344\272\233\350\267\257\345\276\204" @@ -13,3 +13,6 @@ zuul: ignoredPatterns: /**/admin/** # 忽略所有包括/admin/的路径 routes: microservice-provider-user: /user/** +management: + security: + enabled: false \ No newline at end of file diff --git a/microservice-hystrix-dashboard/pom.xml b/microservice-hystrix-dashboard/pom.xml index 4ecaf5cc64fbe4a10d69d623e47cf554e4ac5ae7..d628e30e3ba9dfc74d950dd06a50717f04c672b9 100644 --- a/microservice-hystrix-dashboard/pom.xml +++ b/microservice-hystrix-dashboard/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-hystrix-turbine-mq/pom.xml b/microservice-hystrix-turbine-mq/pom.xml index 9a3d56a7d444b6961d168a63617aa3035fd6e0fe..6ba6bb70eea73e9812df9e31b4a6992bbb398261 100644 --- a/microservice-hystrix-turbine-mq/pom.xml +++ b/microservice-hystrix-turbine-mq/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-turbine-stream + spring-cloud-starter-netflix-turbine-stream org.springframework.cloud @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-hystrix-turbine/pom.xml b/microservice-hystrix-turbine/pom.xml index 89d30a7fd562b76e8566578ecfb4c560bd0faedd..d5f48093e42fc906b28f94a51628aa5146519dc8 100644 --- a/microservice-hystrix-turbine/pom.xml +++ b/microservice-hystrix-turbine/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-provider-user-ip/pom.xml b/microservice-provider-user-ip/pom.xml index e23feed009e46b55f27f6b2a6959bf5cb366389f..5aa7442b05494f9a3551c5f3167be31e7a08fab6 100644 --- a/microservice-provider-user-ip/pom.xml +++ b/microservice-provider-user-ip/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-provider-user-multiple-params/pom.xml b/microservice-provider-user-multiple-params/pom.xml index 348140bfc4f274fe43facf44acef9e88fb496a49..4e3506fc439eb701e0a66c80127114efeec923f5 100644 --- a/microservice-provider-user-multiple-params/pom.xml +++ b/microservice-provider-user-multiple-params/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-provider-user-my-metadata/pom.xml b/microservice-provider-user-my-metadata/pom.xml index 55fc8d51ea89e9b9b1da556e931132d8d9158f89..6202aeefa484f8ba355dfc77e0e51f5ac4778520 100644 --- a/microservice-provider-user-my-metadata/pom.xml +++ b/microservice-provider-user-my-metadata/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-provider-user-with-auth/pom.xml b/microservice-provider-user-with-auth/pom.xml index 188f787d08eb3b7650c015336dbf92c0b58d554a..cba2c940b1ac143d89ca81e314994dcf1b3f9f43 100644 --- a/microservice-provider-user-with-auth/pom.xml +++ b/microservice-provider-user-with-auth/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -39,7 +39,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -54,7 +54,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-provider-user/pom.xml b/microservice-provider-user/pom.xml index 68e172a7bb0b694b8040f4c7a28b4b9046a4b61d..d6eba34543ea4d47c8d06be3216f4d2af9b87588 100644 --- a/microservice-provider-user/pom.xml +++ b/microservice-provider-user/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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.SR4 + Edgware.RELEASE pom import diff --git a/microservice-sidecar-client-ribbon/pom.xml b/microservice-sidecar-client-ribbon/pom.xml index 505f23ed3245626cf6e3b5bbd9c963898e17f914..773d325057a0ae513d4db57c48747a6b57f6b904 100644 --- a/microservice-sidecar-client-ribbon/pom.xml +++ b/microservice-sidecar-client-ribbon/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-sidecar/pom.xml b/microservice-sidecar/pom.xml index e5936142d33f39aadc4fa763e28b831def2aa040..e758b15945ada4670c0da4e4b3c5a5e832d0ec54 100644 --- a/microservice-sidecar/pom.xml +++ b/microservice-sidecar/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.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 org.springframework.cloud @@ -40,7 +40,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-simple-consumer-movie/pom.xml b/microservice-simple-consumer-movie/pom.xml index f53f75f617b9f98e57677156f2d66fb19e73b620..375514d0a49bbb74f797016b62b13787f8dd08d1 100644 --- a/microservice-simple-consumer-movie/pom.xml +++ b/microservice-simple-consumer-movie/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-simple-provider-user/pom.xml b/microservice-simple-provider-user/pom.xml index e4edc93add07dc934c8fa1042ab96f28e896adbc..fcb24f15c52729d464c6d674d2e6416218ee39d4 100644 --- a/microservice-simple-provider-user/pom.xml +++ b/microservice-simple-provider-user/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -44,7 +44,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/microservice-simple-provider-user/src/main/resources/application.yml b/microservice-simple-provider-user/src/main/resources/application.yml index f514de0d00611fdb19a59d68ecfd0aa7d85b2926..c4f4684930ef913caf3c3e82f284365806bb4263 100644 --- a/microservice-simple-provider-user/src/main/resources/application.yml +++ b/microservice-simple-provider-user/src/main/resources/application.yml @@ -24,4 +24,9 @@ info: encoding: @project.build.sourceEncoding@ java: source: @java.version@ - target: @java.version@ \ No newline at end of file + target: @java.version@ +management: + security: + enabled: false + + diff --git a/trace/microservice-discovery-eureka/.gitignore b/trace/microservice-discovery-eureka/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..b83d22266ac8aa2f8df2edef68082c789727841d --- /dev/null +++ b/trace/microservice-discovery-eureka/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/trace/microservice-discovery-eureka/pom.xml b/trace/microservice-discovery-eureka/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..3c7ae21656eadbc8d7567d42a5d2e47971da64e2 --- /dev/null +++ b/trace/microservice-discovery-eureka/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + com.itmuch.cloud + microservice-discovery-eureka + 0.0.1-SNAPSHOT + jar + + + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + + + + UTF-8 + 1.8 + + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-server + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + Edgware.RELEASE + pom + import + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/trace/microservice-discovery-eureka/src/main/java/com/itmuch/cloud/study/EurekaApplication.java b/trace/microservice-discovery-eureka/src/main/java/com/itmuch/cloud/study/EurekaApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..f4fb4582de7ca9f83404fc972c7ccea01f60cb97 --- /dev/null +++ b/trace/microservice-discovery-eureka/src/main/java/com/itmuch/cloud/study/EurekaApplication.java @@ -0,0 +1,17 @@ +package com.itmuch.cloud.study; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; + +/** + * 使用Eureka做服务发现. + * @author 周立 + */ +@SpringBootApplication +@EnableEurekaServer +public class EurekaApplication { + public static void main(String[] args) { + SpringApplication.run(EurekaApplication.class, args); + } +} diff --git a/trace/microservice-discovery-eureka/src/main/resources/application.yml b/trace/microservice-discovery-eureka/src/main/resources/application.yml new file mode 100644 index 0000000000000000000000000000000000000000..fc7c4943a3ecca150cb72428623f6e0aa89e7fcd --- /dev/null +++ b/trace/microservice-discovery-eureka/src/main/resources/application.yml @@ -0,0 +1,11 @@ +server: + port: 8761 # 指定该Eureka实例的端口 +eureka: + client: + registerWithEureka: false + fetchRegistry: false + serviceUrl: + defaultZone: http://localhost:8761/eureka/ + +# 参考文档：http://projects.spring.io/spring-cloud/docs/1.0.3/spring-cloud.html#_standalone_mode +# 参考文档：http://my.oschina.net/buwei/blog/618756 \ No newline at end of file diff --git a/trace/microservice-provider-user-zipkin/.gitignore b/trace/microservice-provider-user-zipkin/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..b83d22266ac8aa2f8df2edef68082c789727841d --- /dev/null +++ b/trace/microservice-provider-user-zipkin/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/trace/microservice-provider-user-zipkin/pom.xml b/trace/microservice-provider-user-zipkin/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..37449bdd800485efba06c0fff6f6d5f58d17aa4f --- /dev/null +++ b/trace/microservice-provider-user-zipkin/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + com.itmuch.cloud + microservice-provider-user-zipkin + 0.0.1-SNAPSHOT + jar + + + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + + + + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + com.h2database + h2 + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + Edgware.RELEASE + pom + import + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/ProviderUserApplication.java b/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/ProviderUserApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..f0ff6d2fc10be4b3a7121d59bd2725e9980e3c64 --- /dev/null +++ b/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/ProviderUserApplication.java @@ -0,0 +1,13 @@ +package com.itmuch.cloud.study; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@EnableDiscoveryClient +@SpringBootApplication +public class ProviderUserApplication { + public static void main(String[] args) { + SpringApplication.run(ProviderUserApplication.class, args); + } +} diff --git a/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/controller/UserController.java b/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/controller/UserController.java new file mode 100644 index 0000000000000000000000000000000000000000..5d246ef9a608b27c67a925a73f70ade41142882d --- /dev/null +++ b/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/controller/UserController.java @@ -0,0 +1,21 @@ +package com.itmuch.cloud.study.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +import com.itmuch.cloud.study.entity.User; +import com.itmuch.cloud.study.repository.UserRepository; + +@RestController +public class UserController { + @Autowired + private UserRepository userRepository; + + @GetMapping("/{id}") + public User findById(@PathVariable Long id) { + User findOne = this.userRepository.findOne(id); + return findOne; + } +} diff --git a/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/entity/User.java b/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/entity/User.java new file mode 100644 index 0000000000000000000000000000000000000000..1796bb851ea257a25a0137e1676ae27f777fe123 --- /dev/null +++ b/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/entity/User.java @@ -0,0 +1,65 @@ +package com.itmuch.cloud.study.entity; + +import java.math.BigDecimal; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class User { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + @Column + private String username; + @Column + private String name; + @Column + private Integer age; + @Column + private BigDecimal balance; + + public Long getId() { + return this.id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUsername() { + return this.username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getAge() { + return this.age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public BigDecimal getBalance() { + return this.balance; + } + + public void setBalance(BigDecimal balance) { + this.balance = balance; + } + +} diff --git a/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/repository/UserRepository.java b/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/repository/UserRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..889d8de6b8e6fe7346b32dd17feba4edf12b3a81 --- /dev/null +++ b/trace/microservice-provider-user-zipkin/src/main/java/com/itmuch/cloud/study/repository/UserRepository.java @@ -0,0 +1,10 @@ +package com.itmuch.cloud.study.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.itmuch.cloud.study.entity.User; + +@Repository +public interface UserRepository extends JpaRepository { +} diff --git a/trace/microservice-provider-user-zipkin/src/main/resources/application-autherntication.yml.bak b/trace/microservice-provider-user-zipkin/src/main/resources/application-autherntication.yml.bak new file mode 100644 index 0000000000000000000000000000000000000000..4b40fe845832064cb604b99b98de8b407e3011e3 --- /dev/null +++ b/trace/microservice-provider-user-zipkin/src/main/resources/application-autherntication.yml.bak @@ -0,0 +1,26 @@ +server: + port: 8000 +spring: + application: + name: microservice-provider-user + jpa: + generate-ddl: false + show-sql: true + hibernate: + ddl-auto: none + datasource: # 指定数据源 + platform: h2 # 指定数据源类型 + schema: classpath:schema.sql # 指定h2数据库的建表脚本 + data: classpath:data.sql # 指定h2数据库的数据脚本 +logging: # 配置日志级别，让hibernate打印出执行的SQL + level: + root: INFO + org.hibernate: INFO + org.hibernate.type.descriptor.sql.BasicBinder: TRACE + org.hibernate.type.descriptor.sql.BasicExtractor: TRACE +eureka: + client: + serviceUrl: + defaultZone: http://user:password123@localhost:8761/eureka/ + instance: + prefer-ip-address: true \ No newline at end of file diff --git a/trace/microservice-provider-user-zipkin/src/main/resources/application-ha.yml.bak b/trace/microservice-provider-user-zipkin/src/main/resources/application-ha.yml.bak new file mode 100644 index 0000000000000000000000000000000000000000..9d917a1493d213be9c87a82ccd86be4822bf9519 --- /dev/null +++ b/trace/microservice-provider-user-zipkin/src/main/resources/application-ha.yml.bak @@ -0,0 +1,26 @@ +server: + port: 8000 +spring: + application: + name: microservice-provider-user + jpa: + generate-ddl: false + show-sql: true + hibernate: + ddl-auto: none + datasource: # 指定数据源 + platform: h2 # 指定数据源类型 + schema: classpath:schema.sql # 指定h2数据库的建表脚本 + data: classpath:data.sql # 指定h2数据库的数据脚本 +logging: # 配置日志级别，让hibernate打印出执行的SQL + level: + root: INFO + org.hibernate: INFO + org.hibernate.type.descriptor.sql.BasicBinder: TRACE + org.hibernate.type.descriptor.sql.BasicExtractor: TRACE +eureka: + client: + serviceUrl: + defaultZone: http://peer1:8761/eureka/,http://peer2:8762/eureka/ + instance: + prefer-ip-address: true \ No newline at end of file diff --git a/trace/microservice-provider-user-zipkin/src/main/resources/application.yml b/trace/microservice-provider-user-zipkin/src/main/resources/application.yml new file mode 100644 index 0000000000000000000000000000000000000000..3ab13672caa78ad4fb77a1cdc28e000eba6ab527 --- /dev/null +++ b/trace/microservice-provider-user-zipkin/src/main/resources/application.yml @@ -0,0 +1,32 @@ +server: + port: 8000 +spring: + application: + name: microservice-provider-user + jpa: + generate-ddl: false + show-sql: true + hibernate: + ddl-auto: none + datasource: # 指定数据源 + platform: h2 # 指定数据源类型 + schema: classpath:schema.sql # 指定h2数据库的建表脚本 + data: classpath:data.sql # 指定h2数据库的数据脚本 + zipkin: + base-url: http://zipkin-server/ + sleuth: + sampler: + percentage: 1.0 + +logging: # 配置日志级别，让hibernate打印出执行的SQL + level: + root: INFO + org.hibernate: INFO + org.hibernate.type.descriptor.sql.BasicBinder: TRACE + org.hibernate.type.descriptor.sql.BasicExtractor: TRACE +eureka: + client: + serviceUrl: + defaultZone: http://localhost:8761/eureka/ + instance: + prefer-ip-address: true diff --git a/trace/microservice-provider-user-zipkin/src/main/resources/data.sql b/trace/microservice-provider-user-zipkin/src/main/resources/data.sql new file mode 100644 index 0000000000000000000000000000000000000000..b3db6a44b4fe8f74bab43f5fd1deb28ac162dff8 --- /dev/null +++ b/trace/microservice-provider-user-zipkin/src/main/resources/data.sql @@ -0,0 +1,3 @@ +insert into user (id, username, name, age, balance) values (1, 'account1', '张三', 20, 100.00); +insert into user (id, username, name, age, balance) values (2, 'account2', '李四', 28, 180.00); +insert into user (id, username, name, age, balance) values (3, 'account3', '王五', 32, 280.00); \ No newline at end of file diff --git a/trace/microservice-provider-user-zipkin/src/main/resources/schema.sql b/trace/microservice-provider-user-zipkin/src/main/resources/schema.sql new file mode 100644 index 0000000000000000000000000000000000000000..ef5dc471244a99edfbf952f56a10003f61f7f036 --- /dev/null +++ b/trace/microservice-provider-user-zipkin/src/main/resources/schema.sql @@ -0,0 +1,2 @@ +drop table user if exists; +create table user (id bigint generated by default as identity, username varchar(40), name varchar(20), age int(3), balance decimal(10,2), primary key (id)); \ No newline at end of file diff --git a/trace/microservice-simple-consumer-movie-trace-zipkin/pom.xml b/trace/microservice-simple-consumer-movie-trace-zipkin/pom.xml index a8460e73458e56e5917c9e3d3b4a4c4d14fcbb37..9b5b6827ae694534a20cd3e6024a38f43ae5e74c 100644 --- a/trace/microservice-simple-consumer-movie-trace-zipkin/pom.xml +++ b/trace/microservice-simple-consumer-movie-trace-zipkin/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -44,7 +44,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/trace/microservice-simple-consumer-movie-trace/pom.xml b/trace/microservice-simple-consumer-movie-trace/pom.xml index c0c61694b95d374a9611bdd95e4a02bb98f88203..830d529fe74e38e7da25a7de3b599c4c0acc3578 100644 --- a/trace/microservice-simple-consumer-movie-trace/pom.xml +++ b/trace/microservice-simple-consumer-movie-trace/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -40,7 +40,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/trace/microservice-simple-provider-user-trace-elk/build/microservice-provider-user b/trace/microservice-simple-provider-user-trace-elk/build/microservice-provider-user deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/trace/microservice-simple-provider-user-trace-elk/build/microservice-provider-user.json b/trace/microservice-simple-provider-user-trace-elk/build/microservice-provider-user.json deleted file mode 100644 index 3b1eb509c679069020a75a261556da02f916793d..0000000000000000000000000000000000000000 --- a/trace/microservice-simple-provider-user-trace-elk/build/microservice-provider-user.json +++ /dev/null @@ -1,129 +0,0 @@ -{"@timestamp":"2017-01-17T17:20:10.134+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.c.a.AnnotationConfigApplicationContext","rest":"Refreshing org.springframework.context.annotation.AnnotationConfigApplicationContext@2e5c7f0b: startup date [Wed Jan 18 01:20:10 CST 2017]; root of context hierarchy"} -{"@timestamp":"2017-01-17T17:20:10.429+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker","rest":"Bean 'configurationPropertiesRebinderAutoConfiguration' of type [class org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$494ebb66] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)"} -{"@timestamp":"2017-01-17T17:20:10.882+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"c.i.cloud.study.ProviderUserApplication","rest":"No active profile set, falling back to default profiles: default"} -{"@timestamp":"2017-01-17T17:20:10.897+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.c.e.AnnotationConfigEmbeddedWebApplicationContext","rest":"Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@2764c546: startup date [Wed Jan 18 01:20:10 CST 2017]; parent: org.springframework.context.annotation.AnnotationConfigApplicationContext@2e5c7f0b"} -{"@timestamp":"2017-01-17T17:20:11.849+00:00","severity":"WARN","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.c.a.ConfigurationClassPostProcessor","rest":"Cannot enhance @Configuration bean definition 'refreshScope' since its singleton instance has been created too early. The typical cause is a non-static @Bean method with a BeanDefinitionRegistryPostProcessor return type: Consider declaring such methods as 'static'."} -{"@timestamp":"2017-01-17T17:20:12.001+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.cloud.context.scope.GenericScope","rest":"BeanFactory id=e493827f-71cb-3da7-bb15-a24fc6868f24"} -{"@timestamp":"2017-01-17T17:20:12.110+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker","rest":"Bean 'org.springframework.cloud.sleuth.instrument.async.AsyncDefaultAutoConfiguration$DefaultAsyncConfigurerSupport' of type [class org.springframework.cloud.sleuth.instrument.async.AsyncDefaultAutoConfiguration$DefaultAsyncConfigurerSupport$$EnhancerBySpringCGLIB$$6a76562c] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)"} -{"@timestamp":"2017-01-17T17:20:12.188+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker","rest":"Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [class org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$2d34b869] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)"} -{"@timestamp":"2017-01-17T17:20:12.440+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker","rest":"Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [class org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$494ebb66] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)"} -{"@timestamp":"2017-01-17T17:20:12.892+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.c.e.t.TomcatEmbeddedServletContainer","rest":"Tomcat initialized with port(s): 8000 (http)"} -{"@timestamp":"2017-01-17T17:20:12.908+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"org.apache.catalina.core.StandardService","rest":"Starting service Tomcat"} -{"@timestamp":"2017-01-17T17:20:12.908+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"org.apache.catalina.core.StandardEngine","rest":"Starting Servlet Engine: Apache Tomcat/8.5.6"} -{"@timestamp":"2017-01-17T17:20:13.100+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.a.c.c.C.[Tomcat].[localhost].[/]","rest":"Initializing Spring embedded WebApplicationContext"} -{"@timestamp":"2017-01-17T17:20:13.100+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.web.context.ContextLoader","rest":"Root WebApplicationContext: initialization completed in 2203 ms"} -{"@timestamp":"2017-01-17T17:20:13.801+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.b.web.servlet.FilterRegistrationBean","rest":"Mapping filter: 'metricsFilter' to: [/*]"} -{"@timestamp":"2017-01-17T17:20:13.801+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.b.web.servlet.FilterRegistrationBean","rest":"Mapping filter: 'characterEncodingFilter' to: [/*]"} -{"@timestamp":"2017-01-17T17:20:13.801+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.b.c.embedded.FilterRegistrationBean","rest":"Mapping filter: 'traceFilter' to: [/*]"} -{"@timestamp":"2017-01-17T17:20:13.801+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.b.web.servlet.FilterRegistrationBean","rest":"Mapping filter: 'hiddenHttpMethodFilter' to: [/*]"} -{"@timestamp":"2017-01-17T17:20:13.801+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.b.web.servlet.FilterRegistrationBean","rest":"Mapping filter: 'httpPutFormContentFilter' to: [/*]"} -{"@timestamp":"2017-01-17T17:20:13.801+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.b.web.servlet.FilterRegistrationBean","rest":"Mapping filter: 'requestContextFilter' to: [/*]"} -{"@timestamp":"2017-01-17T17:20:13.801+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.b.web.servlet.FilterRegistrationBean","rest":"Mapping filter: 'webRequestLoggingFilter' to: [/*]"} -{"@timestamp":"2017-01-17T17:20:13.801+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.b.web.servlet.FilterRegistrationBean","rest":"Mapping filter: 'applicationContextIdFilter' to: [/*]"} -{"@timestamp":"2017-01-17T17:20:13.801+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.b.w.servlet.ServletRegistrationBean","rest":"Mapping servlet: 'dispatcherServlet' to [/]"} -{"@timestamp":"2017-01-17T17:20:13.817+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Initializing filter 'traceFilter'"} -{"@timestamp":"2017-01-17T17:20:13.817+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"localhost-startStop-1","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Filter 'traceFilter' configured successfully"} -{"@timestamp":"2017-01-17T17:20:14.175+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.jdbc.datasource.init.ScriptUtils","rest":"Executing SQL script from class path resource [schema.sql]"} -{"@timestamp":"2017-01-17T17:20:14.191+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.jdbc.datasource.init.ScriptUtils","rest":"Executed SQL script from class path resource [schema.sql] in 16 ms."} -{"@timestamp":"2017-01-17T17:20:14.208+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.jdbc.datasource.init.ScriptUtils","rest":"Executing SQL script from class path resource [data.sql]"} -{"@timestamp":"2017-01-17T17:20:14.212+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.jdbc.datasource.init.ScriptUtils","rest":"Executed SQL script from class path resource [data.sql] in 4 ms."} -{"@timestamp":"2017-01-17T17:20:14.306+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.o.j.LocalContainerEntityManagerFactoryBean","rest":"Building JPA container EntityManagerFactory for persistence unit 'default'"} -{"@timestamp":"2017-01-17T17:20:14.322+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.hibernate.jpa.internal.util.LogHelper","rest":"HHH000204: Processing PersistenceUnitInfo [\n\tname: default\n\t...]"} -{"@timestamp":"2017-01-17T17:20:14.384+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"org.hibernate.Version","rest":"HHH000412: Hibernate Core {5.0.11.Final}"} -{"@timestamp":"2017-01-17T17:20:14.384+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"org.hibernate.cfg.Environment","rest":"HHH000206: hibernate.properties not found"} -{"@timestamp":"2017-01-17T17:20:14.400+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"org.hibernate.cfg.Environment","rest":"HHH000021: Bytecode provider name : javassist"} -{"@timestamp":"2017-01-17T17:20:14.432+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"org.hibernate.annotations.common.Version","rest":"HCANN000001: Hibernate Commons Annotations {5.0.1.Final}"} -{"@timestamp":"2017-01-17T17:20:14.541+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"org.hibernate.dialect.Dialect","rest":"HHH000400: Using dialect: org.hibernate.dialect.H2Dialect"} -{"@timestamp":"2017-01-17T17:20:14.962+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.o.j.LocalContainerEntityManagerFactoryBean","rest":"Initialized JPA EntityManagerFactory for persistence unit 'default'"} -{"@timestamp":"2017-01-17T17:20:16.242+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.w.s.m.m.a.RequestMappingHandlerAdapter","rest":"Looking for @ControllerAdvice: org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@2764c546: startup date [Wed Jan 18 01:20:10 CST 2017]; parent: org.springframework.context.annotation.AnnotationConfigApplicationContext@2e5c7f0b"} -{"@timestamp":"2017-01-17T17:20:16.395+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.w.s.m.m.a.RequestMappingHandlerMapping","rest":"Mapped \"{[/{id}],methods=[GET]}\" onto public com.itmuch.cloud.study.entity.User com.itmuch.cloud.study.controller.UserController.findById(java.lang.Long)"} -{"@timestamp":"2017-01-17T17:20:16.395+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.w.s.m.m.a.RequestMappingHandlerMapping","rest":"Mapped \"{[/error]}\" onto public org.springframework.http.ResponseEntity> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)"} -{"@timestamp":"2017-01-17T17:20:16.395+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.w.s.m.m.a.RequestMappingHandlerMapping","rest":"Mapped \"{[/error],produces=[text/html]}\" onto public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)"} -{"@timestamp":"2017-01-17T17:20:16.504+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.w.s.handler.SimpleUrlHandlerMapping","rest":"Mapped URL path [/webjars/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]"} -{"@timestamp":"2017-01-17T17:20:16.504+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.w.s.handler.SimpleUrlHandlerMapping","rest":"Mapped URL path [/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]"} -{"@timestamp":"2017-01-17T17:20:16.582+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.w.s.handler.SimpleUrlHandlerMapping","rest":"Mapped URL path [/**/favicon.ico] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/heapdump || /heapdump.json],methods=[GET],produces=[application/octet-stream]}\" onto public void org.springframework.boot.actuate.endpoint.mvc.HeapdumpMvcEndpoint.invoke(boolean,javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws java.io.IOException,javax.servlet.ServletException"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/health || /health.json],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.HealthMvcEndpoint.invoke(java.security.Principal)"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/resume || /resume.json],methods=[POST]}\" onto public java.lang.Object org.springframework.cloud.endpoint.GenericPostableMvcEndpoint.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/info || /info.json],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/refresh || /refresh.json],methods=[POST]}\" onto public java.lang.Object org.springframework.cloud.endpoint.GenericPostableMvcEndpoint.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/dump || /dump.json],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/configprops || /configprops.json],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/restart || /restart.json],methods=[POST]}\" onto public java.lang.Object org.springframework.cloud.context.restart.RestartMvcEndpoint.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/env],methods=[POST]}\" onto public java.lang.Object org.springframework.cloud.context.environment.EnvironmentManagerMvcEndpoint.value(java.util.Map)"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/env/reset],methods=[POST]}\" onto public java.util.Map org.springframework.cloud.context.environment.EnvironmentManagerMvcEndpoint.reset()"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/metrics/{name:.*}],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.MetricsMvcEndpoint.value(java.lang.String)"} -{"@timestamp":"2017-01-17T17:20:17.455+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/metrics || /metrics.json],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.471+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/autoconfig || /autoconfig.json],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.471+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/trace || /trace.json],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.471+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/env/{name:.*}],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.EnvironmentMvcEndpoint.value(java.lang.String)"} -{"@timestamp":"2017-01-17T17:20:17.471+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/env || /env.json],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.471+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/pause || /pause.json],methods=[POST]}\" onto public java.lang.Object org.springframework.cloud.endpoint.GenericPostableMvcEndpoint.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.471+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/mappings || /mappings.json],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.471+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.a.e.mvc.EndpointHandlerMapping","rest":"Mapped \"{[/beans || /beans.json],methods=[GET],produces=[application/json]}\" onto public java.lang.Object org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter.invoke()"} -{"@timestamp":"2017-01-17T17:20:17.878+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.s.concurrent.ThreadPoolTaskScheduler","rest":"Initializing ExecutorService "} -{"@timestamp":"2017-01-17T17:20:18.142+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Registering beans for JMX exposure on startup"} -{"@timestamp":"2017-01-17T17:20:18.157+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Bean with name 'configurationPropertiesRebinder' has been autodetected for JMX exposure"} -{"@timestamp":"2017-01-17T17:20:18.157+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Bean with name 'refreshEndpoint' has been autodetected for JMX exposure"} -{"@timestamp":"2017-01-17T17:20:18.157+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Bean with name 'restartEndpoint' has been autodetected for JMX exposure"} -{"@timestamp":"2017-01-17T17:20:18.157+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Bean with name 'refreshScope' has been autodetected for JMX exposure"} -{"@timestamp":"2017-01-17T17:20:18.157+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Bean with name 'environmentManager' has been autodetected for JMX exposure"} -{"@timestamp":"2017-01-17T17:20:18.157+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Located managed bean 'environmentManager': registering with JMX server as MBean [org.springframework.cloud.context.environment:name=environmentManager,type=EnvironmentManager]"} -{"@timestamp":"2017-01-17T17:20:18.173+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Located managed bean 'restartEndpoint': registering with JMX server as MBean [org.springframework.cloud.context.restart:name=restartEndpoint,type=RestartEndpoint]"} -{"@timestamp":"2017-01-17T17:20:18.173+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Located managed bean 'refreshScope': registering with JMX server as MBean [org.springframework.cloud.context.scope.refresh:name=refreshScope,type=RefreshScope]"} -{"@timestamp":"2017-01-17T17:20:18.188+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Located managed bean 'configurationPropertiesRebinder': registering with JMX server as MBean [org.springframework.cloud.context.properties:name=configurationPropertiesRebinder,context=2764c546,type=ConfigurationPropertiesRebinder]"} -{"@timestamp":"2017-01-17T17:20:18.188+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Located managed bean 'refreshEndpoint': registering with JMX server as MBean [org.springframework.cloud.endpoint:name=refreshEndpoint,type=RefreshEndpoint]"} -{"@timestamp":"2017-01-17T17:20:18.344+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.c.support.DefaultLifecycleProcessor","rest":"Starting beans in phase 0"} -{"@timestamp":"2017-01-17T17:20:18.438+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"o.s.b.c.e.t.TomcatEmbeddedServletContainer","rest":"Tomcat started on port(s): 8000 (http)"} -{"@timestamp":"2017-01-17T17:20:18.438+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"main","class":"c.i.cloud.study.ProviderUserApplication","rest":"Started ProviderUserApplication in 9.194 seconds (JVM running for 9.956)"} -{"@timestamp":"2017-01-18T01:33:19.033+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.apache.tomcat.util.http.parser.Cookie","rest":"A cookie header was received [1483670041; last-serviceName=microservice-consumer-movie] that contained an invalid cookie. That cookie will be ignored.Note: further occurrences of this error will be logged at DEBUG level."} -{"@timestamp":"2017-01-18T01:33:19.108+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.a.c.c.C.[Tomcat].[localhost].[/]","rest":"Initializing Spring FrameworkServlet 'dispatcherServlet'"} -{"@timestamp":"2017-01-18T01:33:19.109+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.s.web.servlet.DispatcherServlet","rest":"FrameworkServlet 'dispatcherServlet': initialization started"} -{"@timestamp":"2017-01-18T01:33:19.147+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.s.web.servlet.DispatcherServlet","rest":"FrameworkServlet 'dispatcherServlet': initialization completed in 38 ms"} -{"@timestamp":"2017-01-18T01:33:19.216+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Received a request to uri [/1] that should not be sampled [false]"} -{"@timestamp":"2017-01-18T01:33:19.221+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"569ef734f31c63fb","span":"569ef734f31c63fb","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"No parent span present - creating a new span"} -{"@timestamp":"2017-01-18T01:33:19.346+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"569ef734f31c63fb","span":"a9dd8a47c1b55b2e","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Created new span [Trace: 569ef734f31c63fb, Span: a9dd8a47c1b55b2e, Parent: 569ef734f31c63fb, exportable:false] with name [find-by-id]"} -{"@timestamp":"2017-01-18T01:33:19.347+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"569ef734f31c63fb","span":"a9dd8a47c1b55b2e","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Adding a method tag with value [findById] to a span [Trace: 569ef734f31c63fb, Span: a9dd8a47c1b55b2e, Parent: 569ef734f31c63fb, exportable:false]"} -{"@timestamp":"2017-01-18T01:33:19.347+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"569ef734f31c63fb","span":"a9dd8a47c1b55b2e","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Adding a class tag with value [UserController] to a span [Trace: 569ef734f31c63fb, Span: a9dd8a47c1b55b2e, Parent: 569ef734f31c63fb, exportable:false]"} -{"@timestamp":"2017-01-18T01:33:20.049+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"569ef734f31c63fb","span":"a9dd8a47c1b55b2e","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Closing span [Trace: 569ef734f31c63fb, Span: a9dd8a47c1b55b2e, Parent: 569ef734f31c63fb, exportable:false]"} -{"@timestamp":"2017-01-18T01:33:20.076+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"569ef734f31c63fb","span":"569ef734f31c63fb","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-1","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Closing the span [Trace: 569ef734f31c63fb, Span: 569ef734f31c63fb, Parent: null, exportable:false] since the response was successful"} -{"@timestamp":"2017-01-18T01:34:11.495+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-3","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Received a request to uri [/1] that should not be sampled [false]"} -{"@timestamp":"2017-01-18T01:34:11.496+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"3661334aea43b55f","span":"3661334aea43b55f","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-3","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"No parent span present - creating a new span"} -{"@timestamp":"2017-01-18T01:34:11.499+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"3661334aea43b55f","span":"ff9d5012f0d162be","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-3","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Created new span [Trace: 3661334aea43b55f, Span: ff9d5012f0d162be, Parent: 3661334aea43b55f, exportable:false] with name [find-by-id]"} -{"@timestamp":"2017-01-18T01:34:11.500+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"3661334aea43b55f","span":"ff9d5012f0d162be","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-3","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Adding a method tag with value [findById] to a span [Trace: 3661334aea43b55f, Span: ff9d5012f0d162be, Parent: 3661334aea43b55f, exportable:false]"} -{"@timestamp":"2017-01-18T01:34:11.500+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"3661334aea43b55f","span":"ff9d5012f0d162be","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-3","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Adding a class tag with value [UserController] to a span [Trace: 3661334aea43b55f, Span: ff9d5012f0d162be, Parent: 3661334aea43b55f, exportable:false]"} -{"@timestamp":"2017-01-18T01:34:11.503+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"3661334aea43b55f","span":"ff9d5012f0d162be","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-3","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Closing span [Trace: 3661334aea43b55f, Span: ff9d5012f0d162be, Parent: 3661334aea43b55f, exportable:false]"} -{"@timestamp":"2017-01-18T01:34:11.504+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"3661334aea43b55f","span":"3661334aea43b55f","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-3","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Closing the span [Trace: 3661334aea43b55f, Span: 3661334aea43b55f, Parent: null, exportable:false] since the response was successful"} -{"@timestamp":"2017-01-18T01:34:11.551+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-4","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Received a request to uri [/favicon.ico] that should not be sampled [true]"} -{"@timestamp":"2017-01-18T01:34:11.551+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"8f9def4778d827a0","span":"8f9def4778d827a0","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-4","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"No parent span present - creating a new span"} -{"@timestamp":"2017-01-18T01:34:11.615+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-5","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Received a request to uri [/1] that should not be sampled [false]"} -{"@timestamp":"2017-01-18T01:34:11.615+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"746b41c75726d906","span":"746b41c75726d906","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-5","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"No parent span present - creating a new span"} -{"@timestamp":"2017-01-18T01:34:11.620+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"746b41c75726d906","span":"022d3a0766c0486d","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-5","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Created new span [Trace: 746b41c75726d906, Span: 022d3a0766c0486d, Parent: 746b41c75726d906, exportable:false] with name [find-by-id]"} -{"@timestamp":"2017-01-18T01:34:11.620+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"746b41c75726d906","span":"022d3a0766c0486d","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-5","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Adding a method tag with value [findById] to a span [Trace: 746b41c75726d906, Span: 022d3a0766c0486d, Parent: 746b41c75726d906, exportable:false]"} -{"@timestamp":"2017-01-18T01:34:11.620+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"746b41c75726d906","span":"022d3a0766c0486d","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-5","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Adding a class tag with value [UserController] to a span [Trace: 746b41c75726d906, Span: 022d3a0766c0486d, Parent: 746b41c75726d906, exportable:false]"} -{"@timestamp":"2017-01-18T01:34:11.622+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"746b41c75726d906","span":"022d3a0766c0486d","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-5","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Closing span [Trace: 746b41c75726d906, Span: 022d3a0766c0486d, Parent: 746b41c75726d906, exportable:false]"} -{"@timestamp":"2017-01-18T01:34:11.622+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"746b41c75726d906","span":"746b41c75726d906","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-5","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Closing the span [Trace: 746b41c75726d906, Span: 746b41c75726d906, Parent: null, exportable:false] since the response was successful"} -{"@timestamp":"2017-01-18T01:34:11.694+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-6","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Received a request to uri [/favicon.ico] that should not be sampled [true]"} -{"@timestamp":"2017-01-18T01:34:11.694+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"49cd96efc95c41e0","span":"49cd96efc95c41e0","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-6","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"No parent span present - creating a new span"} -{"@timestamp":"2017-01-18T01:34:11.727+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"8f9def4778d827a0","span":"8f9def4778d827a0","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-4","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Closing the span [Trace: 8f9def4778d827a0, Span: 8f9def4778d827a0, Parent: null, exportable:false] since the response was successful"} -{"@timestamp":"2017-01-18T01:34:11.727+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"49cd96efc95c41e0","span":"49cd96efc95c41e0","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-6","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Closing the span [Trace: 49cd96efc95c41e0, Span: 49cd96efc95c41e0, Parent: null, exportable:false] since the response was successful"} -{"@timestamp":"2017-01-18T01:34:11.774+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-7","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Received a request to uri [/1] that should not be sampled [false]"} -{"@timestamp":"2017-01-18T01:34:11.774+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"5e71f8692e1cb415","span":"5e71f8692e1cb415","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-7","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"No parent span present - creating a new span"} -{"@timestamp":"2017-01-18T01:34:11.779+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"5e71f8692e1cb415","span":"5ea495dfc98a5d31","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-7","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Created new span [Trace: 5e71f8692e1cb415, Span: 5ea495dfc98a5d31, Parent: 5e71f8692e1cb415, exportable:false] with name [find-by-id]"} -{"@timestamp":"2017-01-18T01:34:11.779+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"5e71f8692e1cb415","span":"5ea495dfc98a5d31","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-7","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Adding a method tag with value [findById] to a span [Trace: 5e71f8692e1cb415, Span: 5ea495dfc98a5d31, Parent: 5e71f8692e1cb415, exportable:false]"} -{"@timestamp":"2017-01-18T01:34:11.779+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"5e71f8692e1cb415","span":"5ea495dfc98a5d31","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-7","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Adding a class tag with value [UserController] to a span [Trace: 5e71f8692e1cb415, Span: 5ea495dfc98a5d31, Parent: 5e71f8692e1cb415, exportable:false]"} -{"@timestamp":"2017-01-18T01:34:11.782+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"5e71f8692e1cb415","span":"5ea495dfc98a5d31","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-7","class":"o.s.c.s.i.web.TraceHandlerInterceptor","rest":"Closing span [Trace: 5e71f8692e1cb415, Span: 5ea495dfc98a5d31, Parent: 5e71f8692e1cb415, exportable:false]"} -{"@timestamp":"2017-01-18T01:34:11.782+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"5e71f8692e1cb415","span":"5e71f8692e1cb415","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-7","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Closing the span [Trace: 5e71f8692e1cb415, Span: 5e71f8692e1cb415, Parent: null, exportable:false] since the response was successful"} -{"@timestamp":"2017-01-18T01:34:11.825+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"http-nio-8000-exec-8","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Received a request to uri [/favicon.ico] that should not be sampled [true]"} -{"@timestamp":"2017-01-18T01:34:11.826+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"4a03f8ca777230a1","span":"4a03f8ca777230a1","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-8","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"No parent span present - creating a new span"} -{"@timestamp":"2017-01-18T01:34:11.828+00:00","severity":"DEBUG","service":"microservice-provider-user","trace":"4a03f8ca777230a1","span":"4a03f8ca777230a1","parent":"","exportable":"false","pid":"12104","thread":"http-nio-8000-exec-8","class":"o.s.c.sleuth.instrument.web.TraceFilter","rest":"Closing the span [Trace: 4a03f8ca777230a1, Span: 4a03f8ca777230a1, Parent: null, exportable:false] since the response was successful"} -{"@timestamp":"2017-01-18T01:38:26.440+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"RMI TCP Connection(5)-169.254.159.28","class":"o.s.b.a.SpringApplicationAdminMXBeanRegistrar$SpringApplicationAdmin","rest":"Application shutdown requested."} -{"@timestamp":"2017-01-18T01:38:26.440+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"RMI TCP Connection(2)-169.254.159.28","class":"o.s.b.a.SpringApplicationAdminMXBeanRegistrar$SpringApplicationAdmin","rest":"Application shutdown requested."} -{"@timestamp":"2017-01-18T01:38:26.440+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"RMI TCP Connection(6)-169.254.159.28","class":"o.s.b.a.SpringApplicationAdminMXBeanRegistrar$SpringApplicationAdmin","rest":"Application shutdown requested."} -{"@timestamp":"2017-01-18T01:38:26.440+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"RMI TCP Connection(4)-169.254.159.28","class":"o.s.b.a.SpringApplicationAdminMXBeanRegistrar$SpringApplicationAdmin","rest":"Application shutdown requested."} -{"@timestamp":"2017-01-18T01:38:26.441+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"RMI TCP Connection(5)-169.254.159.28","class":"o.s.b.c.e.AnnotationConfigEmbeddedWebApplicationContext","rest":"Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@2764c546: startup date [Wed Jan 18 01:20:10 CST 2017]; parent: org.springframework.context.annotation.AnnotationConfigApplicationContext@2e5c7f0b"} -{"@timestamp":"2017-01-18T01:38:26.440+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"RMI TCP Connection(7)-169.254.159.28","class":"o.s.b.a.SpringApplicationAdminMXBeanRegistrar$SpringApplicationAdmin","rest":"Application shutdown requested."} -{"@timestamp":"2017-01-18T01:38:26.466+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"RMI TCP Connection(5)-169.254.159.28","class":"o.s.c.support.DefaultLifecycleProcessor","rest":"Stopping beans in phase 0"} -{"@timestamp":"2017-01-18T01:38:26.471+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"RMI TCP Connection(5)-169.254.159.28","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Unregistering JMX-exposed beans on shutdown"} -{"@timestamp":"2017-01-18T01:38:26.472+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"RMI TCP Connection(5)-169.254.159.28","class":"o.s.j.e.a.AnnotationMBeanExporter","rest":"Unregistering JMX-exposed beans"} -{"@timestamp":"2017-01-18T01:38:26.475+00:00","severity":"INFO","service":"microservice-provider-user","trace":"","span":"","parent":"","exportable":"","pid":"12104","thread":"RMI TCP Connection(5)-169.254.159.28","class":"o.s.o.j.LocalContainerEntityManagerFactoryBean","rest":"Closing JPA EntityManagerFactory for persistence unit 'default'"} diff --git a/trace/microservice-simple-provider-user-trace-elk/pom.xml b/trace/microservice-simple-provider-user-trace-elk/pom.xml index 2f47ad7bd4cff4b4ff191c7e5ab489bcfdef22a9..73a7abe72e5223ce8e61ae193714916530e70107 100644 --- a/trace/microservice-simple-provider-user-trace-elk/pom.xml +++ b/trace/microservice-simple-provider-user-trace-elk/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -53,7 +53,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/trace/microservice-simple-provider-user-trace-zipkin-stream/pom.xml b/trace/microservice-simple-provider-user-trace-zipkin-stream/pom.xml index 65ed07b514e789ccfc4485f1c6ee131636bb8e4c..5b3222d518cd7200cc296b1affdb8286ec7238ab 100644 --- a/trace/microservice-simple-provider-user-trace-zipkin-stream/pom.xml +++ b/trace/microservice-simple-provider-user-trace-zipkin-stream/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -38,15 +38,11 @@ org.springframework.cloud - spring-cloud-sleuth-stream + spring-cloud-starter-zipkin - org.springframework.cloud - spring-cloud-starter-sleuth - - - org.springframework.cloud - spring-cloud-stream-binder-rabbit + org.springframework.amqp + spring-rabbit @@ -56,7 +52,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/trace/microservice-simple-provider-user-trace-zipkin-stream/src/main/resources/application.yml b/trace/microservice-simple-provider-user-trace-zipkin-stream/src/main/resources/application.yml index 7adf0d73dd5674795c55298169c85630b7ec0ce0..f322c3acb8f8f42e8276b3e3b479d477ba084de1 100644 --- a/trace/microservice-simple-provider-user-trace-zipkin-stream/src/main/resources/application.yml +++ b/trace/microservice-simple-provider-user-trace-zipkin-stream/src/main/resources/application.yml @@ -19,4 +19,7 @@ spring: host: localhost port: 5672 username: guest - password: guest \ No newline at end of file + password: guest + zipkin: + rabbitmq: + queue: zipkin \ No newline at end of file diff --git a/trace/microservice-simple-provider-user-trace-zipkin/pom.xml b/trace/microservice-simple-provider-user-trace-zipkin/pom.xml index ab4a19fb28b5657713c3b9dc77a30a4c994dd27c..e4c9ce47e356dd81681359883d556f5a43895e48 100644 --- a/trace/microservice-simple-provider-user-trace-zipkin/pom.xml +++ b/trace/microservice-simple-provider-user-trace-zipkin/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -52,7 +52,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/trace/microservice-simple-provider-user-trace/pom.xml b/trace/microservice-simple-provider-user-trace/pom.xml index 82365ff6df38f2f1544cf80f9f58821b775e6c18..cdf3c1b40ce511f9eb5614f7d6e1593fa6817def 100644 --- a/trace/microservice-simple-provider-user-trace/pom.xml +++ b/trace/microservice-simple-provider-user-trace/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -48,7 +48,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/trace/microservice-trace-zipkin-server-eureka/pom.xml b/trace/microservice-trace-zipkin-server-eureka/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..be3a0f743ab1a338be1f27bbc1dfb6ee29323521 --- /dev/null +++ b/trace/microservice-trace-zipkin-server-eureka/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + com.itmuch.cloud + microservice-trace-zipkin-server-eureka + 0.0.1-SNAPSHOT + jar + + + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + + + + UTF-8 + 1.8 + + + + + io.zipkin.java + zipkin-autoconfigure-ui + + + io.zipkin.java + zipkin-server + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + Edgware.RELEASE + pom + import + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/trace/microservice-trace-zipkin-server-eureka/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java b/trace/microservice-trace-zipkin-server-eureka/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..65452f88a8c46e98a0f7707b1baa2694ce0da87b --- /dev/null +++ b/trace/microservice-trace-zipkin-server-eureka/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java @@ -0,0 +1,14 @@ +package com.itmuch.cloud.study; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import zipkin.server.EnableZipkinServer; + +@SpringBootApplication +@EnableZipkinServer +public class ZipkinServerApplication { + public static void main(String[] args) { + SpringApplication.run(ZipkinServerApplication.class, args); + } +} diff --git a/trace/microservice-trace-zipkin-server-eureka/src/main/resources/application.yml b/trace/microservice-trace-zipkin-server-eureka/src/main/resources/application.yml new file mode 100644 index 0000000000000000000000000000000000000000..3310916ba04b63385855b4f865d0afb51698da07 --- /dev/null +++ b/trace/microservice-trace-zipkin-server-eureka/src/main/resources/application.yml @@ -0,0 +1,9 @@ +server: + port: 9411 +spring: + application: + name: zipkin-server +eureka: + client: + serviceUrl: + defaultZone: http://localhost:8761/eureka/ diff --git a/trace/microservice-trace-zipkin-server-stream-elasticsearch/pom.xml b/trace/microservice-trace-zipkin-server-stream-elasticsearch/pom.xml index cecda37b70dc996412e2d3faf07dd02252e650a6..d298abe46c68a2daf9edd969cd8cbc9aeb88721c 100644 --- a/trace/microservice-trace-zipkin-server-stream-elasticsearch/pom.xml +++ b/trace/microservice-trace-zipkin-server-stream-elasticsearch/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -21,21 +21,25 @@ - org.springframework.cloud - spring-cloud-sleuth-zipkin-stream + io.zipkin.java + zipkin-autoconfigure-ui io.zipkin.java - zipkin-autoconfigure-ui + zipkin-server + - org.springframework.cloud - spring-cloud-stream-binder-rabbit + io.zipkin.java + zipkin-autoconfigure-collector-rabbitmq + 2.3.1 + + io.zipkin.java zipkin-autoconfigure-storage-elasticsearch-http - 1.16.2 + 2.3.1 @@ -45,7 +49,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/trace/microservice-trace-zipkin-server-stream-elasticsearch/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java b/trace/microservice-trace-zipkin-server-stream-elasticsearch/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java index 5198c68c1e810531e550b5a1130a200c30e4ea61..c35edd3f72cd68a27b41ab39a6756776d63c6791 100644 --- a/trace/microservice-trace-zipkin-server-stream-elasticsearch/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java +++ b/trace/microservice-trace-zipkin-server-stream-elasticsearch/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java @@ -2,10 +2,10 @@ package com.itmuch.cloud.study; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.sleuth.zipkin.stream.EnableZipkinStreamServer; +import zipkin.server.EnableZipkinServer; @SpringBootApplication -@EnableZipkinStreamServer +@EnableZipkinServer public class ZipkinServerApplication { public static void main(String[] args) { SpringApplication.run(ZipkinServerApplication.class, args); diff --git a/trace/microservice-trace-zipkin-server-stream-elasticsearch/src/main/resources/application.yml b/trace/microservice-trace-zipkin-server-stream-elasticsearch/src/main/resources/application.yml index 1e13cf9c6571419e1d4cf1be37561a6e90bb3ae2..ba076a5a175f222e2e1636d0bbb996a7155b363a 100644 --- a/trace/microservice-trace-zipkin-server-stream-elasticsearch/src/main/resources/application.yml +++ b/trace/microservice-trace-zipkin-server-stream-elasticsearch/src/main/resources/application.yml @@ -1,12 +1,12 @@ server: port: 9411 -spring: - rabbitmq: - host: localhost - port: 5672 - username: guest - password: guest zipkin: + collector: + rabbitmq: + addresses: localhost:5672 + password: guest + username: guest + queue: zipkin storage: type: elasticsearch elasticsearch: diff --git a/trace/microservice-trace-zipkin-server-stream/pom.xml b/trace/microservice-trace-zipkin-server-stream/pom.xml index cfe9a16c9c8b7354090adaea450a65a52373ea02..505eae05da3a91441f4444300581d871b7858d9a 100644 --- a/trace/microservice-trace-zipkin-server-stream/pom.xml +++ b/trace/microservice-trace-zipkin-server-stream/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -21,20 +21,19 @@ - org.springframework.cloud - spring-cloud-sleuth-zipkin-stream - - - org.springframework.cloud - spring-cloud-starter-sleuth + io.zipkin.java + zipkin-autoconfigure-ui - org.springframework.cloud - spring-cloud-stream-binder-rabbit + io.zipkin.java + zipkin-server + + io.zipkin.java - zipkin-autoconfigure-ui + zipkin-autoconfigure-collector-rabbitmq + 2.3.1 @@ -44,7 +43,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/trace/microservice-trace-zipkin-server-stream/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java b/trace/microservice-trace-zipkin-server-stream/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java index 5198c68c1e810531e550b5a1130a200c30e4ea61..c35edd3f72cd68a27b41ab39a6756776d63c6791 100644 --- a/trace/microservice-trace-zipkin-server-stream/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java +++ b/trace/microservice-trace-zipkin-server-stream/src/main/java/com/itmuch/cloud/study/ZipkinServerApplication.java @@ -2,10 +2,10 @@ package com.itmuch.cloud.study; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.sleuth.zipkin.stream.EnableZipkinStreamServer; +import zipkin.server.EnableZipkinServer; @SpringBootApplication -@EnableZipkinStreamServer +@EnableZipkinServer public class ZipkinServerApplication { public static void main(String[] args) { SpringApplication.run(ZipkinServerApplication.class, args); diff --git a/trace/microservice-trace-zipkin-server-stream/src/main/resources/application.yml b/trace/microservice-trace-zipkin-server-stream/src/main/resources/application.yml index 8ef62a409243ec9ffae3d176f2bfc4975d0ecad4..69d06bb339c4cfdcbd6f85523af11503d8921246 100644 --- a/trace/microservice-trace-zipkin-server-stream/src/main/resources/application.yml +++ b/trace/microservice-trace-zipkin-server-stream/src/main/resources/application.yml @@ -1,8 +1,9 @@ server: port: 9411 -spring: - rabbitmq: - host: localhost - port: 5672 - username: guest - password: guest \ No newline at end of file +zipkin: + collector: + rabbitmq: + addresses: localhost:5672 + password: guest + username: guest + queue: zipkin \ No newline at end of file diff --git a/trace/microservice-trace-zipkin-server/pom.xml b/trace/microservice-trace-zipkin-server/pom.xml index 01467673a2fd16eb93def048046409992fc16ef5..a7efc1aa2bd0c9a4303dc9b3c3d8e863a52c42cc 100644 --- a/trace/microservice-trace-zipkin-server/pom.xml +++ b/trace/microservice-trace-zipkin-server/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 1.5.9.RELEASE @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Edgware.RELEASE pom import diff --git a/trace/pom.xml b/trace/pom.xml index fffee2eedcf4b18d06fc54f475e10eaf28f3fab9..ec43f08db7e2c5478daea8104c5a61a9dedb50da 100644 --- a/trace/pom.xml +++ b/trace/pom.xml @@ -18,5 +18,8 @@ microservice-trace-zipkin-server microservice-trace-zipkin-server-stream microservice-trace-zipkin-server-stream-elasticsearch + microservice-trace-zipkin-server-eureka + microservice-discovery-eureka + microservice-provider-user-zipkin \ No newline at end of file