From 0761607befe143aa3135bbe3f2fd3968a532ff9a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 13 Apr 2020 22:39:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=20seata=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=94=99=E8=AF=AF=202.=20=E5=BC=95=E5=85=A5=20Spring?= =?UTF-8?q?=20Cloud=20Stream=20RocketMQ=20=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order/order-service-impl/pom.xml | 4 ++-- .../src/main/resources/config/application.yaml | 6 ++++++ pay/pay-service-impl/pom.xml | 4 ++-- .../src/main/resources/config/application.yaml | 6 ++++++ pom.xml | 8 -------- .../src/main/resources/config/application.yaml | 7 +++++++ promotion/promotion-service-impl/pom.xml | 10 ++++++++-- .../src/main/resources/config/application.yaml | 6 ++++++ search/search-service-impl/pom.xml | 4 ++-- user/user-service-impl/pom.xml | 4 ++-- 10 files changed, 41 insertions(+), 18 deletions(-) diff --git a/order/order-service-impl/pom.xml b/order/order-service-impl/pom.xml index 29b423cda..8e199e91e 100644 --- a/order/order-service-impl/pom.xml +++ b/order/order-service-impl/pom.xml @@ -100,8 +100,8 @@ - org.apache.rocketmq - rocketmq-spring-boot-starter + com.alibaba.cloud + spring-cloud-starter-stream-rocketmq diff --git a/order/order-service-impl/src/main/resources/config/application.yaml b/order/order-service-impl/src/main/resources/config/application.yaml index fea186f92..764558b7d 100644 --- a/order/order-service-impl/src/main/resources/config/application.yaml +++ b/order/order-service-impl/src/main/resources/config/application.yaml @@ -78,6 +78,12 @@ logging: # Seata 配置项 seata: + tx-service-group: default # Seata 事务组编号，用于 TC 集群名 + # 服务配置项，对应 ServiceProperties 类 + service: + # 虚拟组和分组的映射 + vgroup-mapping: + default: default # Seata 注册中心配置项 registry: type: nacos # 注册中心类型 diff --git a/pay/pay-service-impl/pom.xml b/pay/pay-service-impl/pom.xml index 409c79377..b54c9aae6 100644 --- a/pay/pay-service-impl/pom.xml +++ b/pay/pay-service-impl/pom.xml @@ -74,8 +74,8 @@ - org.apache.rocketmq - rocketmq-spring-boot-starter + com.alibaba.cloud + spring-cloud-starter-stream-rocketmq diff --git a/pay/pay-service-impl/src/main/resources/config/application.yaml b/pay/pay-service-impl/src/main/resources/config/application.yaml index 661f9eb12..712a4fa27 100644 --- a/pay/pay-service-impl/src/main/resources/config/application.yaml +++ b/pay/pay-service-impl/src/main/resources/config/application.yaml @@ -50,6 +50,12 @@ rocketmq: # Seata 配置项 seata: + tx-service-group: default # Seata 事务组编号，用于 TC 集群名 + # 服务配置项，对应 ServiceProperties 类 + service: + # 虚拟组和分组的映射 + vgroup-mapping: + default: default # Seata 注册中心配置项 registry: type: nacos # 注册中心类型 diff --git a/pom.xml b/pom.xml index faa205027..51f109ef4 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ 3.1.1 2.0.1 27.0.1-jre - 2.0.1 3.8.0 1.16.14 @@ -171,13 +170,6 @@ ${xxl-job.version} - - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq-spring-boot-starter.version} - - com.qiniu diff --git a/product/product-service-impl/src/main/resources/config/application.yaml b/product/product-service-impl/src/main/resources/config/application.yaml index 5d64b92ef..457345fec 100644 --- a/product/product-service-impl/src/main/resources/config/application.yaml +++ b/product/product-service-impl/src/main/resources/config/application.yaml @@ -70,6 +70,12 @@ dubbo: # Seata 配置项 seata: + tx-service-group: default # Seata 事务组编号，用于 TC 集群名 + # 服务配置项，对应 ServiceProperties 类 + service: + # 虚拟组和分组的映射 + vgroup-mapping: + default: default # Seata 注册中心配置项 registry: type: nacos # 注册中心类型 @@ -77,3 +83,4 @@ seata: serverAddr: ${spring.cloud.nacos.discovery.server-addr} # Nacos 服务地址 namespace: # Nacos 命名空间 cluster: default # 使用的 Seata 分组 + diff --git a/promotion/promotion-service-impl/pom.xml b/promotion/promotion-service-impl/pom.xml index ae030dfb1..4efc68b1f 100644 --- a/promotion/promotion-service-impl/pom.xml +++ b/promotion/promotion-service-impl/pom.xml @@ -66,10 +66,16 @@ spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-alibaba-seata + + - org.apache.rocketmq - rocketmq-spring-boot-starter + com.alibaba.cloud + spring-cloud-starter-stream-rocketmq diff --git a/promotion/promotion-service-impl/src/main/resources/config/application.yaml b/promotion/promotion-service-impl/src/main/resources/config/application.yaml index bcd293415..42442cfe3 100644 --- a/promotion/promotion-service-impl/src/main/resources/config/application.yaml +++ b/promotion/promotion-service-impl/src/main/resources/config/application.yaml @@ -56,6 +56,12 @@ dubbo: # Seata 配置项 seata: + tx-service-group: default # Seata 事务组编号，用于 TC 集群名 + # 服务配置项，对应 ServiceProperties 类 + service: + # 虚拟组和分组的映射 + vgroup-mapping: + default: default # Seata 注册中心配置项 registry: type: nacos # 注册中心类型 diff --git a/search/search-service-impl/pom.xml b/search/search-service-impl/pom.xml index a5ef51c25..ed048e831 100644 --- a/search/search-service-impl/pom.xml +++ b/search/search-service-impl/pom.xml @@ -54,8 +54,8 @@ - org.apache.rocketmq - rocketmq-spring-boot-starter + com.alibaba.cloud + spring-cloud-starter-stream-rocketmq diff --git a/user/user-service-impl/pom.xml b/user/user-service-impl/pom.xml index b2845230a..3a29ccc64 100644 --- a/user/user-service-impl/pom.xml +++ b/user/user-service-impl/pom.xml @@ -67,8 +67,8 @@ - org.apache.rocketmq - rocketmq-spring-boot-starter + com.alibaba.cloud + spring-cloud-starter-stream-rocketmq