浏览代码

去除seata

24282 2 年之前
父节点
当前提交
583783272d

+ 3 - 3
hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -3,6 +3,7 @@ package com.fjhx.flow.service.flow.impl;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fjhx.flow.core.FlowBean;
 import com.fjhx.flow.core.FlowDelegate;
@@ -28,7 +29,6 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -63,7 +63,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
     @Autowired
     private ISysUserService sysUserService;
 
-    @GlobalTransactional
+    @DSTransactional
     @Override
     public FlowResult initiate(InitiateDto dto) {
 
@@ -183,7 +183,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
         return flowResult;
     }
 
-    @GlobalTransactional
+    @DSTransactional
     @Override
     public FlowResult jump(JumpDto dto) {
         Long flowId = dto.getFlowId();

+ 2 - 2
hx-kd100/src/main/java/com/fjhx/kd100/controller/callback/CallbackConfig.java

@@ -2,13 +2,13 @@ package com.fjhx.kd100.controller.callback;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.fjhx.kd100.entity.logistics.po.LogisticsInfo;
 import com.fjhx.kd100.event.Kd100CallbackEvent;
 import com.fjhx.kd100.service.logistics.LogisticsInfoService;
 import com.fjhx.kd100.util.KD100Util;
 import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.constant.BaseSourceConstant;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,7 +34,7 @@ public class CallbackConfig {
      * 物流公司列表
      */
     @PostMapping("/callback")
-    @GlobalTransactional(rollbackFor = Exception.class)
+    @DSTransactional
     public synchronized JSONObject callback(@RequestBody String data) {
         // 解析回调参数
         JSONObject result = KD100Util.parseCallbackData(data);

+ 0 - 16
ruoyi-admin/src/main/resources/application-dev.yml

@@ -2,7 +2,6 @@
 spring:
     datasource:
         dynamic:
-            seata: true
             strict: true
             primary: base
             datasource:
@@ -45,18 +44,3 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间(使用负值表示没有限制)
                 max-wait: -1ms
-
-seata:
-    config:
-        type: file
-    application-id: springboot-seata
-    #  enable-auto-data-source-proxy: false
-    registry:
-        type: file
-    service:
-        group-list:
-            default: 116.205.247.33:8091
-        vgroup-mapping:
-            springboot-seata-group: default
-    # seata 事务组编号 用于TC集群名
-    tx-service-group: springboot-seata-group

+ 0 - 7
ruoyi-common/pom.xml

@@ -73,13 +73,6 @@
             <version>3.6.1</version>
         </dependency>
 
-        <!-- seata-spring-boot-starter -->
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-spring-boot-starter</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-
         <!-- 阿里JSON解析器 -->
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>