需改 Spring Cloud Sentinel 的依赖情况。

2020-04-12 20:49:55 +08:00 · 2020-04-12 20:49:55 +08:00 · d0ae7e61b3
parent 3b49aff5a4
commit d0ae7e61b3
15 changed files with 64 additions and 87 deletions
--- a/demo/demo-application/pom.xml
+++ b/demo/demo-application/pom.xml
@ -81,15 +81,17 @@
            <artifactId>qiniu-java-sdk</artifactId>
        </dependency>

+        <!-- 服务保障相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
        <!-- 监控相关 -->
        <dependency>
            <groupId>de.codecentric</groupId>
            <artifactId>spring-boot-admin-starter-client</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
--- a/demo/pom.xml
+++ b/demo/pom.xml
@ -21,5 +21,16 @@
        <module>demo-mq</module>
    </modules>

+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>cn.iocoder.mall</groupId>
+                <artifactId>common-dependencies</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>

 </project>
--- a/order/order-application/pom.xml
+++ b/order/order-application/pom.xml
@ -54,17 +54,18 @@
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>

+        <!-- 服务保障相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
        <!-- 监控相关 -->
        <dependency>
            <groupId>de.codecentric</groupId>
            <artifactId>spring-boot-admin-starter-client</artifactId>
        </dependency>

-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
--- 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
--- a/pay/pay-application/pom.xml
+++ b/pay/pay-application/pom.xml
@ -54,6 +54,12 @@
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>

+        <!-- 服务保障相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
        <!-- 测试相关 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@ -67,11 +73,6 @@
            <artifactId>spring-boot-admin-starter-client</artifactId>
        </dependency>

-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
--- 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
--- a/pom.xml
+++ b/pom.xml
@ -48,7 +48,6 @@
        <xxl-job.version>2.0.1</xxl-job.version>
        <guava.version>27.0.1-jre</guava.version>
        <rocketmq-spring-boot-starter.version>2.0.1</rocketmq-spring-boot-starter.version>
-        <sentinel.version>0.9.0.RELEASE</sentinel.version>

        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
        <org.projectlombok.version>1.16.14</org.projectlombok.version>
@ -58,13 +57,9 @@

        <servlet.version>2.5</servlet.version>

-        <seata.version>0.5.1</seata.version>
-
        <prometheus-spring-boot.version>0.6.0</prometheus-spring-boot.version>
        <micrometer.version>1.4.1</micrometer.version>

-<!--        <seata.version>0.6.0-SNAPSHOT</seata.version>-->
-
        <java.version>1.8</java.version>
        <hibernate-validator.version>6.0.16.Final</hibernate-validator.version>
        <fastjson.version>1.2.56</fastjson.version>
@ -172,27 +167,6 @@
                </exclusions>
            </dependency>

-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-spring</artifactId>
-                <version>${seata.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-dubbo</artifactId>
-                <version>${seata.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-dubbo-alibaba</artifactId>
-                <version>${seata.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-discovery-zk</artifactId>
-                <version>${seata.version}</version>
-            </dependency>
-
            <!-- Job 相关 -->
            <dependency>
                <groupId>com.xuxueli</groupId>
@ -200,18 +174,6 @@
                <version>${xxl-job.version}</version>
            </dependency>

-            <!-- Registry 和 Config 相关 -->
-            <dependency>
-                <groupId>org.apache.curator</groupId>
-                <artifactId>curator-framework</artifactId>
-                <version>${curator.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.curator</groupId>
-                <artifactId>curator-recipes</artifactId>
-                <version>${curator.version}</version>
-            </dependency>
-
            <!-- MQ 相关 -->
            <dependency>
                <groupId>org.apache.rocketmq</groupId>
@ -245,12 +207,6 @@
                <version>${micrometer.version}</version>
            </dependency>

-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-                <version>${sentinel.version}</version>
-            </dependency>
-
            <dependency>
                <groupId>io.prometheus</groupId>
                <artifactId>simpleclient_spring_boot</artifactId>
--- a/product/product-application/pom.xml
+++ b/product/product-application/pom.xml
@ -59,12 +59,13 @@
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>

-        <!--  监控  -->
+        <!-- 服务保障相关 -->
        <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
        </dependency>

+        <!--  监控  -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
--- 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
+  base-package: cn.iocoder.mall.product.application.controller
--- a/promotion/promotion-application/pom.xml
+++ b/promotion/promotion-application/pom.xml
@ -70,12 +70,13 @@
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>

-        <!--  监控  -->
+        <!-- 服务保障相关 -->
        <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
        </dependency>

+        <!--  监控  -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
--- 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
--- a/search/search-application/pom.xml
+++ b/search/search-application/pom.xml
@ -59,12 +59,14 @@
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>

-        <!--  监控  -->
+        <!-- 服务保障相关 -->
        <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
        </dependency>

+        <!--  监控  -->
+
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
--- 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
--- a/system/system-application/pom.xml
+++ b/system/system-application/pom.xml
@ -55,15 +55,17 @@
            <artifactId>qiniu-java-sdk</artifactId>
        </dependency>

+        <!-- 服务保障相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
        <!-- 监控相关 -->
        <dependency>
            <groupId>de.codecentric</groupId>
            <artifactId>spring-boot-admin-starter-client</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
--- 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