diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml
index 543f5c5a..c66b6960 100644
--- a/blade-ops/blade-flow/pom.xml
+++ b/blade-ops/blade-flow/pom.xml
@@ -31,6 +31,11 @@
blade-starter-swagger
${bladex.tool.version}
+
+ org.springblade
+ blade-starter-transaction
+ ${bladex.tool.version}
+
org.springblade
blade-dict-api
diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flow/FlowApplication.java b/blade-ops/blade-flow/src/main/java/org/springblade/flow/FlowApplication.java
index 5eb47c8b..d42c0784 100644
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flow/FlowApplication.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flow/FlowApplication.java
@@ -19,7 +19,7 @@ package org.springblade.flow;
import org.springblade.core.cloud.feign.EnableBladeFeign;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
-import org.springframework.cloud.client.SpringCloudApplication;
+import org.springblade.transaction.annotation.SeataCloudApplication;
/**
* Flowable启动器
@@ -27,7 +27,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
* @author Chill
*/
@EnableBladeFeign
-@SpringCloudApplication
+@SeataCloudApplication
public class FlowApplication {
public static void main(String[] args) {
diff --git a/blade-ops/blade-flow/src/main/resources/registry.conf b/blade-ops/blade-flow/src/main/resources/registry.conf
new file mode 100644
index 00000000..da0dda80
--- /dev/null
+++ b/blade-ops/blade-flow/src/main/resources/registry.conf
@@ -0,0 +1,20 @@
+registry {
+ # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
+ type = "nacos"
+
+ nacos {
+ serverAddr = "localhost"
+ namespace = ""
+ cluster = "default"
+ }
+}
+
+config {
+ # file、nacos 、apollo、zk、consul、etcd3
+ type = "nacos"
+
+ nacos {
+ serverAddr = "localhost"
+ namespace = ""
+ }
+}
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index ea9384f7..4332925a 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -52,6 +52,11 @@
blade-starter-qiniu
${bladex.tool.version}
+
+ org.springblade
+ blade-starter-transaction
+ ${bladex.tool.version}
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/DeskApplication.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/DeskApplication.java
index 22a95378..90466755 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/DeskApplication.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/DeskApplication.java
@@ -19,7 +19,7 @@ package org.springblade.desk;
import org.springblade.core.cloud.feign.EnableBladeFeign;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
-import org.springframework.cloud.client.SpringCloudApplication;
+import org.springblade.transaction.annotation.SeataCloudApplication;
/**
* Desk启动器
@@ -27,7 +27,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
* @author Chill
*/
@EnableBladeFeign
-@SpringCloudApplication
+@SeataCloudApplication
public class DeskApplication {
public static void main(String[] args) {
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java
index c59540da..ac7f0468 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.springblade.desk.service.impl;
+import io.seata.spring.annotation.GlobalTransactional;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
@@ -36,8 +37,6 @@ import org.springblade.flow.core.utils.TaskUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
-
/**
* 服务实现类
*
@@ -51,6 +50,7 @@ public class LeaveServiceImpl extends BaseServiceImpl
private IFlowClient flowClient;
@Override
+ @GlobalTransactional
@Transactional(rollbackFor = Exception.class)
public boolean startProcess(ProcessLeave leave) {
String businessTable = FlowUtil.getBusinessTable(ProcessConstant.LEAVE_KEY);
diff --git a/blade-service/blade-desk/src/main/resources/registry.conf b/blade-service/blade-desk/src/main/resources/registry.conf
new file mode 100644
index 00000000..da0dda80
--- /dev/null
+++ b/blade-service/blade-desk/src/main/resources/registry.conf
@@ -0,0 +1,20 @@
+registry {
+ # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
+ type = "nacos"
+
+ nacos {
+ serverAddr = "localhost"
+ namespace = ""
+ cluster = "default"
+ }
+}
+
+config {
+ # file、nacos 、apollo、zk、consul、etcd3
+ type = "nacos"
+
+ nacos {
+ serverAddr = "localhost"
+ namespace = ""
+ }
+}
diff --git a/pom.xml b/pom.xml
index 71989be9..639dada8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,8 +31,8 @@
2.1.0.RELEASE
- 2.1.7.RELEASE
- Greenwich.SR2
+ 2.1.8.RELEASE
+ Greenwich.SR3
Cairo-SR8