From d0ae7e61b3918eced40edd552df15cfface61369 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 12 Apr 2020 20:49:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=94=B9=20Spring=20Cloud=20Sentinel?= =?UTF-8?q?=20=E7=9A=84=E4=BE=9D=E8=B5=96=E6=83=85=E5=86=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/demo-application/pom.xml | 10 +++-- demo/pom.xml | 11 +++++ order/order-application/pom.xml | 11 ++--- .../src/main/resources/application.yaml | 6 +-- pay/pay-application/pom.xml | 11 ++--- .../src/main/resources/application.yaml | 6 +-- pom.xml | 44 ------------------- product/product-application/pom.xml | 5 ++- .../src/main/resources/application.yaml | 8 ++-- promotion/promotion-application/pom.xml | 5 ++- .../src/main/resources/application.yaml | 6 +-- search/search-application/pom.xml | 6 ++- .../src/main/resources/application.yaml | 6 +-- system/system-application/pom.xml | 10 +++-- .../src/main/resources/application.yaml | 6 +-- 15 files changed, 64 insertions(+), 87 deletions(-) diff --git a/demo/demo-application/pom.xml b/demo/demo-application/pom.xml index f13a618eb..e6e3d67fe 100644 --- a/demo/demo-application/pom.xml +++ b/demo/demo-application/pom.xml @@ -81,15 +81,17 @@ qiniu-java-sdk + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + de.codecentric spring-boot-admin-starter-client - - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel - org.springframework.boot diff --git a/demo/pom.xml b/demo/pom.xml index 4dfc1bf8c..50d1176ad 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -21,5 +21,16 @@ demo-mq + + + + cn.iocoder.mall + common-dependencies + 1.0-SNAPSHOT + pom + import + + + diff --git a/order/order-application/pom.xml b/order/order-application/pom.xml index 2e43a9ac1..42d90ee09 100644 --- a/order/order-application/pom.xml +++ b/order/order-application/pom.xml @@ -54,17 +54,18 @@ swagger-bootstrap-ui + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + de.codecentric spring-boot-admin-starter-client - - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel - - org.springframework.boot spring-boot-starter-actuator diff --git a/order/order-application/src/main/resources/application.yaml b/order/order-application/src/main/resources/application.yaml index 24054aa83..fe4489a7f 100644 --- a/order/order-application/src/main/resources/application.yaml +++ b/order/order-application/src/main/resources/application.yaml @@ -1,13 +1,13 @@ spring: application: name: order-application + + # Spring Cloud 配置项 cloud: + # Spring Cloud Sentinel 配置项 sentinel: transport: - port: 8719 dashboard: localhost:12088 - metric: - charset: UTF-8 eager: false # server diff --git a/pay/pay-application/pom.xml b/pay/pay-application/pom.xml index 072c33613..f7b70d7b4 100644 --- a/pay/pay-application/pom.xml +++ b/pay/pay-application/pom.xml @@ -54,6 +54,12 @@ swagger-bootstrap-ui + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + org.springframework.boot @@ -67,11 +73,6 @@ spring-boot-admin-starter-client - - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel - - org.springframework.boot spring-boot-starter-actuator diff --git a/pay/pay-application/src/main/resources/application.yaml b/pay/pay-application/src/main/resources/application.yaml index 3b94cfc54..6f58347bb 100644 --- a/pay/pay-application/src/main/resources/application.yaml +++ b/pay/pay-application/src/main/resources/application.yaml @@ -1,13 +1,13 @@ spring: application: name: pay-application + + # Spring Cloud 配置项 cloud: + # Spring Cloud Sentinel 配置项 sentinel: transport: - port: 8719 dashboard: localhost:12088 - metric: - charset: UTF-8 eager: false # server diff --git a/pom.xml b/pom.xml index 67df02c3a..a7b440c27 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,6 @@ 2.0.1 27.0.1-jre 2.0.1 - 0.9.0.RELEASE 3.8.0 1.16.14 @@ -58,13 +57,9 @@ 2.5 - 0.5.1 - 0.6.0 1.4.1 - - 1.8 6.0.16.Final 1.2.56 @@ -172,27 +167,6 @@ - - io.seata - seata-spring - ${seata.version} - - - io.seata - seata-dubbo - ${seata.version} - - - io.seata - seata-dubbo-alibaba - ${seata.version} - - - io.seata - seata-discovery-zk - ${seata.version} - - com.xuxueli @@ -200,18 +174,6 @@ ${xxl-job.version} - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.curator - curator-recipes - ${curator.version} - - org.apache.rocketmq @@ -245,12 +207,6 @@ ${micrometer.version} - - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel - ${sentinel.version} - - io.prometheus simpleclient_spring_boot diff --git a/product/product-application/pom.xml b/product/product-application/pom.xml index 88cd820ad..8aba527cc 100644 --- a/product/product-application/pom.xml +++ b/product/product-application/pom.xml @@ -59,12 +59,13 @@ swagger-bootstrap-ui - + - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + org.springframework.boot spring-boot-starter-actuator diff --git a/product/product-application/src/main/resources/application.yaml b/product/product-application/src/main/resources/application.yaml index c5072a5ec..b94bbc09a 100644 --- a/product/product-application/src/main/resources/application.yaml +++ b/product/product-application/src/main/resources/application.yaml @@ -1,13 +1,13 @@ spring: application: name: product-application + + # Spring Cloud 配置项 cloud: + # Spring Cloud Sentinel 配置项 sentinel: transport: - port: 8719 dashboard: localhost:12088 - metric: - charset: UTF-8 eager: false # server @@ -31,4 +31,4 @@ swagger: title: 商品子系统 description: 商品子系统 version: 1.0.0 - base-package: cn.iocoder.mall.product.application.controller \ No newline at end of file + base-package: cn.iocoder.mall.product.application.controller diff --git a/promotion/promotion-application/pom.xml b/promotion/promotion-application/pom.xml index f398fafd6..d6bb18129 100644 --- a/promotion/promotion-application/pom.xml +++ b/promotion/promotion-application/pom.xml @@ -70,12 +70,13 @@ swagger-bootstrap-ui - + - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + org.springframework.boot spring-boot-starter-actuator diff --git a/promotion/promotion-application/src/main/resources/application.yaml b/promotion/promotion-application/src/main/resources/application.yaml index d02f99143..974f41128 100644 --- a/promotion/promotion-application/src/main/resources/application.yaml +++ b/promotion/promotion-application/src/main/resources/application.yaml @@ -1,13 +1,13 @@ spring: application: name: promotion-application + + # Spring Cloud 配置项 cloud: + # Spring Cloud Sentinel 配置项 sentinel: transport: - port: 8719 dashboard: localhost:12088 - metric: - charset: UTF-8 eager: false # server diff --git a/search/search-application/pom.xml b/search/search-application/pom.xml index 10f2bfb9c..1f0fbc325 100644 --- a/search/search-application/pom.xml +++ b/search/search-application/pom.xml @@ -59,12 +59,14 @@ swagger-bootstrap-ui - + - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + + org.springframework.boot spring-boot-starter-actuator diff --git a/search/search-application/src/main/resources/application.yaml b/search/search-application/src/main/resources/application.yaml index 9f54ec3e5..811a9f8b5 100644 --- a/search/search-application/src/main/resources/application.yaml +++ b/search/search-application/src/main/resources/application.yaml @@ -1,13 +1,13 @@ spring: application: name: search-application + + # Spring Cloud 配置项 cloud: + # Spring Cloud Sentinel 配置项 sentinel: transport: - port: 8719 dashboard: localhost:12088 - metric: - charset: UTF-8 eager: false # server diff --git a/system/system-application/pom.xml b/system/system-application/pom.xml index 825316704..0e55dc43b 100644 --- a/system/system-application/pom.xml +++ b/system/system-application/pom.xml @@ -55,15 +55,17 @@ qiniu-java-sdk + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + de.codecentric spring-boot-admin-starter-client - - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel - org.springframework.boot diff --git a/user/user-application/src/main/resources/application.yaml b/user/user-application/src/main/resources/application.yaml index 07d939de8..64d9f1bd1 100644 --- a/user/user-application/src/main/resources/application.yaml +++ b/user/user-application/src/main/resources/application.yaml @@ -1,13 +1,13 @@ spring: application: name: user-application + + # Spring Cloud 配置项 cloud: + # Spring Cloud Sentinel 配置项 sentinel: transport: - port: 8719 dashboard: localhost:12088 - metric: - charset: UTF-8 eager: false # server