seata分布式事务

blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -48,9 +48,9 @@ public class LauncherServiceImpl implements LauncherService {
 		// seata注册地址
 		// PropsUtil.setProperty(props, "seata.service.grouplist.default", LauncherConstant.seataAddr(profile));
 		// seata注册group格式
-		// PropsUtil.setProperty(props, "seata.tx-service-group", LauncherConstant.seataServiceGroup(appName));
+		 PropsUtil.setProperty(props, "seata.tx-service-group", LauncherConstant.seataServiceGroup(appName));
 		// seata配置服务group
-		// PropsUtil.setProperty(props, "seata.service.vgroup-mapping.".concat(LauncherConstant.seataServiceGroup(appName)), LauncherConstant.DEFAULT_MODE);
+		 PropsUtil.setProperty(props, "seata.service.vgroup-mapping.".concat(LauncherConstant.seataServiceGroup(appName)), LauncherConstant.DEFAULT_MODE);
 		// seata注册模式配置
 		// PropsUtil.setProperty(props, "seata.registry.type", LauncherConstant.NACOS_MODE);
 		// PropsUtil.setProperty(props, "seata.registry.nacos.server-addr", LauncherConstant.nacosAddr(profile));

blade-ops/blade-flow/pom.xml

@@ -28,10 +28,10 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-transaction</artifactId>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>

blade-ops/blade-flow/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java

@@ -18,6 +18,7 @@ package org.springblade.flow.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import org.flowable.engine.HistoryService;
 import org.flowable.engine.TaskService;
@@ -270,7 +271,8 @@ public class FlowBusinessServiceImpl implements FlowBusinessService {
 	}
 
 	@Override
-	@Transactional
+	@GlobalTransactional
+	@Transactional(rollbackFor = Exception.class)
 	public boolean checkCompleteTask(BladeFlow flow)
 	{
 		ProcessLeave processLeave = processClient.findById(Long.valueOf(flow.getBusinessId()));

blade-service/blade-client/pom.xml

@@ -81,6 +81,10 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-excel</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>
     </dependencies>
 
 

blade-service/blade-client/src/main/java/org/springblade/client/ClientApplication.java

@@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
@@ -22,7 +23,7 @@ import org.springframework.context.annotation.ComponentScan;
 @EnableFeignClients({"org.springblade"})
 @ComponentScan(value = {"org.springblade.client.*"})
 @MapperScan({"org.springblade.client.**.mapper.**", "org.springblade.client.**.assemble.mapstruct.**"})
-// @SeataCloudApplication
+@SeataCloudApplication
 public class ClientApplication {
 
 	public static void main(String[] args) {

blade-service/blade-deliver-goods/pom.xml

@@ -44,6 +44,10 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/DeliverGoodsApplication.java

@@ -19,6 +19,7 @@ package org.springblade.deliver.goods;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 
 /**
@@ -32,7 +33,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-// @SeataCloudApplication
+@SeataCloudApplication
 public class DeliverGoodsApplication {
 
 	public static void main(String[] args) {

blade-service/blade-desk/pom.xml

@@ -61,10 +61,10 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-transaction</artifactId>
-        </dependency>-->
+        </dependency>
     </dependencies>
 
     <build>

blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java

@@ -17,6 +17,7 @@
 package org.springblade.desk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
@@ -84,6 +85,7 @@ public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave>
 	}
 
 	@Override
+	@GlobalTransactional
 	@Transactional
 	public boolean startCheckProcess(ProcessLeave check)
 	{

blade-service/blade-mocha-item/pom.xml

@@ -58,6 +58,10 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/MochaItemApplication.java

@@ -19,6 +19,7 @@ package org.springblade.mocha;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 
 /**
@@ -32,7 +33,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-// @SeataCloudApplication
+@SeataCloudApplication
 public class MochaItemApplication {
 
 	public static void main(String[] args) {

blade-service/blade-project/pom.xml

@@ -67,10 +67,10 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-transaction</artifactId>
-        </dependency>-->
+        </dependency>
     </dependencies>
 
     <build>

blade-service/blade-project/src/main/java/org/springblade/project/ProjectApplication.java

@@ -19,6 +19,7 @@ package org.springblade.project;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
 import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 
 /**
@@ -28,7 +29,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-// @SeataCloudApplication
+@SeataCloudApplication
 public class ProjectApplication {
 
 	public static void main(String[] args) {

blade-service/blade-purchase-sales/pom.xml

@@ -45,6 +45,10 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/PurchaseSalesApplication.java

@@ -19,6 +19,7 @@ package org.springblade.purchase.sales;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 
 /**
@@ -32,7 +33,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-// @SeataCloudApplication
+@SeataCloudApplication
 public class PurchaseSalesApplication {
 
 	public static void main(String[] args) {

blade-service/blade-stock/pom.xml

@@ -46,6 +46,10 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

blade-service/blade-stock/src/main/java/org/springblade/stock/StockApplication.java

@@ -19,6 +19,7 @@ package org.springblade.stock;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 
 /**
@@ -32,7 +33,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-// @SeataCloudApplication
+@SeataCloudApplication
 public class StockApplication {
 
 	public static void main(String[] args) {

blade-service/trade-finance/pom.xml

@@ -71,7 +71,10 @@
             <version>2.10.10</version>
             <scope>compile</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>
     </dependencies>
 
 

blade-service/trade-finance/src/main/java/com/trade/finance/FinanceApplication.java

@@ -20,6 +20,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
 import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 
 /**
@@ -30,6 +31,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
 @EnableBladeFeign
 @SpringCloudApplication
 @MapperScan({"com.trade.finance.**.mapper.**"})
+@SeataCloudApplication
 public class FinanceApplication {
 
 	public static void main(String[] args) {

blade-service/trade-purchase/pom.xml

@@ -71,6 +71,10 @@
             <version>2.10.10</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>
 
     </dependencies>
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/PurchaseApplication.java

@@ -3,6 +3,7 @@ package com.trade.purchase;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
@@ -17,7 +18,7 @@ import org.springframework.context.annotation.ComponentScan;
 @EnableFeignClients({"org.springblade", "com.trade"})
 @ComponentScan(value = {"com.trade.purchase.*"})
 @MapperScan({"com.trade.purchase.**.mapper.**"})
-// @SeataCloudApplication
+@SeataCloudApplication
 public class PurchaseApplication {
 
 	public static void main(String[] args) {