优化databus bug

java110

2022-06-28 22e8a676ee42c0d78b3526bcd9a635abbe8dca03

 java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java

old mode 100644
new mode 100755
@@ -7,8 +7,12 @@
import com.java110.utils.util.StringUtil;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.*;
import com.java110.core.log.LoggerFactory;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;

@@ -84,6 +88,7 @@
    }

    public static String getOrCreateOId(OrderDto orderDto) {

        //全局事务开启者
        if (StringUtils.isEmpty(orderDto.getoId())) {
            createOId(orderDto);
@@ -94,6 +99,21 @@
        //将事务ID 存放起来
        put(O_ID, orderDto.getoId());
        return orderDto.getoId();
    }

    /**
     * 清理事务
     */
    public static void clearOId() {
        //清理事务
        if(!StringUtil.isEmpty(getOId())) {
            remove(O_ID);
        }
        //清理角色
        if(!StringUtil.isEmpty(getServiceRole())) {
            remove(SERVICE_ROLE);
        }

    }

    /**
@@ -153,6 +173,7 @@
     * 处理失败，回退事务
     */
    public static void fallbackOId() {

        String oId = getOId();
        if (StringUtil.isEmpty(oId) || ROLE_OBSERVER.equals(getServiceRole())) {
            //当前没有开启事务无需回退