diff --git a/demo/demo-application/pom.xml b/demo/demo-application/pom.xml index f13a618ebeaa07524a04ea83a8388fb40a67051c..e6e3d67fe15dafecb6ff5d4bb946bd0d68b37b30 100644 --- 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> diff --git a/demo/pom.xml b/demo/pom.xml index 4dfc1bf8c1dcdc23296040b86d95d5c6c746913e..50d1176ad6716c1c822c400d00e505cee198c79e 100644 --- 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> diff --git a/order/order-application/pom.xml b/order/order-application/pom.xml index 2e43a9ac1cc7b93749645b71a4cc87eb32a6f17f..42d90ee09f067c87656fbc664306e155cb451903 100644 --- a/order/order-application/pom.xml +++ b/order/order-application/pom.xml @@ -54,15 +54,16 @@ <artifactId>swagger-bootstrap-ui</artifactId> </dependency> - <!-- 监控相关 --> + <!-- æœåŠ¡ä¿éšœç›¸å…³ --> <dependency> - <groupId>de.codecentric</groupId> - <artifactId>spring-boot-admin-starter-client</artifactId> + <groupId>com.alibaba.cloud</groupId> + <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId> </dependency> + <!-- 监控相关 --> <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId> + <groupId>de.codecentric</groupId> + <artifactId>spring-boot-admin-starter-client</artifactId> </dependency> <dependency> diff --git a/order/order-application/src/main/resources/application.yaml b/order/order-application/src/main/resources/application.yaml index 24054aa83f4a842c5f4fa6cf1282bc40fa32cc17..fe4489a7f63faf6450373c5f372102b581a8fd2f 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 072c336132457440ab1eccff734dec44e46af455..f7b70d7b4feae009d67766b90f3e9967ed8eb62e 100644 --- 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> diff --git a/pay/pay-application/src/main/resources/application.yaml b/pay/pay-application/src/main/resources/application.yaml index 3b94cfc54a6e210011ab162f066d60c3ffc8cf84..6f58347bbdec073e4650ce6122f65e2faa0e471d 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 67df02c3ad1647a4af0226bd3fcc8ce146ff6b2e..a7b440c2747e2711b7febf4b555b501a238fe815 100644 --- 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> diff --git a/product/product-application/pom.xml b/product/product-application/pom.xml index 88cd820ade0b330edbc2f394ef9f1538ae63dd5d..8aba527cc31f1b926c511bf08eb3faa209aa01c3 100644 --- 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> diff --git a/product/product-application/src/main/resources/application.yaml b/product/product-application/src/main/resources/application.yaml index c5072a5ec86b65e810d513ae3be3362406a183d9..b94bbc09a5ee957b5f828223b5e0da19025fd422 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 f398fafd62ed6203a9bac4690f524b7f51dd53b6..d6bb18129db49c2bdcfe9861381520ac03f248f0 100644 --- 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> diff --git a/promotion/promotion-application/src/main/resources/application.yaml b/promotion/promotion-application/src/main/resources/application.yaml index d02f991432a8b940f9c6b377338ac2a1a70c60f6..974f41128b8acd5ddc411cdcc54e0fc9d213215c 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 10f2bfb9cebd25bb93578cf969b24cc66eec39f4..1f0fbc325b9ad2e1baea093a136162c4bfd3cef1 100644 --- 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> diff --git a/search/search-application/src/main/resources/application.yaml b/search/search-application/src/main/resources/application.yaml index 9f54ec3e515ca6b6c24bd2d8120532c4d38d0356..811a9f8b5ece309bb525394ef460ec7c6a86e181 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 825316704960bb66775beadd154b50331d69abfe..0e55dc43b9d8f9665163d485fe1e608ee9126451 100644 --- 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> diff --git a/user/user-application/src/main/resources/application.yaml b/user/user-application/src/main/resources/application.yaml index 07d939de8399749f94b5bb72e4b4e067acf483be..64d9f1bd1c60e13c9505d292eb9b51be64233549 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