From 8180ee16957421ac69eb5dea4426f983061aa9a1 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Tue, 26 Apr 2022 16:12:21 +0800 Subject: [PATCH 01/24] dtmcli-java v2 --- dtmcli-common/pom.xml | 64 +++++++ .../src/main/java/constant/Constants.java | 37 ++++ .../java/constant/ParamFieldConstants.java | 27 +++ .../src/main/java/enums/TransTypeEnum.java | 29 ++++ .../src/main/java/exception/DtmException.java | 11 ++ .../main/java/interfaces/dtm/DtmConsumer.java | 8 + .../main/java/interfaces/dtm/IDtmService.java | 4 + .../interfaces/feign/IDtmFeignClient.java | 26 +++ .../java/interfaces/feign/IURIParser.java | 7 + .../src/main/java/model/dtm/TransBase.java | 23 +++ .../main/java/model/feign/ServiceMessage.java | 73 ++++++++ .../main/java/model/param/OperatorParam.java | 58 +++++++ .../java/model/response/ResponseBase.java | 20 +++ .../src/main/java/utils/FeignUtils.java | 66 +++++++ .../src/main/java/utils/HttpUtils.java | 63 +++++++ .../target/maven-archiver/pom.properties | 5 + .../compile/default-compile/createdFiles.lst | 14 ++ .../compile/default-compile/inputFiles.lst | 0 .../default-testCompile/inputFiles.lst | 0 dtmcli-core/pom.xml | 36 ++++ .../java/barrier/BranchBarrierService.java | 69 ++++++++ .../main/java/barrier/model/BarrierParam.java | 30 ++++ .../java/barrier/model/BranchBarrier.java | 46 +++++ .../src/main/java/base/BranchIdGenerator.java | 32 ++++ dtmcli-core/src/main/java/tcc/TccService.java | 117 +++++++++++++ dtmcli-core/src/main/java/tcc/model/Tcc.java | 19 +++ .../target/maven-archiver/pom.properties | 5 + .../compile/default-compile/createdFiles.lst | 6 + .../compile/default-compile/inputFiles.lst | 6 + .../default-testCompile/inputFiles.lst | 0 dtmcli-java/pom.xml | 47 +++++ .../src/main/java/client/DtmClient.java | 87 ++++++++++ .../src/main/java/feign/DtmFeignClient.java | 44 +++++ .../src/main/java/feign/URIParser.java | 25 +++ .../main/java/properties/DtmProperties.java | 37 ++++ .../src/main/java/utils/NacosUtils.java | 23 +++ .../target/maven-archiver/pom.properties | 5 + .../compile/default-compile/createdFiles.lst | 5 + .../compile/default-compile/inputFiles.lst | 5 + .../default-testCompile/inputFiles.lst | 0 dtmcli-spring/pom.xml | 93 ++++++++++ .../src/main/java/client/DtmClient.java | 25 +++ .../java/configuration/DtmConfiguration.java | 44 +++++ .../src/main/java/feign/DtmFeignClient.java | 51 ++++++ .../src/main/java/feign/URIParser.java | 26 +++ .../main/java/properties/DtmProperties.java | 15 ++ .../main/resources/META-INF/spring.factories | 1 + .../spring-configuration-metadata.json | 22 +++ .../target/classes/META-INF/spring.factories | 1 + .../target/maven-archiver/pom.properties | 5 + .../compile/default-compile/createdFiles.lst | 6 + .../compile/default-compile/inputFiles.lst | 5 + .../default-testCompile/inputFiles.lst | 0 pom.xml | 161 +++++++++++++----- 54 files changed, 1587 insertions(+), 47 deletions(-) create mode 100644 dtmcli-common/pom.xml create mode 100644 dtmcli-common/src/main/java/constant/Constants.java create mode 100644 dtmcli-common/src/main/java/constant/ParamFieldConstants.java create mode 100644 dtmcli-common/src/main/java/enums/TransTypeEnum.java create mode 100644 dtmcli-common/src/main/java/exception/DtmException.java create mode 100644 dtmcli-common/src/main/java/interfaces/dtm/DtmConsumer.java create mode 100644 dtmcli-common/src/main/java/interfaces/dtm/IDtmService.java create mode 100644 dtmcli-common/src/main/java/interfaces/feign/IDtmFeignClient.java create mode 100644 dtmcli-common/src/main/java/interfaces/feign/IURIParser.java create mode 100644 dtmcli-common/src/main/java/model/dtm/TransBase.java create mode 100644 dtmcli-common/src/main/java/model/feign/ServiceMessage.java create mode 100644 dtmcli-common/src/main/java/model/param/OperatorParam.java create mode 100644 dtmcli-common/src/main/java/model/response/ResponseBase.java create mode 100644 dtmcli-common/src/main/java/utils/FeignUtils.java create mode 100644 dtmcli-common/src/main/java/utils/HttpUtils.java create mode 100644 dtmcli-common/target/maven-archiver/pom.properties create mode 100644 dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 dtmcli-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 dtmcli-core/pom.xml create mode 100644 dtmcli-core/src/main/java/barrier/BranchBarrierService.java create mode 100644 dtmcli-core/src/main/java/barrier/model/BarrierParam.java create mode 100644 dtmcli-core/src/main/java/barrier/model/BranchBarrier.java create mode 100644 dtmcli-core/src/main/java/base/BranchIdGenerator.java create mode 100644 dtmcli-core/src/main/java/tcc/TccService.java create mode 100644 dtmcli-core/src/main/java/tcc/model/Tcc.java create mode 100644 dtmcli-core/target/maven-archiver/pom.properties create mode 100644 dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 dtmcli-core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 dtmcli-java/pom.xml create mode 100644 dtmcli-java/src/main/java/client/DtmClient.java create mode 100644 dtmcli-java/src/main/java/feign/DtmFeignClient.java create mode 100644 dtmcli-java/src/main/java/feign/URIParser.java create mode 100644 dtmcli-java/src/main/java/properties/DtmProperties.java create mode 100644 dtmcli-java/src/main/java/utils/NacosUtils.java create mode 100644 dtmcli-java/target/maven-archiver/pom.properties create mode 100644 dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 dtmcli-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 dtmcli-spring/pom.xml create mode 100644 dtmcli-spring/src/main/java/client/DtmClient.java create mode 100644 dtmcli-spring/src/main/java/configuration/DtmConfiguration.java create mode 100644 dtmcli-spring/src/main/java/feign/DtmFeignClient.java create mode 100644 dtmcli-spring/src/main/java/feign/URIParser.java create mode 100644 dtmcli-spring/src/main/java/properties/DtmProperties.java create mode 100644 dtmcli-spring/src/main/resources/META-INF/spring.factories create mode 100644 dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json create mode 100644 dtmcli-spring/target/classes/META-INF/spring.factories create mode 100644 dtmcli-spring/target/maven-archiver/pom.properties create mode 100644 dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 dtmcli-spring/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst diff --git a/dtmcli-common/pom.xml b/dtmcli-common/pom.xml new file mode 100644 index 0000000..17984f8 --- /dev/null +++ b/dtmcli-common/pom.xml @@ -0,0 +1,64 @@ + + + + dtmcli-java-parent + pub.dtm + 1.0.0 + + 4.0.0 + + dtmcli-common + 1.0.0 + jar + dtmcli-common + + + UTF-8 + 1.8 + 1.8 + + + + + com.google.code.gson + gson + + + + com.fasterxml.jackson.core + jackson-annotations + + + + org.projectlombok + lombok + + + + io.github.openfeign + feign-core + + + + org.apache.commons + commons-lang3 + + + + com.squareup.okhttp3 + okhttp + + + + com.alibaba.nacos + nacos-client + + + + org.slf4j + slf4j-api + + + \ No newline at end of file diff --git a/dtmcli-common/src/main/java/constant/Constants.java b/dtmcli-common/src/main/java/constant/Constants.java new file mode 100644 index 0000000..15d2fbd --- /dev/null +++ b/dtmcli-common/src/main/java/constant/Constants.java @@ -0,0 +1,37 @@ +package constant; + +public class Constants { + public static final String MICRO_SERVICE_NAME_KEY = "dtm.service.name"; + + public static final String GET_METHOD = "GET "; + + public static final String POST_METHOD = "POST "; + + public static final String HTTP_PREFIX = "http://"; + + public static final String HTTPS_PREFIX = "https://"; + + public static final String PING_URL = "/api/ping"; + + private static final String BASE_URL = "/api/dtmsvr"; + + public static final String NEW_GID_URL = BASE_URL + "/newGid"; + + public static final String PREPARE_URL = BASE_URL + "/prepare"; + + public static final String SUBMIT_URL = BASE_URL + "/submit"; + + public static final String ABORT_URL = BASE_URL + "/abort"; + + public static final String REGISTER_BRANCH_URL = BASE_URL + "/registerBranch"; + + public static final String DEFAULT_STATUS = "prepared"; + + public static final String EMPTY_STRING = ""; + + public static final String SUCCESS_RESULT = "SUCCESS"; + + public static final String FAILURE_RESULT = "FAILURE"; + + public static final int RESP_ERR_CODE = 400; +} diff --git a/dtmcli-common/src/main/java/constant/ParamFieldConstants.java b/dtmcli-common/src/main/java/constant/ParamFieldConstants.java new file mode 100644 index 0000000..0adf4fb --- /dev/null +++ b/dtmcli-common/src/main/java/constant/ParamFieldConstants.java @@ -0,0 +1,27 @@ +package constant; + +public class ParamFieldConstants { + public static final String GID = "gid"; + + public static final String TRANS_TYPE = "trans_type"; + + public static final String BRANCH_ID = "branch_id"; + + public static final String STATUS = "status"; + + public static final String DATA = "data"; + + public static final String TRY = "try"; + + public static final String CONFIRM = "confirm"; + + public static final String CANCEL = "cancel"; + + public static final String OP = "op"; + + public static final String CODE = "code"; + + public static final String MESSAGE = "message"; + + public static final String DTM_RESULT = "dtm_result"; +} diff --git a/dtmcli-common/src/main/java/enums/TransTypeEnum.java b/dtmcli-common/src/main/java/enums/TransTypeEnum.java new file mode 100644 index 0000000..eb79010 --- /dev/null +++ b/dtmcli-common/src/main/java/enums/TransTypeEnum.java @@ -0,0 +1,29 @@ +package enums; + +public enum TransTypeEnum { + TCC("tcc"), + XA("xa"), + MSG("msg"), + SAGA("saga") + ; + + TransTypeEnum(String value) { + this.value = value; + } + + private String value; + + @Override + public String toString() { + return this.value; + } + + public static TransTypeEnum parseString(String value) { + for (TransTypeEnum transType : TransTypeEnum.values()) { + if (transType.value.equals(value)) { + return transType; + } + } + return null; + } +} diff --git a/dtmcli-common/src/main/java/exception/DtmException.java b/dtmcli-common/src/main/java/exception/DtmException.java new file mode 100644 index 0000000..5461824 --- /dev/null +++ b/dtmcli-common/src/main/java/exception/DtmException.java @@ -0,0 +1,11 @@ +package exception; + +public class DtmException extends Exception { + public DtmException(String msg) { + super(msg); + } + + public DtmException(Throwable e) { + super(e); + } +} diff --git a/dtmcli-common/src/main/java/interfaces/dtm/DtmConsumer.java b/dtmcli-common/src/main/java/interfaces/dtm/DtmConsumer.java new file mode 100644 index 0000000..ef81b9c --- /dev/null +++ b/dtmcli-common/src/main/java/interfaces/dtm/DtmConsumer.java @@ -0,0 +1,8 @@ +package interfaces.dtm; + +import model.dtm.TransBase; + +@FunctionalInterface +public interface DtmConsumer { + void accept(S s, T t) throws Exception; +} diff --git a/dtmcli-common/src/main/java/interfaces/dtm/IDtmService.java b/dtmcli-common/src/main/java/interfaces/dtm/IDtmService.java new file mode 100644 index 0000000..0b82617 --- /dev/null +++ b/dtmcli-common/src/main/java/interfaces/dtm/IDtmService.java @@ -0,0 +1,4 @@ +package interfaces.dtm; + +public interface IDtmService { +} diff --git a/dtmcli-common/src/main/java/interfaces/feign/IDtmFeignClient.java b/dtmcli-common/src/main/java/interfaces/feign/IDtmFeignClient.java new file mode 100644 index 0000000..3c78c28 --- /dev/null +++ b/dtmcli-common/src/main/java/interfaces/feign/IDtmFeignClient.java @@ -0,0 +1,26 @@ +package interfaces.feign; + +import feign.Response; +import model.param.OperatorParam; +import model.response.ResponseBase; + +import java.net.URI; +import java.util.Map; + +public interface IDtmFeignClient { + ResponseBase newGid(); + + ResponseBase ping(); + + ResponseBase prepare(OperatorParam body); + + ResponseBase submit(OperatorParam body); + + ResponseBase abort(OperatorParam body); + + ResponseBase registerBranch(OperatorParam body); + + Response busiGet(URI host, String path, Map queryMap); + + Response busiPost(URI host, String path, Map queryMap, Object body); +} diff --git a/dtmcli-common/src/main/java/interfaces/feign/IURIParser.java b/dtmcli-common/src/main/java/interfaces/feign/IURIParser.java new file mode 100644 index 0000000..1ac99c4 --- /dev/null +++ b/dtmcli-common/src/main/java/interfaces/feign/IURIParser.java @@ -0,0 +1,7 @@ +package interfaces.feign; + +import model.feign.ServiceMessage; + +public interface IURIParser { + String generatorURI(ServiceMessage serviceMessage, boolean httpType) throws Exception; +} diff --git a/dtmcli-common/src/main/java/model/dtm/TransBase.java b/dtmcli-common/src/main/java/model/dtm/TransBase.java new file mode 100644 index 0000000..d2b4102 --- /dev/null +++ b/dtmcli-common/src/main/java/model/dtm/TransBase.java @@ -0,0 +1,23 @@ +package model.dtm; + +import enums.TransTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TransBase { + /** + * global transaction id + */ + private String gid; + + /** + * 事务类型 + */ + private TransTypeEnum transTypeEnum; + + private boolean waitResult; +} diff --git a/dtmcli-common/src/main/java/model/feign/ServiceMessage.java b/dtmcli-common/src/main/java/model/feign/ServiceMessage.java new file mode 100644 index 0000000..8d336fc --- /dev/null +++ b/dtmcli-common/src/main/java/model/feign/ServiceMessage.java @@ -0,0 +1,73 @@ +package model.feign; + + +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class ServiceMessage { + private String serviceName; + + private String groupName = "DEFAULT_GROUP"; + + private List cluster = new ArrayList<>(); + + private String path; + + public ServiceMessage(String serviceName, String path){ + this.serviceName = serviceName; + this.path = path; + } + + public ServiceMessage(String serviceName, String groupName, List cluster, String path) { + this.serviceName = serviceName; + this.groupName = groupName; + this.cluster.addAll(cluster); + this.path = path; + } + + public String getServiceName() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public List getCluster() { + return cluster; + } + + public void setCluster(List cluster) { + this.cluster = cluster; + } + + public String getPath() { + if (StringUtils.startsWith(path, "/")) { + return path; + } + return "/" + path; + } + + public void setPath(String path) { + this.path = path; + } + + @Override + public String toString() { + String _path = path; + if (!StringUtils.startsWith(path, "/")) { + _path = "/" + path; + } + return serviceName + _path + "?groupName=" + groupName; + } +} diff --git a/dtmcli-common/src/main/java/model/param/OperatorParam.java b/dtmcli-common/src/main/java/model/param/OperatorParam.java new file mode 100644 index 0000000..206322d --- /dev/null +++ b/dtmcli-common/src/main/java/model/param/OperatorParam.java @@ -0,0 +1,58 @@ +package model.param; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; +import constant.ParamFieldConstants; +import enums.TransTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class OperatorParam { + @SerializedName(ParamFieldConstants.GID) + @JsonProperty(ParamFieldConstants.GID) + private String gid; + + @SerializedName(ParamFieldConstants.TRANS_TYPE) + @JsonProperty(ParamFieldConstants.TRANS_TYPE) + private String transType; + + @SerializedName(ParamFieldConstants.BRANCH_ID) + @JsonProperty(ParamFieldConstants.BRANCH_ID) + private String branchId; + + @SerializedName(ParamFieldConstants.STATUS) + @JsonProperty(ParamFieldConstants.STATUS) + private String status; + + @SerializedName(ParamFieldConstants.DATA) + @JsonProperty(ParamFieldConstants.DATA) + private String data; + + @SerializedName(ParamFieldConstants.CONFIRM) + @JsonProperty(ParamFieldConstants.CONFIRM) + private String confirm; + + @SerializedName(ParamFieldConstants.CANCEL) + @JsonProperty(ParamFieldConstants.CANCEL) + private String cancel; + + public OperatorParam(String gid, TransTypeEnum transType, String branchId, + String status, String data, String confirmUrl, String cancelUrl) { + this.gid = gid; + this.transType = transType.toString(); + this.branchId = branchId; + this.status = status; + this.data = data; + this.confirm = confirmUrl; + this.cancel = cancelUrl; + } + + public OperatorParam(String gid, TransTypeEnum transType) { + this.gid = gid; + this.transType = transType.toString(); + } +} diff --git a/dtmcli-common/src/main/java/model/response/ResponseBase.java b/dtmcli-common/src/main/java/model/response/ResponseBase.java new file mode 100644 index 0000000..ed963ef --- /dev/null +++ b/dtmcli-common/src/main/java/model/response/ResponseBase.java @@ -0,0 +1,20 @@ +package model.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ResponseBase { + @SerializedName("dtm_result") + @JsonProperty("dtm_result") + private String dtmResult; + + @SerializedName("gid") + @JsonProperty("gid") + private String gid; +} diff --git a/dtmcli-common/src/main/java/utils/FeignUtils.java b/dtmcli-common/src/main/java/utils/FeignUtils.java new file mode 100644 index 0000000..6be5c93 --- /dev/null +++ b/dtmcli-common/src/main/java/utils/FeignUtils.java @@ -0,0 +1,66 @@ +package utils; + +import constant.Constants; +import exception.DtmException; +import feign.Response; +import interfaces.feign.IURIParser; +import model.response.ResponseBase; +import model.feign.ServiceMessage; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; + +public class FeignUtils { + private static final Logger log = LoggerFactory.getLogger(FeignUtils.class); + + private static IURIParser uriParser; + + public static void setUriParser(IURIParser uriParser) { + FeignUtils.uriParser = uriParser; + } + + public static String parseGid(ResponseBase base) throws Exception { + if (base == null || !Constants.SUCCESS_RESULT.equals(base.getDtmResult())) { + throw new Exception("get new gid from dtm server fail."); + } + return base.getGid(); + } + + public static String generatorURI(ServiceMessage serviceMessage, boolean httpType) throws Exception { + return uriParser.generatorURI(serviceMessage, httpType); + } + + public static void checkResult(Response response) throws DtmException { + if (response.status() >= Constants.RESP_ERR_CODE){ + if (response.reason() != null) { + throw new DtmException(response.reason()); + } + try { + log.error("response code is {}, but unknown reason, response body is {}", response.status(), + IOUtils.toString(response.body().asReader(StandardCharsets.UTF_8))); + } finally { + throw new DtmException("response code is " + response.status()); + } + } + String result = ""; + try { + InputStream inputStream = response.body().asInputStream(); + if (inputStream != null) { + result = IOUtils.toString(inputStream, StandardCharsets.UTF_8); + } + } catch (IOException e) { + throw new DtmException("response is null"); + } + if (StringUtils.isBlank(result)) { + throw new DtmException("response is null"); + } + if (result.contains(Constants.FAILURE_RESULT)){ + throw new DtmException("Service returned failed"); + } + } +} diff --git a/dtmcli-common/src/main/java/utils/HttpUtils.java b/dtmcli-common/src/main/java/utils/HttpUtils.java new file mode 100644 index 0000000..0772674 --- /dev/null +++ b/dtmcli-common/src/main/java/utils/HttpUtils.java @@ -0,0 +1,63 @@ +package utils; + +import constant.Constants; +import exception.DtmException; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; +import okhttp3.ResponseBody; +import org.apache.commons.lang3.StringUtils; + +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +public class HttpUtils { + private static final OkHttpClient CLIENT = new OkHttpClient.Builder().connectTimeout(15, TimeUnit.SECONDS) + .readTimeout(5, TimeUnit.SECONDS).writeTimeout(5, TimeUnit.SECONDS).build(); + + public static final MediaType MEDIA_TYPE = MediaType.get("application/json; charset=utf-8"); + + public static Response get(String url) throws IOException { + Request request = new Request.Builder().url(url).get().build(); + return CLIENT.newCall(request).execute(); + } + + public static Response post(String url, String json) throws IOException { + RequestBody body = RequestBody.create(MEDIA_TYPE, json); + Request request = new Request.Builder().url(url).post(body).build(); + return CLIENT.newCall(request).execute(); + } + + public static String splicingUrl(String url, Map params) { + if (params == null || params.isEmpty()) { + return url; + } + StringBuilder builder = new StringBuilder(url).append("?"); + for (Map.Entry entry : params.entrySet()) { + builder.append(entry.getKey()).append("=").append(entry.getValue()).append("&"); + } + return builder.deleteCharAt(builder.length() - 1).toString(); + } + + + public static String splicingUrl(String ip, int port, String path) { + return Constants.HTTP_PREFIX + ip + ":" + String.valueOf(port) + path; + } + + public static void checkResult(Response response) throws Exception { + if (response.code() >= Constants.RESP_ERR_CODE){ + throw new DtmException(response.message()); + } + ResponseBody body = response.body(); + String result; + if (body == null || StringUtils.isBlank(result = body.string())) { + throw new DtmException("response is null"); + } + if (result.contains(Constants.FAILURE_RESULT)){ + throw new DtmException("Service returned failed"); + } + } +} diff --git a/dtmcli-common/target/maven-archiver/pom.properties b/dtmcli-common/target/maven-archiver/pom.properties new file mode 100644 index 0000000..48cb916 --- /dev/null +++ b/dtmcli-common/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Tue Apr 26 15:54:57 CST 2022 +version=1.0.0 +groupId=pub.dtm +artifactId=dtmcli-common diff --git a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..465ce62 --- /dev/null +++ b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,14 @@ +interfaces/dtm/IDtmService.class +constant/ParamFieldConstants.class +model/feign/ServiceMessage.class +interfaces/feign/IURIParser.class +interfaces/dtm/DtmConsumer.class +constant/Constants.class +model/param/OperatorParam.class +interfaces/feign/IDtmFeignClient.class +utils/FeignUtils.class +model/dtm/TransBase.class +utils/HttpUtils.class +model/response/ResponseBase.class +enums/TransTypeEnum.class +exception/DtmException.class diff --git a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/dtmcli-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/dtmcli-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/dtmcli-core/pom.xml b/dtmcli-core/pom.xml new file mode 100644 index 0000000..e425578 --- /dev/null +++ b/dtmcli-core/pom.xml @@ -0,0 +1,36 @@ + + + + dtmcli-java-parent + pub.dtm + 1.0.0 + + 4.0.0 + + dtmcli-core + 1.0.0 + jar + dtmcli-core + + + + pub.dtm + dtmcli-common + 1.0.0 + + + + org.apache.commons + commons-lang3 + + + + org.slf4j + slf4j-api + + + + + \ No newline at end of file diff --git a/dtmcli-core/src/main/java/barrier/BranchBarrierService.java b/dtmcli-core/src/main/java/barrier/BranchBarrierService.java new file mode 100644 index 0000000..7f05d51 --- /dev/null +++ b/dtmcli-core/src/main/java/barrier/BranchBarrierService.java @@ -0,0 +1,69 @@ +package barrier; + +import barrier.model.BranchBarrier; +import constant.ParamFieldConstants; +import interfaces.dtm.DtmConsumer; +import interfaces.dtm.IDtmService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.Objects; + +public class BranchBarrierService implements IDtmService { + private static final Logger log = LoggerFactory.getLogger(BranchBarrierService.class); + + public void call(BranchBarrier barrier, Connection connection, DtmConsumer consumer) throws Exception { + barrier.addBarrierId(); + connection.setAutoCommit(false); + try { + boolean result = insertBarrier(connection, barrier); + if (result) { + consumer.accept(this, barrier); + connection.commit(); + } + } catch (Exception exception) { + log.warn("barrier call error", exception); + connection.rollback(); + throw exception; + } finally { + connection.setAutoCommit(true); + } + } + + private boolean insertBarrier(Connection connection, BranchBarrier barrier) throws SQLException { + log.info("insert barrier {}", barrier); + if (Objects.isNull(connection)) { + return false; + } + PreparedStatement preparedStatement = null; + try { + String sql = "insert ignore into barrier(trans_type, gid, branch_id, op, barrier_id, reason) values(?,?,?,?,?,?)"; + preparedStatement = connection.prepareStatement(sql); + preparedStatement.setString(1, barrier.getTransTypeEnum().toString()); + preparedStatement.setString(2, barrier.getGid()); + preparedStatement.setString(3, barrier.getBranchId()); + preparedStatement.setString(4, barrier.getOp()); + preparedStatement.setString(5, String.format("%02d", barrier.getBarrierId())); + preparedStatement.setString(6, barrier.getOp()); + + if (preparedStatement.executeUpdate() == 0) { + return false; + } + if (ParamFieldConstants.CANCEL.equals(barrier.getOp())) { + int opIndex = 4; + preparedStatement.setString(opIndex, ParamFieldConstants.TRY); + if (preparedStatement.executeUpdate() > 0) { + return false; + } + } + } finally { + if (Objects.nonNull(preparedStatement)) { + preparedStatement.close(); + } + } + return true; + } +} diff --git a/dtmcli-core/src/main/java/barrier/model/BarrierParam.java b/dtmcli-core/src/main/java/barrier/model/BarrierParam.java new file mode 100644 index 0000000..c32bffc --- /dev/null +++ b/dtmcli-core/src/main/java/barrier/model/BarrierParam.java @@ -0,0 +1,30 @@ +package barrier.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class BarrierParam { + /** + * 事务类型 + */ + private String trans_type[]; + + /** + * 全局事务id + */ + private String gid[]; + + /** + * 分支id + */ + private String branch_id[]; + + /** + * 操作 + */ + private String op[]; +} diff --git a/dtmcli-core/src/main/java/barrier/model/BranchBarrier.java b/dtmcli-core/src/main/java/barrier/model/BranchBarrier.java new file mode 100644 index 0000000..9ba2ca1 --- /dev/null +++ b/dtmcli-core/src/main/java/barrier/model/BranchBarrier.java @@ -0,0 +1,46 @@ +package barrier.model; + +import com.google.gson.Gson; +import enums.TransTypeEnum; +import exception.DtmException; +import lombok.Data; +import model.dtm.TransBase; +import org.apache.commons.lang3.ArrayUtils; + +import java.util.Map; + +@Data +public class BranchBarrier extends TransBase { + private String branchId; + + private String op; + + private int barrierId; + + public void addBarrierId() { + this.barrierId += 1; + } + + public static BranchBarrier buildBranchBarrier(Map paramsMap) throws Exception { + if (paramsMap == null || paramsMap.isEmpty()) { + throw new DtmException("build BranchBarrier error, paramsMap can not be empty."); + } + Gson gson = new Gson(); + BarrierParam barrierParam = gson.fromJson(gson.toJson(paramsMap), BarrierParam.class); + BranchBarrier branchBarrier = new BranchBarrier(); + if (ArrayUtils.isNotEmpty(barrierParam.getTrans_type())) { + branchBarrier.setTransTypeEnum(TransTypeEnum.parseString(barrierParam.getTrans_type()[0])); + } + if (ArrayUtils.isNotEmpty(barrierParam.getGid())) { + branchBarrier.setGid(barrierParam.getGid()[0]); + } + if (ArrayUtils.isNotEmpty(barrierParam.getBranch_id())) { + branchBarrier.branchId = barrierParam.getBranch_id()[0]; + } + if (ArrayUtils.isNotEmpty(barrierParam.getOp())) { + branchBarrier.op = barrierParam.getOp()[0]; + } + return branchBarrier; + } + +} diff --git a/dtmcli-core/src/main/java/base/BranchIdGenerator.java b/dtmcli-core/src/main/java/base/BranchIdGenerator.java new file mode 100644 index 0000000..915b42c --- /dev/null +++ b/dtmcli-core/src/main/java/base/BranchIdGenerator.java @@ -0,0 +1,32 @@ +package base; + +public class BranchIdGenerator { + private static final int MAX_BRANCH_ID = 99; + + private static final int LENGTH = 20; + + private final String branchId; + + private int subBranchId; + + public BranchIdGenerator(String branchId) { + this.branchId = branchId; + } + + /** + * 生成注册分支id + * + * @return + * @throws Exception + */ + public String genBranchId() throws Exception { + if (this.subBranchId >= MAX_BRANCH_ID) { + throw new Exception("branch id is larger than 99"); + } + if (this.branchId.length() >= LENGTH) { + throw new Exception("total branch id is longer than 20"); + } + this.subBranchId++; + return this.branchId + String.format("%02d", this.subBranchId); + } +} diff --git a/dtmcli-core/src/main/java/tcc/TccService.java b/dtmcli-core/src/main/java/tcc/TccService.java new file mode 100644 index 0000000..0cdf89b --- /dev/null +++ b/dtmcli-core/src/main/java/tcc/TccService.java @@ -0,0 +1,117 @@ +package tcc; + +import com.google.gson.Gson; +import constant.Constants; +import constant.ParamFieldConstants; +import enums.TransTypeEnum; +import exception.DtmException; +import interfaces.dtm.DtmConsumer; +import interfaces.dtm.IDtmService; +import interfaces.feign.IDtmFeignClient; +import model.feign.ServiceMessage; +import model.param.OperatorParam; +import model.response.ResponseBase; +import okhttp3.Response; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import tcc.model.Tcc; +import utils.FeignUtils; +import utils.HttpUtils; + +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + +public class TccService implements IDtmService { + private static final Logger log = LoggerFactory.getLogger(TccService.class); + + private static final String OP = "try"; + + private IDtmFeignClient feignClient; + + public TccService(IDtmFeignClient feignClient) { + this.feignClient = feignClient; + } + + public void setFeignClient(IDtmFeignClient feignClient) { + this.feignClient = feignClient; + } + + public String tccGlobalTransaction(String gid, DtmConsumer consumer) throws Exception { + if (StringUtils.isEmpty(gid)) { + gid = FeignUtils.parseGid(feignClient.newGid()); + } + log.info("the tcc transaction's gid is {}", gid); + Tcc tcc = new Tcc(gid); + + + OperatorParam operatorParam = new OperatorParam(gid, TransTypeEnum.TCC); + ResponseBase resp = feignClient.prepare(operatorParam); + log.info("prepare response: {}", resp); + if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { + log.error("TCC transaction prepare fail. returned dtm_result is: {}, transaction gid: {}", resp.getDtmResult(), gid); + throw new DtmException("TCC Transaction prepare fail"); + } + try { + consumer.accept(this, tcc); + feignClient.submit(operatorParam); + } catch (Exception e) { + log.error("TCC transaction submit fail, start abort it. transaction gid: {}", gid); + feignClient.abort(operatorParam); + throw new DtmException(e); + } + return gid; + } + + public feign.Response callBranch(Tcc tcc, Object body, ServiceMessage tryMessage, ServiceMessage confirmMessage, ServiceMessage cancelMessage) throws Exception { + Gson gson = new Gson(); + log.info("call method Tcc.callBranch, tryMessage: {}, confirmMessage: {}, cancelMessage: {}", + gson.toJson(tryMessage), gson.toJson(confirmMessage), gson.toJson(cancelMessage)); + String branchId = tcc.getBranchIdGenerator().genBranchId(); + + OperatorParam operatorParam = new OperatorParam(tcc.getGid(), TransTypeEnum.TCC, Constants.DEFAULT_STATUS, branchId, + gson.toJson(body), FeignUtils.generatorURI(confirmMessage, false), FeignUtils.generatorURI(cancelMessage, false)); + ResponseBase resp = feignClient.registerBranch(operatorParam); + if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { + log.error("TCC transaction register branch fail. transaction gid: {}", tcc.getGid()); + throw new DtmException("TCC Transaction register branch fail"); + } + + Map paramsMap = new HashMap<>(); + paramsMap.put(ParamFieldConstants.GID, tcc.getGid()); + paramsMap.put(ParamFieldConstants.TRANS_TYPE, TransTypeEnum.TCC.toString()); + paramsMap.put(ParamFieldConstants.BRANCH_ID, branchId); + paramsMap.put(ParamFieldConstants.OP, OP); + + feign.Response response = feignClient.busiPost(new URI(FeignUtils.generatorURI(tryMessage, true)), + tryMessage.getPath(), paramsMap, body); + log.info("busi post is: {}", response); + FeignUtils.checkResult(response); + return response; + } + + public Response callBranch(Tcc tcc, Object body, String tryUrl, String confirmUrl, String cancelUrl) throws Exception { + log.info("call method Tcc.callBranch, tryUrl: {}, confirmUrl: {}, cancelUrl: {}", tryUrl, confirmUrl, cancelUrl); + String branchId = tcc.getBranchIdGenerator().genBranchId(); + Gson gson = new Gson(); + + OperatorParam operatorParam = new OperatorParam(tcc.getGid(), TransTypeEnum.TCC, Constants.DEFAULT_STATUS, + branchId, gson.toJson(body), confirmUrl, cancelUrl); + ResponseBase resp = feignClient.registerBranch(operatorParam); + if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { + log.error("TCC transaction register branch fail. transaction gid: {}", tcc.getGid()); + throw new DtmException("TCC Transaction register branch fail"); + } + + Map paramsMap = new HashMap<>(); + paramsMap.put(ParamFieldConstants.GID, tcc.getGid()); + paramsMap.put(ParamFieldConstants.TRANS_TYPE, TransTypeEnum.TCC.toString()); + paramsMap.put(ParamFieldConstants.BRANCH_ID, branchId); + paramsMap.put(ParamFieldConstants.OP, OP); + Response tryResponse = HttpUtils.post(HttpUtils.splicingUrl(tryUrl, paramsMap), gson.toJson(body)); + log.info("try response is: {}", tryResponse); + HttpUtils.checkResult(tryResponse); + return tryResponse; + } +} diff --git a/dtmcli-core/src/main/java/tcc/model/Tcc.java b/dtmcli-core/src/main/java/tcc/model/Tcc.java new file mode 100644 index 0000000..73d04b3 --- /dev/null +++ b/dtmcli-core/src/main/java/tcc/model/Tcc.java @@ -0,0 +1,19 @@ +package tcc.model; + +import base.BranchIdGenerator; +import constant.Constants; +import enums.TransTypeEnum; +import model.dtm.TransBase; + +public class Tcc extends TransBase { + private final BranchIdGenerator branchIdGenerator; + + public Tcc(String gid) { + super(gid, TransTypeEnum.TCC, false); + this.branchIdGenerator = new BranchIdGenerator(Constants.EMPTY_STRING); + } + + public BranchIdGenerator getBranchIdGenerator() { + return branchIdGenerator; + } +} diff --git a/dtmcli-core/target/maven-archiver/pom.properties b/dtmcli-core/target/maven-archiver/pom.properties new file mode 100644 index 0000000..15bc8dd --- /dev/null +++ b/dtmcli-core/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Tue Apr 26 15:54:58 CST 2022 +version=1.0.0 +groupId=pub.dtm +artifactId=dtmcli-core diff --git a/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..16f5943 --- /dev/null +++ b/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,6 @@ +barrier/model/BarrierParam.class +barrier/BranchBarrierService.class +tcc/model/Tcc.class +barrier/model/BranchBarrier.class +tcc/TccService.class +base/BranchIdGenerator.class diff --git a/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..56f854a --- /dev/null +++ b/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,6 @@ +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/barrier/model/BarrierParam.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/tcc/model/Tcc.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/base/BranchIdGenerator.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/barrier/BranchBarrierService.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/tcc/TccService.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/barrier/model/BranchBarrier.java diff --git a/dtmcli-core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/dtmcli-core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/dtmcli-java/pom.xml b/dtmcli-java/pom.xml new file mode 100644 index 0000000..a8f9be0 --- /dev/null +++ b/dtmcli-java/pom.xml @@ -0,0 +1,47 @@ + + + + dtmcli-java-parent + pub.dtm + 1.0.0 + + 4.0.0 + + dtmcli-java + 1.0.0 + jar + dtmcli-java + + + + pub.dtm + dtmcli-common + 1.0.0 + + + + pub.dtm + dtmcli-core + 1.0.0 + + + + com.alibaba.nacos + nacos-client + + + + com.google.code.gson + gson + + + + io.github.openfeign + feign-gson + + + + + \ No newline at end of file diff --git a/dtmcli-java/src/main/java/client/DtmClient.java b/dtmcli-java/src/main/java/client/DtmClient.java new file mode 100644 index 0000000..dca0d61 --- /dev/null +++ b/dtmcli-java/src/main/java/client/DtmClient.java @@ -0,0 +1,87 @@ +package client; + +import com.alibaba.nacos.api.naming.pojo.Instance; +import constant.Constants; +import feign.DtmFeignClient; +import feign.Feign; +import feign.URIParser; +import feign.gson.GsonDecoder; +import feign.gson.GsonEncoder; +import interfaces.dtm.DtmConsumer; +import interfaces.feign.IDtmFeignClient; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import properties.DtmProperties; +import tcc.TccService; +import tcc.model.Tcc; +import utils.NacosUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static com.alibaba.nacos.api.common.Constants.DEFAULT_CLUSTER_NAME; +import static com.alibaba.nacos.api.common.Constants.DEFAULT_GROUP; +import static com.alibaba.nacos.api.naming.CommonParams.CLUSTER_NAME; +import static com.alibaba.nacos.api.naming.CommonParams.GROUP_NAME; + +public class DtmClient { + private static final Logger log = LoggerFactory.getLogger(DtmClient.class); + + + private TccService tccService; + + public DtmClient() { + // init URIParser + new URIParser(); + + String endpoint = null; + try { + // redirect connect to dtm + endpoint = DtmProperties.get("dtm.server.endpoint"); + // connect to dtm by nacos + if (StringUtils.isEmpty(endpoint)) { + Instance instance = NacosUtils.selectOneHealthyInstance(DtmProperties.get(Constants.MICRO_SERVICE_NAME_KEY), + DtmProperties.getOrDefault(GROUP_NAME, DEFAULT_GROUP), genClusters(DtmProperties.get(CLUSTER_NAME))); + endpoint = instance.toInetAddr(); + } + } catch (Exception e) { + log.error("initial dtm client for java error.", e); + System.exit(-1); + } + if (StringUtils.isEmpty(endpoint)) { + log.error("can not resolve dtm server message from config file, you can use nacos or redirect configure to config it."); + System.exit(-1); + } + IDtmFeignClient feignClient = Feign + .builder() + .decoder(new GsonDecoder()) + .encoder(new GsonEncoder()) + .target(DtmFeignClient.class, Constants.HTTP_PREFIX + endpoint); + if (feignClient == null) { + log.error("initial dtm client for java error, feign client can't be null."); + System.exit(-1); + } + + this.tccService = new TccService(feignClient); + } + + private List genClusters(String clusterStr) { + if (StringUtils.isEmpty(clusterStr)) { + List clusters = new ArrayList<>(); + clusters.add(DEFAULT_CLUSTER_NAME); + return clusters; + } + String[] split = StringUtils.split(clusterStr, ","); + return Arrays.asList(split); + } + + public String tccGlobalTransaction(DtmConsumer function) throws Exception { + return tccService.tccGlobalTransaction(null, function); + } + + public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { + return tccService.tccGlobalTransaction(gid, function); + } +} diff --git a/dtmcli-java/src/main/java/feign/DtmFeignClient.java b/dtmcli-java/src/main/java/feign/DtmFeignClient.java new file mode 100644 index 0000000..7e34f7f --- /dev/null +++ b/dtmcli-java/src/main/java/feign/DtmFeignClient.java @@ -0,0 +1,44 @@ +package feign; + +import constant.Constants; +import interfaces.feign.IDtmFeignClient; +import model.param.OperatorParam; +import model.response.ResponseBase; + +import java.net.URI; +import java.util.Map; + +@Headers("Content-Type: application/json") +public interface DtmFeignClient extends IDtmFeignClient { + @Override + @RequestLine(Constants.GET_METHOD + Constants.NEW_GID_URL) + ResponseBase newGid(); + + @Override + @RequestLine(Constants.GET_METHOD + Constants.PING_URL) + ResponseBase ping(); + + @Override + @RequestLine(Constants.POST_METHOD + Constants.PREPARE_URL) + ResponseBase prepare(OperatorParam body); + + @Override + @RequestLine(Constants.POST_METHOD + Constants.SUBMIT_URL) + ResponseBase submit(OperatorParam body); + + @Override + @RequestLine(Constants.POST_METHOD + Constants.ABORT_URL) + ResponseBase abort(OperatorParam body); + + @Override + @RequestLine(Constants.POST_METHOD + Constants.REGISTER_BRANCH_URL) + ResponseBase registerBranch(OperatorParam body); + + @Override + @RequestLine(Constants.GET_METHOD + "{path}") + Response busiGet(URI host, @Param("path") String path, @QueryMap Map queryMap); + + @Override + @RequestLine(Constants.POST_METHOD + "{path}") + Response busiPost(URI host, @Param("path") String path, @QueryMap Map queryMap, Object body); +} diff --git a/dtmcli-java/src/main/java/feign/URIParser.java b/dtmcli-java/src/main/java/feign/URIParser.java new file mode 100644 index 0000000..250f907 --- /dev/null +++ b/dtmcli-java/src/main/java/feign/URIParser.java @@ -0,0 +1,25 @@ +package feign; + +import com.alibaba.nacos.api.naming.pojo.Instance; +import constant.Constants; +import interfaces.feign.IURIParser; +import model.feign.ServiceMessage; +import properties.DtmProperties; +import utils.FeignUtils; +import utils.NacosUtils; + +public class URIParser implements IURIParser { + static { + FeignUtils.setUriParser(new URIParser()); + } + + @Override + public String generatorURI(ServiceMessage serviceMessage, boolean httpType) throws Exception { + Instance instance = NacosUtils.selectOneHealthyInstance(serviceMessage.getServiceName(), + serviceMessage.getGroupName(), serviceMessage.getCluster()); + if (httpType) { + return Constants.HTTP_PREFIX + instance.toInetAddr(); + } + return DtmProperties.get("dtm.service.registryType") + "://" + serviceMessage.toString(); + } +} diff --git a/dtmcli-java/src/main/java/properties/DtmProperties.java b/dtmcli-java/src/main/java/properties/DtmProperties.java new file mode 100644 index 0000000..bf4ecec --- /dev/null +++ b/dtmcli-java/src/main/java/properties/DtmProperties.java @@ -0,0 +1,37 @@ +package properties; + +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Properties; + +public class DtmProperties { + private static Properties dtmProperties; + + private static void loadNacosProperties() throws IOException { + Properties properties = new Properties(); + FileInputStream in = new FileInputStream(DtmProperties.class.getResource("/dtm-conf.properties").getPath()); + properties.load(in); + dtmProperties = properties; + } + + public static String get(String key) throws IOException { + if (dtmProperties == null) { + loadNacosProperties(); + } + return dtmProperties.getProperty(key); + } + + public static String getOrDefault(String key, String defaultValue) throws IOException { + if (dtmProperties == null) { + loadNacosProperties(); + } + return dtmProperties.getProperty(key, defaultValue); + } + + public static Properties getNacosProperties() throws IOException { + if (dtmProperties == null) { + loadNacosProperties(); + } + return dtmProperties; + } +} diff --git a/dtmcli-java/src/main/java/utils/NacosUtils.java b/dtmcli-java/src/main/java/utils/NacosUtils.java new file mode 100644 index 0000000..4ee631c --- /dev/null +++ b/dtmcli-java/src/main/java/utils/NacosUtils.java @@ -0,0 +1,23 @@ +package utils; + +import com.alibaba.nacos.api.naming.NamingFactory; +import com.alibaba.nacos.api.naming.NamingService; +import com.alibaba.nacos.api.naming.pojo.Instance; +import properties.DtmProperties; + +import java.util.List; + +public class NacosUtils { + private static NamingService namingService; + + public static void buildNamingService() throws Exception { + NacosUtils.namingService = NamingFactory.createNamingService(DtmProperties.getNacosProperties()); + } + + public static Instance selectOneHealthyInstance(String serviceName, String groupName, List cluster) throws Exception { + if (namingService == null) { + buildNamingService(); + } + return namingService.selectOneHealthyInstance(serviceName, groupName, cluster); + } +} diff --git a/dtmcli-java/target/maven-archiver/pom.properties b/dtmcli-java/target/maven-archiver/pom.properties new file mode 100644 index 0000000..a464007 --- /dev/null +++ b/dtmcli-java/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Tue Apr 26 15:55:30 CST 2022 +version=1.0.0 +groupId=pub.dtm +artifactId=dtmcli-java diff --git a/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..28be81a --- /dev/null +++ b/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,5 @@ +feign/DtmFeignClient.class +feign/URIParser.class +utils/NacosUtils.class +properties/DtmProperties.class +client/DtmClient.class diff --git a/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..a9d548a --- /dev/null +++ b/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,5 @@ +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/feign/DtmFeignClient.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/properties/DtmProperties.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/client/DtmClient.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/feign/URIParser.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/utils/NacosUtils.java diff --git a/dtmcli-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/dtmcli-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/dtmcli-spring/pom.xml b/dtmcli-spring/pom.xml new file mode 100644 index 0000000..e47f7c7 --- /dev/null +++ b/dtmcli-spring/pom.xml @@ -0,0 +1,93 @@ + + + + dtmcli-java-parent + pub.dtm + 1.0.0 + + 4.0.0 + + dtmcli-spring + 1.0.0 + jar + dtmcli-spring + + + 3.1.1 + 2021.0.1.0 + 2.1.2.RELEASE + 2021.0.1 + 2.6.3 + + + + + pub.dtm + dtmcli-common + 1.0.0 + + + + pub.dtm + dtmcli-core + 1.0.0 + + + + org.springframework.boot + spring-boot-starter + ${springboot.version} + + + + org.springframework.boot + spring-boot-configuration-processor + ${springboot.version} + true + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + ${cloud.nacos.version} + + + + org.springframework.cloud + spring-cloud-starter-netflix-ribbon + + + com.netflix.ribbon + ribbon + + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + ${cloud.feign.version} + + + org.springframework.cloud + spring-cloud-loadbalancer + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + \ No newline at end of file diff --git a/dtmcli-spring/src/main/java/client/DtmClient.java b/dtmcli-spring/src/main/java/client/DtmClient.java new file mode 100644 index 0000000..72a90d9 --- /dev/null +++ b/dtmcli-spring/src/main/java/client/DtmClient.java @@ -0,0 +1,25 @@ +package client; + +import interfaces.dtm.DtmConsumer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import tcc.TccService; +import tcc.model.Tcc; + +@Component +public class DtmClient { + @Autowired + private TccService tccService; + + public DtmClient(TccService tccService) { + this.tccService = tccService; + } + + public String tccGlobalTransaction(DtmConsumer function) throws Exception { + return tccService.tccGlobalTransaction(null, function); + } + + public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { + return tccService.tccGlobalTransaction(gid, function); + } +} diff --git a/dtmcli-spring/src/main/java/configuration/DtmConfiguration.java b/dtmcli-spring/src/main/java/configuration/DtmConfiguration.java new file mode 100644 index 0000000..dbdb0e2 --- /dev/null +++ b/dtmcli-spring/src/main/java/configuration/DtmConfiguration.java @@ -0,0 +1,44 @@ +package configuration; + +import barrier.BranchBarrierService; +import feign.DtmFeignClient; +import feign.URIParser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; +import properties.DtmProperties; +import tcc.TccService; + +@Component +@ComponentScan({"feign", "client"}) +@Configuration +@EnableFeignClients("feign") +@EnableConfigurationProperties(DtmProperties.class) +public class DtmConfiguration { + @Autowired + private DtmProperties dtmProperties; + + @Bean + @ConditionalOnMissingBean(TccService.class) + public TccService tccService(DtmFeignClient feignClient) { + return new TccService(feignClient); + } + + @Bean + @ConditionalOnMissingBean(BranchBarrierService.class) + public BranchBarrierService branchBarrierService() { + return new BranchBarrierService(); + } + + @Bean + @ConditionalOnMissingBean(URIParser.class) + public URIParser uriParser() { + URIParser.setRegistryType(dtmProperties.getRegistryType()); + return new URIParser(); + } +} diff --git a/dtmcli-spring/src/main/java/feign/DtmFeignClient.java b/dtmcli-spring/src/main/java/feign/DtmFeignClient.java new file mode 100644 index 0000000..e7e285b --- /dev/null +++ b/dtmcli-spring/src/main/java/feign/DtmFeignClient.java @@ -0,0 +1,51 @@ +package feign; + +import constant.Constants; +import interfaces.feign.IDtmFeignClient; +import model.param.OperatorParam; +import model.response.ResponseBase; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.net.URI; +import java.util.Map; + +@FeignClient(value = "${dtm.service.name}") +public interface DtmFeignClient extends IDtmFeignClient { + @Override + @GetMapping(Constants.NEW_GID_URL) + ResponseBase newGid(); + + @Override + @GetMapping(Constants.PING_URL) + ResponseBase ping(); + + @Override + @PostMapping(Constants.PREPARE_URL) + ResponseBase prepare(@RequestBody OperatorParam body); + + @Override + @PostMapping(Constants.SUBMIT_URL) + ResponseBase submit(@RequestBody OperatorParam body); + + @Override + @PostMapping(Constants.ABORT_URL) + ResponseBase abort(@RequestBody OperatorParam body); + + @Override + @PostMapping(Constants.REGISTER_BRANCH_URL) + ResponseBase registerBranch(@RequestBody OperatorParam body); + + @Override + @GetMapping(value = "{path}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + Response busiGet(URI host, @PathVariable("path") String path, @SpringQueryMap Map queryMap); + + @Override + @PostMapping(value = "{path}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + Response busiPost(URI host, @PathVariable("path") String path, @SpringQueryMap Map queryMap, @RequestBody Object body); +} diff --git a/dtmcli-spring/src/main/java/feign/URIParser.java b/dtmcli-spring/src/main/java/feign/URIParser.java new file mode 100644 index 0000000..07bda35 --- /dev/null +++ b/dtmcli-spring/src/main/java/feign/URIParser.java @@ -0,0 +1,26 @@ +package feign; + +import constant.Constants; +import interfaces.feign.IURIParser; +import model.feign.ServiceMessage; +import utils.FeignUtils; + +public class URIParser implements IURIParser { + static { + FeignUtils.setUriParser(new URIParser()); + } + + private static String registryType; + + public static void setRegistryType(String registryType) { + URIParser.registryType = registryType; + } + + @Override + public String generatorURI(ServiceMessage serviceMessage, boolean httpType) throws Exception { + if (httpType) { + return Constants.HTTP_PREFIX + serviceMessage.getServiceName(); + } + return registryType + "://" + serviceMessage.toString(); + } +} diff --git a/dtmcli-spring/src/main/java/properties/DtmProperties.java b/dtmcli-spring/src/main/java/properties/DtmProperties.java new file mode 100644 index 0000000..e2f3815 --- /dev/null +++ b/dtmcli-spring/src/main/java/properties/DtmProperties.java @@ -0,0 +1,15 @@ +package properties; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = DtmProperties.PREFIX) +@Data +public class DtmProperties { + public static final String PREFIX = "dtm.service"; + + private String registryType; + + private String name; + +} diff --git a/dtmcli-spring/src/main/resources/META-INF/spring.factories b/dtmcli-spring/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..09746d6 --- /dev/null +++ b/dtmcli-spring/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=configuration.DtmConfiguration \ No newline at end of file diff --git a/dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json b/dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json new file mode 100644 index 0000000..5625e72 --- /dev/null +++ b/dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json @@ -0,0 +1,22 @@ +{ + "groups": [ + { + "name": "dtm.service", + "type": "properties.DtmProperties", + "sourceType": "properties.DtmProperties" + } + ], + "properties": [ + { + "name": "dtm.service.name", + "type": "java.lang.String", + "sourceType": "properties.DtmProperties" + }, + { + "name": "dtm.service.registry-type", + "type": "java.lang.String", + "sourceType": "properties.DtmProperties" + } + ], + "hints": [] +} \ No newline at end of file diff --git a/dtmcli-spring/target/classes/META-INF/spring.factories b/dtmcli-spring/target/classes/META-INF/spring.factories new file mode 100644 index 0000000..09746d6 --- /dev/null +++ b/dtmcli-spring/target/classes/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=configuration.DtmConfiguration \ No newline at end of file diff --git a/dtmcli-spring/target/maven-archiver/pom.properties b/dtmcli-spring/target/maven-archiver/pom.properties new file mode 100644 index 0000000..cc6c559 --- /dev/null +++ b/dtmcli-spring/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Tue Apr 26 15:55:29 CST 2022 +version=1.0.0 +groupId=pub.dtm +artifactId=dtmcli-spring diff --git a/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..b5d894c --- /dev/null +++ b/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,6 @@ +feign/URIParser.class +META-INF/spring-configuration-metadata.json +properties/DtmProperties.class +client/DtmClient.class +feign/DtmFeignClient.class +configuration/DtmConfiguration.class diff --git a/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..4282d2a --- /dev/null +++ b/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,5 @@ +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/feign/URIParser.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/client/DtmClient.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/configuration/DtmConfiguration.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/feign/DtmFeignClient.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/properties/DtmProperties.java diff --git a/dtmcli-spring/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/dtmcli-spring/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml index 158117d..7556db6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,56 +1,123 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + pub.dtm - dtmcli-java - 1.5.5-SNAPSHOT - + dtmcli-java-parent + 1.0.0 + pom + + dtmcli-java-parent + + + dtmcli-common + dtmcli-core + dtmcli-spring + dtmcli-java + + - 8 - 8 - 1.18.12 - 1.2.78 - 4.9.1 - 3.12.0 - 1.7.30 - 8.0.27 + 1.8 + 1.8 + 1.8 UTF-8 + 4.12 + 2.8.6 + 2.13.2 + 1.18.0 + 11.8 + 3.12.0 + 3.14.9 + 1.4.2 + 1.7.30 - - - - com.alibaba - fastjson - ${fastjson.version} - - - org.projectlombok - lombok - ${lombok.version} - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - - + + + + + junit + junit + ${junit.version} + test + + + + com.google.code.gson + gson + ${gson.version} + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + org.projectlombok + lombok + ${lombok.version} + + + + io.github.openfeign + feign-core + ${feign.version} + + + + io.github.openfeign + feign-gson + ${feign.version} + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + + com.alibaba.nacos + nacos-client + ${nacos.version} + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-resources-plugin + + ${project.build.sourceEncoding} + + + + \ No newline at end of file From b603d194910262e4243d081a260c747bd5b99745 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Tue, 26 Apr 2022 22:37:08 +0800 Subject: [PATCH 02/24] update package --- .../main/java/interfaces/dtm/DtmConsumer.java | 8 - .../main/java/interfaces/dtm/IDtmService.java | 4 - .../interfaces/feign/IDtmFeignClient.java | 26 --- .../dtm/client}/constant/Constants.java | 2 +- .../client}/constant/ParamFieldConstants.java | 2 +- .../dtm/client}/enums/TransTypeEnum.java | 2 +- .../dtm/client}/exception/DtmException.java | 2 +- .../client/interfaces/dtm/DtmConsumer.java | 8 + .../interfaces/feign/IDtmFeignClient.java | 26 +++ .../client}/interfaces/feign/IURIParser.java | 4 +- .../dtm/client}/model/dtm/TransBase.java | 4 +- .../client}/model/feign/ServiceMessage.java | 2 +- .../client}/model/param/OperatorParam.java | 6 +- .../client/model/responses/DtmResponse.java} | 8 +- .../dtm/client}/utils/FeignUtils.java | 14 +- .../{ => pub/dtm/client}/utils/HttpUtils.java | 6 +- .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/createdFiles.lst | 27 ++-- .../compile/default-compile/inputFiles.lst | 13 ++ .../java/barrier/BranchBarrierService.java | 69 -------- .../java/barrier/model/BranchBarrier.java | 46 ------ .../dtm/client/barrier}/BarrierParam.java | 2 +- .../pub/dtm/client/barrier/BranchBarrier.java | 104 ++++++++++++ .../dtm/client}/base/BranchIdGenerator.java | 2 +- .../dtm/client/tcc/Tcc.java} | 84 +++++----- dtmcli-core/src/main/java/tcc/model/Tcc.java | 19 --- .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/createdFiles.lst | 10 +- .../compile/default-compile/inputFiles.lst | 10 +- .../java/{ => pub/dtm}/client/DtmClient.java | 56 +++++-- .../dtm/client}/feign/DtmFeignClient.java | 23 +-- .../{ => pub/dtm/client}/feign/URIParser.java | 14 +- .../dtm/client}/properties/DtmProperties.java | 2 +- .../dtm/client}/utils/NacosUtils.java | 4 +- .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/createdFiles.lst | 10 +- .../compile/default-compile/inputFiles.lst | 10 +- .../src/main/java/client/DtmClient.java | 25 --- .../main/java/pub/dtm/client/DtmClient.java | 27 ++++ .../configuration/DtmConfiguration.java | 25 +-- .../dtm/client}/feign/DtmFeignClient.java | 23 +-- .../{ => pub/dtm/client}/feign/URIParser.java | 10 +- .../dtm/client}/properties/DtmProperties.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- .../spring-configuration-metadata.json | 8 +- .../target/classes/META-INF/spring.factories | 2 +- .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/createdFiles.lst | 10 +- .../compile/default-compile/inputFiles.lst | 10 +- src/main/java/barrier/BarrierParam.java | 57 ------- src/main/java/barrier/BranchBarrier.java | 151 ------------------ src/main/java/client/DtmClient.java | 98 ------------ src/main/java/common/constant/Constant.java | 38 ----- .../common/constant/ParamFieldConstant.java | 76 --------- src/main/java/common/enums/TransTypeEnum.java | 41 ----- src/main/java/common/model/DtmConsumer.java | 34 ---- src/main/java/common/model/DtmServerInfo.java | 106 ------------ src/main/java/common/model/TransBase.java | 70 -------- src/main/java/common/model/TransResponse.java | 44 ----- .../common/utils/BranchIdGeneratorUtil.java | 63 -------- src/main/java/common/utils/HttpUtil.java | 71 -------- src/main/java/common/utils/StreamUtil.java | 63 -------- src/main/java/exception/FailureException.java | 32 ---- src/main/java/saga/Saga.java | 129 --------------- src/main/java/tcc/Tcc.java | 146 ----------------- src/main/java/xa/Xa.java | 29 ---- 66 files changed, 386 insertions(+), 1643 deletions(-) delete mode 100644 dtmcli-common/src/main/java/interfaces/dtm/DtmConsumer.java delete mode 100644 dtmcli-common/src/main/java/interfaces/dtm/IDtmService.java delete mode 100644 dtmcli-common/src/main/java/interfaces/feign/IDtmFeignClient.java rename dtmcli-common/src/main/java/{ => pub/dtm/client}/constant/Constants.java (97%) rename dtmcli-common/src/main/java/{ => pub/dtm/client}/constant/ParamFieldConstants.java (95%) rename dtmcli-common/src/main/java/{ => pub/dtm/client}/enums/TransTypeEnum.java (94%) rename dtmcli-common/src/main/java/{ => pub/dtm/client}/exception/DtmException.java (83%) create mode 100644 dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java create mode 100644 dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java rename dtmcli-common/src/main/java/{ => pub/dtm/client}/interfaces/feign/IURIParser.java (57%) rename dtmcli-common/src/main/java/{ => pub/dtm/client}/model/dtm/TransBase.java (81%) rename dtmcli-common/src/main/java/{ => pub/dtm/client}/model/feign/ServiceMessage.java (97%) rename dtmcli-common/src/main/java/{ => pub/dtm/client}/model/param/OperatorParam.java (92%) rename dtmcli-common/src/main/java/{model/response/ResponseBase.java => pub/dtm/client/model/responses/DtmResponse.java} (69%) rename dtmcli-common/src/main/java/{ => pub/dtm/client}/utils/FeignUtils.java (86%) rename dtmcli-common/src/main/java/{ => pub/dtm/client}/utils/HttpUtils.java (95%) delete mode 100644 dtmcli-core/src/main/java/barrier/BranchBarrierService.java delete mode 100644 dtmcli-core/src/main/java/barrier/model/BranchBarrier.java rename dtmcli-core/src/main/java/{barrier/model => pub/dtm/client/barrier}/BarrierParam.java (92%) create mode 100644 dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java rename dtmcli-core/src/main/java/{ => pub/dtm/client}/base/BranchIdGenerator.java (96%) rename dtmcli-core/src/main/java/{tcc/TccService.java => pub/dtm/client/tcc/Tcc.java} (55%) delete mode 100644 dtmcli-core/src/main/java/tcc/model/Tcc.java rename dtmcli-java/src/main/java/{ => pub/dtm}/client/DtmClient.java (64%) rename dtmcli-java/src/main/java/{ => pub/dtm/client}/feign/DtmFeignClient.java (66%) rename dtmcli-java/src/main/java/{ => pub/dtm/client}/feign/URIParser.java (68%) rename dtmcli-java/src/main/java/{ => pub/dtm/client}/properties/DtmProperties.java (96%) rename dtmcli-java/src/main/java/{ => pub/dtm/client}/utils/NacosUtils.java (90%) delete mode 100644 dtmcli-spring/src/main/java/client/DtmClient.java create mode 100644 dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java rename dtmcli-spring/src/main/java/{ => pub/dtm/client}/configuration/DtmConfiguration.java (60%) rename dtmcli-spring/src/main/java/{ => pub/dtm/client}/feign/DtmFeignClient.java (72%) rename dtmcli-spring/src/main/java/{ => pub/dtm/client}/feign/URIParser.java (72%) rename dtmcli-spring/src/main/java/{ => pub/dtm/client}/properties/DtmProperties.java (89%) delete mode 100644 src/main/java/barrier/BarrierParam.java delete mode 100644 src/main/java/barrier/BranchBarrier.java delete mode 100644 src/main/java/client/DtmClient.java delete mode 100644 src/main/java/common/constant/Constant.java delete mode 100644 src/main/java/common/constant/ParamFieldConstant.java delete mode 100644 src/main/java/common/enums/TransTypeEnum.java delete mode 100644 src/main/java/common/model/DtmConsumer.java delete mode 100644 src/main/java/common/model/DtmServerInfo.java delete mode 100644 src/main/java/common/model/TransBase.java delete mode 100644 src/main/java/common/model/TransResponse.java delete mode 100644 src/main/java/common/utils/BranchIdGeneratorUtil.java delete mode 100644 src/main/java/common/utils/HttpUtil.java delete mode 100644 src/main/java/common/utils/StreamUtil.java delete mode 100644 src/main/java/exception/FailureException.java delete mode 100644 src/main/java/saga/Saga.java delete mode 100644 src/main/java/tcc/Tcc.java delete mode 100644 src/main/java/xa/Xa.java diff --git a/dtmcli-common/src/main/java/interfaces/dtm/DtmConsumer.java b/dtmcli-common/src/main/java/interfaces/dtm/DtmConsumer.java deleted file mode 100644 index ef81b9c..0000000 --- a/dtmcli-common/src/main/java/interfaces/dtm/DtmConsumer.java +++ /dev/null @@ -1,8 +0,0 @@ -package interfaces.dtm; - -import model.dtm.TransBase; - -@FunctionalInterface -public interface DtmConsumer { - void accept(S s, T t) throws Exception; -} diff --git a/dtmcli-common/src/main/java/interfaces/dtm/IDtmService.java b/dtmcli-common/src/main/java/interfaces/dtm/IDtmService.java deleted file mode 100644 index 0b82617..0000000 --- a/dtmcli-common/src/main/java/interfaces/dtm/IDtmService.java +++ /dev/null @@ -1,4 +0,0 @@ -package interfaces.dtm; - -public interface IDtmService { -} diff --git a/dtmcli-common/src/main/java/interfaces/feign/IDtmFeignClient.java b/dtmcli-common/src/main/java/interfaces/feign/IDtmFeignClient.java deleted file mode 100644 index 3c78c28..0000000 --- a/dtmcli-common/src/main/java/interfaces/feign/IDtmFeignClient.java +++ /dev/null @@ -1,26 +0,0 @@ -package interfaces.feign; - -import feign.Response; -import model.param.OperatorParam; -import model.response.ResponseBase; - -import java.net.URI; -import java.util.Map; - -public interface IDtmFeignClient { - ResponseBase newGid(); - - ResponseBase ping(); - - ResponseBase prepare(OperatorParam body); - - ResponseBase submit(OperatorParam body); - - ResponseBase abort(OperatorParam body); - - ResponseBase registerBranch(OperatorParam body); - - Response busiGet(URI host, String path, Map queryMap); - - Response busiPost(URI host, String path, Map queryMap, Object body); -} diff --git a/dtmcli-common/src/main/java/constant/Constants.java b/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java similarity index 97% rename from dtmcli-common/src/main/java/constant/Constants.java rename to dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java index 15d2fbd..84e71bb 100644 --- a/dtmcli-common/src/main/java/constant/Constants.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java @@ -1,4 +1,4 @@ -package constant; +package pub.dtm.client.constant; public class Constants { public static final String MICRO_SERVICE_NAME_KEY = "dtm.service.name"; diff --git a/dtmcli-common/src/main/java/constant/ParamFieldConstants.java b/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java similarity index 95% rename from dtmcli-common/src/main/java/constant/ParamFieldConstants.java rename to dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java index 0adf4fb..0b0c747 100644 --- a/dtmcli-common/src/main/java/constant/ParamFieldConstants.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java @@ -1,4 +1,4 @@ -package constant; +package pub.dtm.client.constant; public class ParamFieldConstants { public static final String GID = "gid"; diff --git a/dtmcli-common/src/main/java/enums/TransTypeEnum.java b/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java similarity index 94% rename from dtmcli-common/src/main/java/enums/TransTypeEnum.java rename to dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java index eb79010..0f06343 100644 --- a/dtmcli-common/src/main/java/enums/TransTypeEnum.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java @@ -1,4 +1,4 @@ -package enums; +package pub.dtm.client.enums; public enum TransTypeEnum { TCC("tcc"), diff --git a/dtmcli-common/src/main/java/exception/DtmException.java b/dtmcli-common/src/main/java/pub/dtm/client/exception/DtmException.java similarity index 83% rename from dtmcli-common/src/main/java/exception/DtmException.java rename to dtmcli-common/src/main/java/pub/dtm/client/exception/DtmException.java index 5461824..a5a4998 100644 --- a/dtmcli-common/src/main/java/exception/DtmException.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/exception/DtmException.java @@ -1,4 +1,4 @@ -package exception; +package pub.dtm.client.exception; public class DtmException extends Exception { public DtmException(String msg) { diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java new file mode 100644 index 0000000..8f3cda1 --- /dev/null +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java @@ -0,0 +1,8 @@ +package pub.dtm.client.interfaces.dtm; + +import pub.dtm.client.model.dtm.TransBase; + +@FunctionalInterface +public interface DtmConsumer { + void accept(T t) throws Exception; +} diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java new file mode 100644 index 0000000..b2d8122 --- /dev/null +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java @@ -0,0 +1,26 @@ +package pub.dtm.client.interfaces.feign; + +import feign.Response; +import pub.dtm.client.model.param.OperatorParam; +import pub.dtm.client.model.responses.DtmResponse; + +import java.net.URI; +import java.util.Map; + +public interface IDtmFeignClient { + DtmResponse newGid(); + + DtmResponse ping(); + + DtmResponse prepare(OperatorParam body); + + DtmResponse submit(OperatorParam body); + + DtmResponse abort(OperatorParam body); + + DtmResponse registerBranch(OperatorParam body); + + Response busiGet(URI host, String path, Map queryMap); + + Response busiPost(URI host, String path, Map queryMap, Object body); +} diff --git a/dtmcli-common/src/main/java/interfaces/feign/IURIParser.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java similarity index 57% rename from dtmcli-common/src/main/java/interfaces/feign/IURIParser.java rename to dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java index 1ac99c4..c742355 100644 --- a/dtmcli-common/src/main/java/interfaces/feign/IURIParser.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java @@ -1,6 +1,6 @@ -package interfaces.feign; +package pub.dtm.client.interfaces.feign; -import model.feign.ServiceMessage; +import pub.dtm.client.model.feign.ServiceMessage; public interface IURIParser { String generatorURI(ServiceMessage serviceMessage, boolean httpType) throws Exception; diff --git a/dtmcli-common/src/main/java/model/dtm/TransBase.java b/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java similarity index 81% rename from dtmcli-common/src/main/java/model/dtm/TransBase.java rename to dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java index d2b4102..0fd84f2 100644 --- a/dtmcli-common/src/main/java/model/dtm/TransBase.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java @@ -1,6 +1,6 @@ -package model.dtm; +package pub.dtm.client.model.dtm; -import enums.TransTypeEnum; +import pub.dtm.client.enums.TransTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/dtmcli-common/src/main/java/model/feign/ServiceMessage.java b/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java similarity index 97% rename from dtmcli-common/src/main/java/model/feign/ServiceMessage.java rename to dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java index 8d336fc..ed5c685 100644 --- a/dtmcli-common/src/main/java/model/feign/ServiceMessage.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java @@ -1,4 +1,4 @@ -package model.feign; +package pub.dtm.client.model.feign; import org.apache.commons.lang3.StringUtils; diff --git a/dtmcli-common/src/main/java/model/param/OperatorParam.java b/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java similarity index 92% rename from dtmcli-common/src/main/java/model/param/OperatorParam.java rename to dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java index 206322d..d6e0834 100644 --- a/dtmcli-common/src/main/java/model/param/OperatorParam.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java @@ -1,9 +1,9 @@ -package model.param; +package pub.dtm.client.model.param; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; -import constant.ParamFieldConstants; -import enums.TransTypeEnum; +import pub.dtm.client.constant.ParamFieldConstants; +import pub.dtm.client.enums.TransTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/dtmcli-common/src/main/java/model/response/ResponseBase.java b/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java similarity index 69% rename from dtmcli-common/src/main/java/model/response/ResponseBase.java rename to dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java index ed963ef..8d2c659 100644 --- a/dtmcli-common/src/main/java/model/response/ResponseBase.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java @@ -1,4 +1,4 @@ -package model.response; +package pub.dtm.client.model.responses; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; @@ -9,7 +9,7 @@ @Data @AllArgsConstructor @NoArgsConstructor -public class ResponseBase { +public class DtmResponse { @SerializedName("dtm_result") @JsonProperty("dtm_result") private String dtmResult; @@ -17,4 +17,8 @@ public class ResponseBase { @SerializedName("gid") @JsonProperty("gid") private String gid; + + public static DtmResponse buildDtmResponse(String result) { + return new DtmResponse(result, null); + } } diff --git a/dtmcli-common/src/main/java/utils/FeignUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java similarity index 86% rename from dtmcli-common/src/main/java/utils/FeignUtils.java rename to dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java index 6be5c93..e8294c4 100644 --- a/dtmcli-common/src/main/java/utils/FeignUtils.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java @@ -1,15 +1,15 @@ -package utils; +package pub.dtm.client.utils; -import constant.Constants; -import exception.DtmException; +import pub.dtm.client.constant.Constants; +import pub.dtm.client.exception.DtmException; import feign.Response; -import interfaces.feign.IURIParser; -import model.response.ResponseBase; -import model.feign.ServiceMessage; +import pub.dtm.client.interfaces.feign.IURIParser; +import pub.dtm.client.model.feign.ServiceMessage; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pub.dtm.client.model.responses.DtmResponse; import java.io.IOException; import java.io.InputStream; @@ -24,7 +24,7 @@ public static void setUriParser(IURIParser uriParser) { FeignUtils.uriParser = uriParser; } - public static String parseGid(ResponseBase base) throws Exception { + public static String parseGid(DtmResponse base) throws Exception { if (base == null || !Constants.SUCCESS_RESULT.equals(base.getDtmResult())) { throw new Exception("get new gid from dtm server fail."); } diff --git a/dtmcli-common/src/main/java/utils/HttpUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java similarity index 95% rename from dtmcli-common/src/main/java/utils/HttpUtils.java rename to dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java index 0772674..1b5bec7 100644 --- a/dtmcli-common/src/main/java/utils/HttpUtils.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java @@ -1,7 +1,7 @@ -package utils; +package pub.dtm.client.utils; -import constant.Constants; -import exception.DtmException; +import pub.dtm.client.constant.Constants; +import pub.dtm.client.exception.DtmException; import okhttp3.MediaType; import okhttp3.OkHttpClient; import okhttp3.Request; diff --git a/dtmcli-common/target/maven-archiver/pom.properties b/dtmcli-common/target/maven-archiver/pom.properties index 48cb916..a97deb0 100644 --- a/dtmcli-common/target/maven-archiver/pom.properties +++ b/dtmcli-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Apr 26 15:54:57 CST 2022 +#Tue Apr 26 17:58:45 CST 2022 version=1.0.0 groupId=pub.dtm artifactId=dtmcli-common diff --git a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 465ce62..cb90b51 100644 --- a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,14 +1,13 @@ -interfaces/dtm/IDtmService.class -constant/ParamFieldConstants.class -model/feign/ServiceMessage.class -interfaces/feign/IURIParser.class -interfaces/dtm/DtmConsumer.class -constant/Constants.class -model/param/OperatorParam.class -interfaces/feign/IDtmFeignClient.class -utils/FeignUtils.class -model/dtm/TransBase.class -utils/HttpUtils.class -model/response/ResponseBase.class -enums/TransTypeEnum.class -exception/DtmException.class +pub/dtm/client/model/responses/DtmResponse.class +pub/dtm/client/constant/ParamFieldConstants.class +pub/dtm/client/utils/HttpUtils.class +pub/dtm/client/utils/FeignUtils.class +pub/dtm/client/model/param/OperatorParam.class +pub/dtm/client/enums/TransTypeEnum.class +pub/dtm/client/model/dtm/TransBase.class +pub/dtm/client/model/feign/ServiceMessage.class +pub/dtm/client/interfaces/dtm/DtmConsumer.class +pub/dtm/client/constant/Constants.class +pub/dtm/client/interfaces/feign/IDtmFeignClient.class +pub/dtm/client/exception/DtmException.class +pub/dtm/client/interfaces/feign/IURIParser.class diff --git a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index e69de29..8a337b3 100644 --- a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,13 @@ +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/exception/DtmException.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java diff --git a/dtmcli-core/src/main/java/barrier/BranchBarrierService.java b/dtmcli-core/src/main/java/barrier/BranchBarrierService.java deleted file mode 100644 index 7f05d51..0000000 --- a/dtmcli-core/src/main/java/barrier/BranchBarrierService.java +++ /dev/null @@ -1,69 +0,0 @@ -package barrier; - -import barrier.model.BranchBarrier; -import constant.ParamFieldConstants; -import interfaces.dtm.DtmConsumer; -import interfaces.dtm.IDtmService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Objects; - -public class BranchBarrierService implements IDtmService { - private static final Logger log = LoggerFactory.getLogger(BranchBarrierService.class); - - public void call(BranchBarrier barrier, Connection connection, DtmConsumer consumer) throws Exception { - barrier.addBarrierId(); - connection.setAutoCommit(false); - try { - boolean result = insertBarrier(connection, barrier); - if (result) { - consumer.accept(this, barrier); - connection.commit(); - } - } catch (Exception exception) { - log.warn("barrier call error", exception); - connection.rollback(); - throw exception; - } finally { - connection.setAutoCommit(true); - } - } - - private boolean insertBarrier(Connection connection, BranchBarrier barrier) throws SQLException { - log.info("insert barrier {}", barrier); - if (Objects.isNull(connection)) { - return false; - } - PreparedStatement preparedStatement = null; - try { - String sql = "insert ignore into barrier(trans_type, gid, branch_id, op, barrier_id, reason) values(?,?,?,?,?,?)"; - preparedStatement = connection.prepareStatement(sql); - preparedStatement.setString(1, barrier.getTransTypeEnum().toString()); - preparedStatement.setString(2, barrier.getGid()); - preparedStatement.setString(3, barrier.getBranchId()); - preparedStatement.setString(4, barrier.getOp()); - preparedStatement.setString(5, String.format("%02d", barrier.getBarrierId())); - preparedStatement.setString(6, barrier.getOp()); - - if (preparedStatement.executeUpdate() == 0) { - return false; - } - if (ParamFieldConstants.CANCEL.equals(barrier.getOp())) { - int opIndex = 4; - preparedStatement.setString(opIndex, ParamFieldConstants.TRY); - if (preparedStatement.executeUpdate() > 0) { - return false; - } - } - } finally { - if (Objects.nonNull(preparedStatement)) { - preparedStatement.close(); - } - } - return true; - } -} diff --git a/dtmcli-core/src/main/java/barrier/model/BranchBarrier.java b/dtmcli-core/src/main/java/barrier/model/BranchBarrier.java deleted file mode 100644 index 9ba2ca1..0000000 --- a/dtmcli-core/src/main/java/barrier/model/BranchBarrier.java +++ /dev/null @@ -1,46 +0,0 @@ -package barrier.model; - -import com.google.gson.Gson; -import enums.TransTypeEnum; -import exception.DtmException; -import lombok.Data; -import model.dtm.TransBase; -import org.apache.commons.lang3.ArrayUtils; - -import java.util.Map; - -@Data -public class BranchBarrier extends TransBase { - private String branchId; - - private String op; - - private int barrierId; - - public void addBarrierId() { - this.barrierId += 1; - } - - public static BranchBarrier buildBranchBarrier(Map paramsMap) throws Exception { - if (paramsMap == null || paramsMap.isEmpty()) { - throw new DtmException("build BranchBarrier error, paramsMap can not be empty."); - } - Gson gson = new Gson(); - BarrierParam barrierParam = gson.fromJson(gson.toJson(paramsMap), BarrierParam.class); - BranchBarrier branchBarrier = new BranchBarrier(); - if (ArrayUtils.isNotEmpty(barrierParam.getTrans_type())) { - branchBarrier.setTransTypeEnum(TransTypeEnum.parseString(barrierParam.getTrans_type()[0])); - } - if (ArrayUtils.isNotEmpty(barrierParam.getGid())) { - branchBarrier.setGid(barrierParam.getGid()[0]); - } - if (ArrayUtils.isNotEmpty(barrierParam.getBranch_id())) { - branchBarrier.branchId = barrierParam.getBranch_id()[0]; - } - if (ArrayUtils.isNotEmpty(barrierParam.getOp())) { - branchBarrier.op = barrierParam.getOp()[0]; - } - return branchBarrier; - } - -} diff --git a/dtmcli-core/src/main/java/barrier/model/BarrierParam.java b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java similarity index 92% rename from dtmcli-core/src/main/java/barrier/model/BarrierParam.java rename to dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java index c32bffc..a8f9e54 100644 --- a/dtmcli-core/src/main/java/barrier/model/BarrierParam.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java @@ -1,4 +1,4 @@ -package barrier.model; +package pub.dtm.client.barrier; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java new file mode 100644 index 0000000..a87093e --- /dev/null +++ b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java @@ -0,0 +1,104 @@ +package pub.dtm.client.barrier; + +import com.google.gson.Gson; +import pub.dtm.client.constant.ParamFieldConstants; +import pub.dtm.client.enums.TransTypeEnum; +import pub.dtm.client.exception.DtmException; +import pub.dtm.client.interfaces.dtm.DtmConsumer; +import lombok.Data; +import lombok.NoArgsConstructor; +import pub.dtm.client.model.dtm.TransBase; +import org.apache.commons.lang3.ArrayUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.Map; +import java.util.Objects; + +@Data +@NoArgsConstructor +public class BranchBarrier extends TransBase { + private static final Logger log = LoggerFactory.getLogger(BranchBarrier.class); + + private String branchId; + + private String op; + + private int barrierId; + + public BranchBarrier(Map paramsMap) throws Exception { + if (paramsMap == null || paramsMap.isEmpty()) { + throw new DtmException("build BranchBarrier error, paramsMap can not be empty."); + } + Gson gson = new Gson(); + BarrierParam barrierParam = gson.fromJson(gson.toJson(paramsMap), BarrierParam.class); + if (ArrayUtils.isNotEmpty(barrierParam.getTrans_type())) { + this.setTransTypeEnum(TransTypeEnum.parseString(barrierParam.getTrans_type()[0])); + } + if (ArrayUtils.isNotEmpty(barrierParam.getGid())) { + this.setGid(barrierParam.getGid()[0]); + } + if (ArrayUtils.isNotEmpty(barrierParam.getBranch_id())) { + this.branchId = barrierParam.getBranch_id()[0]; + } + if (ArrayUtils.isNotEmpty(barrierParam.getOp())) { + this.op = barrierParam.getOp()[0]; + } + } + + public void call(Connection connection, DtmConsumer consumer) throws Exception { + ++this.barrierId; + connection.setAutoCommit(false); + try { + boolean result = insertBarrier(connection); + if (result) { + consumer.accept(this); + connection.commit(); + } + } catch (Exception exception) { + log.warn("barrier call error", exception); + connection.rollback(); + throw exception; + } finally { + connection.setAutoCommit(true); + } + } + + private boolean insertBarrier(Connection connection) throws SQLException { + log.info("insert barrier {}", this); + if (Objects.isNull(connection)) { + return false; + } + PreparedStatement preparedStatement = null; + try { + String sql = "insert ignore into barrier(trans_type, gid, branch_id, op, barrier_id, reason) values(?,?,?,?,?,?)"; + preparedStatement = connection.prepareStatement(sql); + preparedStatement.setString(1, this.getTransTypeEnum().toString()); + preparedStatement.setString(2, this.getGid()); + preparedStatement.setString(3, branchId); + preparedStatement.setString(4, op); + preparedStatement.setString(5, String.format("%02d", barrierId)); + preparedStatement.setString(6, op); + + if (preparedStatement.executeUpdate() == 0) { + return false; + } + if (ParamFieldConstants.CANCEL.equals(op)) { + int opIndex = 4; + preparedStatement.setString(opIndex, ParamFieldConstants.TRY); + if (preparedStatement.executeUpdate() > 0) { + return false; + } + } + } finally { + if (Objects.nonNull(preparedStatement)) { + preparedStatement.close(); + } + } + return true; + } + +} diff --git a/dtmcli-core/src/main/java/base/BranchIdGenerator.java b/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java similarity index 96% rename from dtmcli-core/src/main/java/base/BranchIdGenerator.java rename to dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java index 915b42c..dd6d599 100644 --- a/dtmcli-core/src/main/java/base/BranchIdGenerator.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java @@ -1,4 +1,4 @@ -package base; +package pub.dtm.client.base; public class BranchIdGenerator { private static final int MAX_BRANCH_ID = 99; diff --git a/dtmcli-core/src/main/java/tcc/TccService.java b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java similarity index 55% rename from dtmcli-core/src/main/java/tcc/TccService.java rename to dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java index 0cdf89b..4d3fe3d 100644 --- a/dtmcli-core/src/main/java/tcc/TccService.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java @@ -1,36 +1,40 @@ -package tcc; +package pub.dtm.client.tcc; +import pub.dtm.client.base.BranchIdGenerator; import com.google.gson.Gson; -import constant.Constants; -import constant.ParamFieldConstants; -import enums.TransTypeEnum; -import exception.DtmException; -import interfaces.dtm.DtmConsumer; -import interfaces.dtm.IDtmService; -import interfaces.feign.IDtmFeignClient; -import model.feign.ServiceMessage; -import model.param.OperatorParam; -import model.response.ResponseBase; +import pub.dtm.client.constant.Constants; +import pub.dtm.client.constant.ParamFieldConstants; +import pub.dtm.client.enums.TransTypeEnum; +import pub.dtm.client.exception.DtmException; +import pub.dtm.client.interfaces.dtm.DtmConsumer; +import pub.dtm.client.interfaces.feign.IDtmFeignClient; +import pub.dtm.client.model.dtm.TransBase; +import pub.dtm.client.model.feign.ServiceMessage; +import pub.dtm.client.model.param.OperatorParam; import okhttp3.Response; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tcc.model.Tcc; -import utils.FeignUtils; -import utils.HttpUtils; +import pub.dtm.client.model.responses.DtmResponse; +import pub.dtm.client.utils.FeignUtils; +import pub.dtm.client.utils.HttpUtils; import java.net.URI; import java.util.HashMap; import java.util.Map; -public class TccService implements IDtmService { - private static final Logger log = LoggerFactory.getLogger(TccService.class); +public class Tcc extends TransBase { + private static final Logger log = LoggerFactory.getLogger(Tcc.class); private static final String OP = "try"; + private final BranchIdGenerator branchIdGenerator; + private IDtmFeignClient feignClient; - public TccService(IDtmFeignClient feignClient) { + public Tcc(String gid, IDtmFeignClient feignClient) { + super(gid, TransTypeEnum.TCC, false); + this.branchIdGenerator = new BranchIdGenerator(Constants.EMPTY_STRING); this.feignClient = feignClient; } @@ -38,48 +42,46 @@ public void setFeignClient(IDtmFeignClient feignClient) { this.feignClient = feignClient; } - public String tccGlobalTransaction(String gid, DtmConsumer consumer) throws Exception { - if (StringUtils.isEmpty(gid)) { - gid = FeignUtils.parseGid(feignClient.newGid()); + public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { + if (StringUtils.isEmpty(this.getGid())) { + this.setGid(FeignUtils.parseGid(feignClient.newGid())); } - log.info("the tcc transaction's gid is {}", gid); - Tcc tcc = new Tcc(gid); - + log.info("the tcc transaction's gid is {}", this.getGid()); - OperatorParam operatorParam = new OperatorParam(gid, TransTypeEnum.TCC); - ResponseBase resp = feignClient.prepare(operatorParam); + OperatorParam operatorParam = new OperatorParam(this.getGid(), TransTypeEnum.TCC); + DtmResponse resp = feignClient.prepare(operatorParam); log.info("prepare response: {}", resp); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { - log.error("TCC transaction prepare fail. returned dtm_result is: {}, transaction gid: {}", resp.getDtmResult(), gid); + log.error("TCC transaction prepare fail. returned dtm_result is: {}, transaction gid: {}", resp.getDtmResult(), this.getGid()); throw new DtmException("TCC Transaction prepare fail"); } try { - consumer.accept(this, tcc); + consumer.accept(this); feignClient.submit(operatorParam); } catch (Exception e) { - log.error("TCC transaction submit fail, start abort it. transaction gid: {}", gid); + log.error("TCC transaction submit fail, start abort it. transaction gid: {}", this.getGid()); feignClient.abort(operatorParam); throw new DtmException(e); } - return gid; + return this.getGid(); } - public feign.Response callBranch(Tcc tcc, Object body, ServiceMessage tryMessage, ServiceMessage confirmMessage, ServiceMessage cancelMessage) throws Exception { + public feign.Response callBranch(Object body, ServiceMessage tryMessage, ServiceMessage confirmMessage, ServiceMessage cancelMessage) throws Exception { Gson gson = new Gson(); log.info("call method Tcc.callBranch, tryMessage: {}, confirmMessage: {}, cancelMessage: {}", gson.toJson(tryMessage), gson.toJson(confirmMessage), gson.toJson(cancelMessage)); - String branchId = tcc.getBranchIdGenerator().genBranchId(); + String branchId = this.branchIdGenerator.genBranchId(); - OperatorParam operatorParam = new OperatorParam(tcc.getGid(), TransTypeEnum.TCC, Constants.DEFAULT_STATUS, branchId, + OperatorParam operatorParam = new OperatorParam(this.getGid(), TransTypeEnum.TCC, Constants.DEFAULT_STATUS, branchId, gson.toJson(body), FeignUtils.generatorURI(confirmMessage, false), FeignUtils.generatorURI(cancelMessage, false)); - ResponseBase resp = feignClient.registerBranch(operatorParam); + DtmResponse resp = feignClient.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { - log.error("TCC transaction register branch fail. transaction gid: {}", tcc.getGid()); + log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); throw new DtmException("TCC Transaction register branch fail"); } Map paramsMap = new HashMap<>(); - paramsMap.put(ParamFieldConstants.GID, tcc.getGid()); + paramsMap.put(ParamFieldConstants.GID, this.getGid()); paramsMap.put(ParamFieldConstants.TRANS_TYPE, TransTypeEnum.TCC.toString()); paramsMap.put(ParamFieldConstants.BRANCH_ID, branchId); paramsMap.put(ParamFieldConstants.OP, OP); @@ -91,21 +93,21 @@ public feign.Response callBranch(Tcc tcc, Object body, ServiceMessage tryMessage return response; } - public Response callBranch(Tcc tcc, Object body, String tryUrl, String confirmUrl, String cancelUrl) throws Exception { + public Response callBranch(Object body, String tryUrl, String confirmUrl, String cancelUrl) throws Exception { log.info("call method Tcc.callBranch, tryUrl: {}, confirmUrl: {}, cancelUrl: {}", tryUrl, confirmUrl, cancelUrl); - String branchId = tcc.getBranchIdGenerator().genBranchId(); + String branchId = branchIdGenerator.genBranchId(); Gson gson = new Gson(); - OperatorParam operatorParam = new OperatorParam(tcc.getGid(), TransTypeEnum.TCC, Constants.DEFAULT_STATUS, + OperatorParam operatorParam = new OperatorParam(this.getGid(), TransTypeEnum.TCC, Constants.DEFAULT_STATUS, branchId, gson.toJson(body), confirmUrl, cancelUrl); - ResponseBase resp = feignClient.registerBranch(operatorParam); + DtmResponse resp = feignClient.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { - log.error("TCC transaction register branch fail. transaction gid: {}", tcc.getGid()); + log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); throw new DtmException("TCC Transaction register branch fail"); } Map paramsMap = new HashMap<>(); - paramsMap.put(ParamFieldConstants.GID, tcc.getGid()); + paramsMap.put(ParamFieldConstants.GID, this.getGid()); paramsMap.put(ParamFieldConstants.TRANS_TYPE, TransTypeEnum.TCC.toString()); paramsMap.put(ParamFieldConstants.BRANCH_ID, branchId); paramsMap.put(ParamFieldConstants.OP, OP); diff --git a/dtmcli-core/src/main/java/tcc/model/Tcc.java b/dtmcli-core/src/main/java/tcc/model/Tcc.java deleted file mode 100644 index 73d04b3..0000000 --- a/dtmcli-core/src/main/java/tcc/model/Tcc.java +++ /dev/null @@ -1,19 +0,0 @@ -package tcc.model; - -import base.BranchIdGenerator; -import constant.Constants; -import enums.TransTypeEnum; -import model.dtm.TransBase; - -public class Tcc extends TransBase { - private final BranchIdGenerator branchIdGenerator; - - public Tcc(String gid) { - super(gid, TransTypeEnum.TCC, false); - this.branchIdGenerator = new BranchIdGenerator(Constants.EMPTY_STRING); - } - - public BranchIdGenerator getBranchIdGenerator() { - return branchIdGenerator; - } -} diff --git a/dtmcli-core/target/maven-archiver/pom.properties b/dtmcli-core/target/maven-archiver/pom.properties index 15bc8dd..9a7e43f 100644 --- a/dtmcli-core/target/maven-archiver/pom.properties +++ b/dtmcli-core/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Apr 26 15:54:58 CST 2022 +#Tue Apr 26 17:58:45 CST 2022 version=1.0.0 groupId=pub.dtm artifactId=dtmcli-core diff --git a/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 16f5943..d26f489 100644 --- a/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,6 +1,4 @@ -barrier/model/BarrierParam.class -barrier/BranchBarrierService.class -tcc/model/Tcc.class -barrier/model/BranchBarrier.class -tcc/TccService.class -base/BranchIdGenerator.class +pub/dtm/client/tcc/Tcc.class +pub/dtm/client/barrier/BranchBarrier.class +pub/dtm/client/barrier/BarrierParam.class +pub/dtm/client/base/BranchIdGenerator.class diff --git a/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 56f854a..85e740c 100644 --- a/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,6 +1,4 @@ -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/barrier/model/BarrierParam.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/tcc/model/Tcc.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/base/BranchIdGenerator.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/barrier/BranchBarrierService.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/tcc/TccService.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/barrier/model/BranchBarrier.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java diff --git a/dtmcli-java/src/main/java/client/DtmClient.java b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java similarity index 64% rename from dtmcli-java/src/main/java/client/DtmClient.java rename to dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java index dca0d61..cac9fad 100644 --- a/dtmcli-java/src/main/java/client/DtmClient.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java @@ -1,21 +1,20 @@ -package client; +package pub.dtm.client; import com.alibaba.nacos.api.naming.pojo.Instance; -import constant.Constants; -import feign.DtmFeignClient; +import pub.dtm.client.constant.Constants; +import pub.dtm.client.feign.DtmFeignClient; import feign.Feign; -import feign.URIParser; +import pub.dtm.client.feign.URIParser; import feign.gson.GsonDecoder; import feign.gson.GsonEncoder; -import interfaces.dtm.DtmConsumer; -import interfaces.feign.IDtmFeignClient; +import pub.dtm.client.interfaces.dtm.DtmConsumer; +import pub.dtm.client.interfaces.feign.IDtmFeignClient; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import properties.DtmProperties; -import tcc.TccService; -import tcc.model.Tcc; -import utils.NacosUtils; +import pub.dtm.client.properties.DtmProperties; +import pub.dtm.client.tcc.Tcc; +import pub.dtm.client.utils.NacosUtils; import java.util.ArrayList; import java.util.Arrays; @@ -29,8 +28,7 @@ public class DtmClient { private static final Logger log = LoggerFactory.getLogger(DtmClient.class); - - private TccService tccService; + private IDtmFeignClient feignClient; public DtmClient() { // init URIParser @@ -64,7 +62,29 @@ public DtmClient() { System.exit(-1); } - this.tccService = new TccService(feignClient); + this.feignClient = feignClient; + } + + public DtmClient(String endpoint) { + // init URIParser + new URIParser(); + + if (StringUtils.isEmpty(endpoint)) { + log.error("dtm server endpoint can not be empty."); + System.exit(-1); + } + IDtmFeignClient feignClient = Feign + .builder() + .decoder(new GsonDecoder()) + .encoder(new GsonEncoder()) + .target(DtmFeignClient.class, Constants.HTTP_PREFIX + endpoint); + + if (feignClient == null) { + log.error("initial dtm client for java error, feign client can't be null."); + System.exit(-1); + } + + this.feignClient = feignClient; } private List genClusters(String clusterStr) { @@ -77,11 +97,13 @@ private List genClusters(String clusterStr) { return Arrays.asList(split); } - public String tccGlobalTransaction(DtmConsumer function) throws Exception { - return tccService.tccGlobalTransaction(null, function); + public String tccGlobalTransaction(DtmConsumer function) throws Exception { + Tcc tcc = new Tcc(null, feignClient); + return tcc.tccGlobalTransaction(function); } - public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { - return tccService.tccGlobalTransaction(gid, function); + public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { + Tcc tcc = new Tcc(gid, feignClient); + return tcc.tccGlobalTransaction(function); } } diff --git a/dtmcli-java/src/main/java/feign/DtmFeignClient.java b/dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java similarity index 66% rename from dtmcli-java/src/main/java/feign/DtmFeignClient.java rename to dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java index 7e34f7f..d4fe99d 100644 --- a/dtmcli-java/src/main/java/feign/DtmFeignClient.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java @@ -1,9 +1,10 @@ -package feign; +package pub.dtm.client.feign; -import constant.Constants; -import interfaces.feign.IDtmFeignClient; -import model.param.OperatorParam; -import model.response.ResponseBase; +import feign.*; +import pub.dtm.client.constant.Constants; +import pub.dtm.client.interfaces.feign.IDtmFeignClient; +import pub.dtm.client.model.param.OperatorParam; +import pub.dtm.client.model.responses.DtmResponse; import java.net.URI; import java.util.Map; @@ -12,27 +13,27 @@ public interface DtmFeignClient extends IDtmFeignClient { @Override @RequestLine(Constants.GET_METHOD + Constants.NEW_GID_URL) - ResponseBase newGid(); + DtmResponse newGid(); @Override @RequestLine(Constants.GET_METHOD + Constants.PING_URL) - ResponseBase ping(); + DtmResponse ping(); @Override @RequestLine(Constants.POST_METHOD + Constants.PREPARE_URL) - ResponseBase prepare(OperatorParam body); + DtmResponse prepare(OperatorParam body); @Override @RequestLine(Constants.POST_METHOD + Constants.SUBMIT_URL) - ResponseBase submit(OperatorParam body); + DtmResponse submit(OperatorParam body); @Override @RequestLine(Constants.POST_METHOD + Constants.ABORT_URL) - ResponseBase abort(OperatorParam body); + DtmResponse abort(OperatorParam body); @Override @RequestLine(Constants.POST_METHOD + Constants.REGISTER_BRANCH_URL) - ResponseBase registerBranch(OperatorParam body); + DtmResponse registerBranch(OperatorParam body); @Override @RequestLine(Constants.GET_METHOD + "{path}") diff --git a/dtmcli-java/src/main/java/feign/URIParser.java b/dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java similarity index 68% rename from dtmcli-java/src/main/java/feign/URIParser.java rename to dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java index 250f907..ccc73b3 100644 --- a/dtmcli-java/src/main/java/feign/URIParser.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java @@ -1,12 +1,12 @@ -package feign; +package pub.dtm.client.feign; import com.alibaba.nacos.api.naming.pojo.Instance; -import constant.Constants; -import interfaces.feign.IURIParser; -import model.feign.ServiceMessage; -import properties.DtmProperties; -import utils.FeignUtils; -import utils.NacosUtils; +import pub.dtm.client.constant.Constants; +import pub.dtm.client.interfaces.feign.IURIParser; +import pub.dtm.client.model.feign.ServiceMessage; +import pub.dtm.client.properties.DtmProperties; +import pub.dtm.client.utils.FeignUtils; +import pub.dtm.client.utils.NacosUtils; public class URIParser implements IURIParser { static { diff --git a/dtmcli-java/src/main/java/properties/DtmProperties.java b/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java similarity index 96% rename from dtmcli-java/src/main/java/properties/DtmProperties.java rename to dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java index bf4ecec..8c23607 100644 --- a/dtmcli-java/src/main/java/properties/DtmProperties.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java @@ -1,4 +1,4 @@ -package properties; +package pub.dtm.client.properties; import java.io.FileInputStream; import java.io.IOException; diff --git a/dtmcli-java/src/main/java/utils/NacosUtils.java b/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java similarity index 90% rename from dtmcli-java/src/main/java/utils/NacosUtils.java rename to dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java index 4ee631c..53c73a9 100644 --- a/dtmcli-java/src/main/java/utils/NacosUtils.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java @@ -1,9 +1,9 @@ -package utils; +package pub.dtm.client.utils; import com.alibaba.nacos.api.naming.NamingFactory; import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.pojo.Instance; -import properties.DtmProperties; +import pub.dtm.client.properties.DtmProperties; import java.util.List; diff --git a/dtmcli-java/target/maven-archiver/pom.properties b/dtmcli-java/target/maven-archiver/pom.properties index a464007..7b70382 100644 --- a/dtmcli-java/target/maven-archiver/pom.properties +++ b/dtmcli-java/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Apr 26 15:55:30 CST 2022 +#Tue Apr 26 17:58:47 CST 2022 version=1.0.0 groupId=pub.dtm artifactId=dtmcli-java diff --git a/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 28be81a..2e58121 100644 --- a/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,5 +1,5 @@ -feign/DtmFeignClient.class -feign/URIParser.class -utils/NacosUtils.class -properties/DtmProperties.class -client/DtmClient.class +pub/dtm/client/utils/NacosUtils.class +pub/dtm/client/feign/DtmFeignClient.class +pub/dtm/client/feign/URIParser.class +pub/dtm/client/DtmClient.class +pub/dtm/client/properties/DtmProperties.class diff --git a/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index a9d548a..6386389 100644 --- a/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,5 +1,5 @@ -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/feign/DtmFeignClient.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/properties/DtmProperties.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/client/DtmClient.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/feign/URIParser.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/utils/NacosUtils.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java diff --git a/dtmcli-spring/src/main/java/client/DtmClient.java b/dtmcli-spring/src/main/java/client/DtmClient.java deleted file mode 100644 index 72a90d9..0000000 --- a/dtmcli-spring/src/main/java/client/DtmClient.java +++ /dev/null @@ -1,25 +0,0 @@ -package client; - -import interfaces.dtm.DtmConsumer; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import tcc.TccService; -import tcc.model.Tcc; - -@Component -public class DtmClient { - @Autowired - private TccService tccService; - - public DtmClient(TccService tccService) { - this.tccService = tccService; - } - - public String tccGlobalTransaction(DtmConsumer function) throws Exception { - return tccService.tccGlobalTransaction(null, function); - } - - public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { - return tccService.tccGlobalTransaction(gid, function); - } -} diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java new file mode 100644 index 0000000..3c79d06 --- /dev/null +++ b/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java @@ -0,0 +1,27 @@ +package pub.dtm.client; + +import pub.dtm.client.interfaces.dtm.DtmConsumer; +import pub.dtm.client.interfaces.feign.IDtmFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import pub.dtm.client.tcc.Tcc; + +@Component +public class DtmClient { + @Autowired + private IDtmFeignClient feignClient; + + public DtmClient(IDtmFeignClient feignClient) { + this.feignClient = feignClient; + } + + public String tccGlobalTransaction(DtmConsumer function) throws Exception { + Tcc tcc = new Tcc(null, feignClient); + return tcc.tccGlobalTransaction(function); + } + + public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { + Tcc tcc = new Tcc(gid, feignClient); + return tcc.tccGlobalTransaction(function); + } +} diff --git a/dtmcli-spring/src/main/java/configuration/DtmConfiguration.java b/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java similarity index 60% rename from dtmcli-spring/src/main/java/configuration/DtmConfiguration.java rename to dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java index dbdb0e2..6f11268 100644 --- a/dtmcli-spring/src/main/java/configuration/DtmConfiguration.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java @@ -1,8 +1,6 @@ -package configuration; +package pub.dtm.client.configuration; -import barrier.BranchBarrierService; -import feign.DtmFeignClient; -import feign.URIParser; +import pub.dtm.client.feign.URIParser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -11,30 +9,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import properties.DtmProperties; -import tcc.TccService; +import pub.dtm.client.properties.DtmProperties; @Component -@ComponentScan({"feign", "client"}) +@ComponentScan({"pub.dtm.client.feign", "pub.dtm.client"}) @Configuration -@EnableFeignClients("feign") +@EnableFeignClients("pub.dtm.client.feign") @EnableConfigurationProperties(DtmProperties.class) public class DtmConfiguration { @Autowired private DtmProperties dtmProperties; - @Bean - @ConditionalOnMissingBean(TccService.class) - public TccService tccService(DtmFeignClient feignClient) { - return new TccService(feignClient); - } - - @Bean - @ConditionalOnMissingBean(BranchBarrierService.class) - public BranchBarrierService branchBarrierService() { - return new BranchBarrierService(); - } - @Bean @ConditionalOnMissingBean(URIParser.class) public URIParser uriParser() { diff --git a/dtmcli-spring/src/main/java/feign/DtmFeignClient.java b/dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java similarity index 72% rename from dtmcli-spring/src/main/java/feign/DtmFeignClient.java rename to dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java index e7e285b..5d81022 100644 --- a/dtmcli-spring/src/main/java/feign/DtmFeignClient.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java @@ -1,9 +1,9 @@ -package feign; +package pub.dtm.client.feign; -import constant.Constants; -import interfaces.feign.IDtmFeignClient; -import model.param.OperatorParam; -import model.response.ResponseBase; +import pub.dtm.client.constant.Constants; +import feign.Response; +import pub.dtm.client.interfaces.feign.IDtmFeignClient; +import pub.dtm.client.model.param.OperatorParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.http.MediaType; @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import pub.dtm.client.model.responses.DtmResponse; import java.net.URI; import java.util.Map; @@ -19,27 +20,27 @@ public interface DtmFeignClient extends IDtmFeignClient { @Override @GetMapping(Constants.NEW_GID_URL) - ResponseBase newGid(); + DtmResponse newGid(); @Override @GetMapping(Constants.PING_URL) - ResponseBase ping(); + DtmResponse ping(); @Override @PostMapping(Constants.PREPARE_URL) - ResponseBase prepare(@RequestBody OperatorParam body); + DtmResponse prepare(@RequestBody OperatorParam body); @Override @PostMapping(Constants.SUBMIT_URL) - ResponseBase submit(@RequestBody OperatorParam body); + DtmResponse submit(@RequestBody OperatorParam body); @Override @PostMapping(Constants.ABORT_URL) - ResponseBase abort(@RequestBody OperatorParam body); + DtmResponse abort(@RequestBody OperatorParam body); @Override @PostMapping(Constants.REGISTER_BRANCH_URL) - ResponseBase registerBranch(@RequestBody OperatorParam body); + DtmResponse registerBranch(@RequestBody OperatorParam body); @Override @GetMapping(value = "{path}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/dtmcli-spring/src/main/java/feign/URIParser.java b/dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java similarity index 72% rename from dtmcli-spring/src/main/java/feign/URIParser.java rename to dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java index 07bda35..160c604 100644 --- a/dtmcli-spring/src/main/java/feign/URIParser.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java @@ -1,9 +1,9 @@ -package feign; +package pub.dtm.client.feign; -import constant.Constants; -import interfaces.feign.IURIParser; -import model.feign.ServiceMessage; -import utils.FeignUtils; +import pub.dtm.client.constant.Constants; +import pub.dtm.client.interfaces.feign.IURIParser; +import pub.dtm.client.model.feign.ServiceMessage; +import pub.dtm.client.utils.FeignUtils; public class URIParser implements IURIParser { static { diff --git a/dtmcli-spring/src/main/java/properties/DtmProperties.java b/dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java similarity index 89% rename from dtmcli-spring/src/main/java/properties/DtmProperties.java rename to dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java index e2f3815..f3be4ef 100644 --- a/dtmcli-spring/src/main/java/properties/DtmProperties.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java @@ -1,4 +1,4 @@ -package properties; +package pub.dtm.client.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/dtmcli-spring/src/main/resources/META-INF/spring.factories b/dtmcli-spring/src/main/resources/META-INF/spring.factories index 09746d6..f780708 100644 --- a/dtmcli-spring/src/main/resources/META-INF/spring.factories +++ b/dtmcli-spring/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=configuration.DtmConfiguration \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=pub.dtm.client.configuration.DtmConfiguration \ No newline at end of file diff --git a/dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json b/dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json index 5625e72..a141efd 100644 --- a/dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json +++ b/dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json @@ -2,20 +2,20 @@ "groups": [ { "name": "dtm.service", - "type": "properties.DtmProperties", - "sourceType": "properties.DtmProperties" + "type": "pub.dtm.client.properties.DtmProperties", + "sourceType": "pub.dtm.client.properties.DtmProperties" } ], "properties": [ { "name": "dtm.service.name", "type": "java.lang.String", - "sourceType": "properties.DtmProperties" + "sourceType": "pub.dtm.client.properties.DtmProperties" }, { "name": "dtm.service.registry-type", "type": "java.lang.String", - "sourceType": "properties.DtmProperties" + "sourceType": "pub.dtm.client.properties.DtmProperties" } ], "hints": [] diff --git a/dtmcli-spring/target/classes/META-INF/spring.factories b/dtmcli-spring/target/classes/META-INF/spring.factories index 09746d6..f780708 100644 --- a/dtmcli-spring/target/classes/META-INF/spring.factories +++ b/dtmcli-spring/target/classes/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=configuration.DtmConfiguration \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=pub.dtm.client.configuration.DtmConfiguration \ No newline at end of file diff --git a/dtmcli-spring/target/maven-archiver/pom.properties b/dtmcli-spring/target/maven-archiver/pom.properties index cc6c559..79c9b9e 100644 --- a/dtmcli-spring/target/maven-archiver/pom.properties +++ b/dtmcli-spring/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Apr 26 15:55:29 CST 2022 +#Tue Apr 26 17:58:46 CST 2022 version=1.0.0 groupId=pub.dtm artifactId=dtmcli-spring diff --git a/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index b5d894c..e23c293 100644 --- a/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,6 +1,6 @@ -feign/URIParser.class META-INF/spring-configuration-metadata.json -properties/DtmProperties.class -client/DtmClient.class -feign/DtmFeignClient.class -configuration/DtmConfiguration.class +pub/dtm/client/feign/URIParser.class +pub/dtm/client/feign/DtmFeignClient.class +pub/dtm/client/configuration/DtmConfiguration.class +pub/dtm/client/DtmClient.class +pub/dtm/client/properties/DtmProperties.class diff --git a/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 4282d2a..25eb68e 100644 --- a/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,5 +1,5 @@ -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/feign/URIParser.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/client/DtmClient.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/configuration/DtmConfiguration.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/feign/DtmFeignClient.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/properties/DtmProperties.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java +/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java diff --git a/src/main/java/barrier/BarrierParam.java b/src/main/java/barrier/BarrierParam.java deleted file mode 100644 index 35c1de4..0000000 --- a/src/main/java/barrier/BarrierParam.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package barrier; - -import lombok.Data; - -/** - * dtm 服务端传过来的字段格式为下划线分隔，为了减少sdk对json包依赖也采用下划线格式 - * - * @author lixiaoshuang - */ -@Data -public class BarrierParam { - - /** - * 事务类型 - */ - private String trans_type[]; - - /** - * 全局事务id - */ - private String gid[]; - - /** - * 分支id - */ - private String branch_id[]; - - /** - * 操作 - */ - private String op[]; - -} diff --git a/src/main/java/barrier/BranchBarrier.java b/src/main/java/barrier/BranchBarrier.java deleted file mode 100644 index 7604306..0000000 --- a/src/main/java/barrier/BranchBarrier.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package barrier; - -import com.alibaba.fastjson.JSONObject; -import common.constant.ParamFieldConstant; -import common.model.DtmConsumer; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Map; -import java.util.Objects; - -/** - * @author lixiaoshuang - */ -@Data -@NoArgsConstructor -@Slf4j -public class BranchBarrier { - - /** - * 事务类型 - */ - private String transType; - - /** - * 全局事务id - */ - private String gid; - - /** - * 分支id - */ - private String branchId; - - /** - * 操作 - */ - private String op; - - /** - * 屏障id - */ - private int barrierId; - - - public BranchBarrier(Map parameterMap) throws Exception { - if (null == parameterMap) { - throw new Exception("BranchBarrier parameterMap null!"); - } - BarrierParam barrierParam = JSONObject.parseObject(JSONObject.toJSONString(parameterMap), BarrierParam.class); - if (barrierParam.getTrans_type().length > 0) { - this.transType = barrierParam.getTrans_type()[0]; - } - if (barrierParam.getGid().length > 0) { - this.gid = barrierParam.getGid()[0]; - } - if (barrierParam.getBranch_id().length > 0) { - this.branchId = barrierParam.getBranch_id()[0]; - } - if (barrierParam.getOp().length > 0) { - this.op = barrierParam.getOp()[0]; - } - } - - /** - * connection 由使用方自行管理，创建、回收。 - * - * @param connection - * @param consumer - * @return - * @throws SQLException - */ - public void call(Connection connection, DtmConsumer consumer) throws Exception { - this.barrierId++; - connection.setAutoCommit(false); - try { - boolean result = insertBarrier(connection); - if (result) { - consumer.accept(this); - connection.commit(); - } - } catch (Exception exception) { - log.warn("barrier call error", exception); - connection.rollback(); - throw exception; - } finally { - connection.setAutoCommit(true); - } - } - - private boolean insertBarrier(Connection connection) throws SQLException { - if (Objects.isNull(connection)) { - return false; - } - PreparedStatement preparedStatement = null; - try { - String sql = "insert ignore into barrier(trans_type, gid, branch_id, op, barrier_id, reason) values(?,?,?,?,?,?)"; - preparedStatement = connection.prepareStatement(sql); - preparedStatement.setString(1, transType); - preparedStatement.setString(2, gid); - preparedStatement.setString(3, branchId); - preparedStatement.setString(4, op); - preparedStatement.setString(5, String.format("%02d", barrierId)); - preparedStatement.setString(6, op); - - if (preparedStatement.executeUpdate() == 0) { - return false; - } - if (op.equals(ParamFieldConstant.CANCEL)) { - int opIndex = 4; - preparedStatement.setString(opIndex, ParamFieldConstant.TRY); - if (preparedStatement.executeUpdate() > 0) { - return false; - } - } - } finally { - if (Objects.nonNull(preparedStatement)) { - preparedStatement.close(); - } - } - return true; - } -} diff --git a/src/main/java/client/DtmClient.java b/src/main/java/client/DtmClient.java deleted file mode 100644 index a57e553..0000000 --- a/src/main/java/client/DtmClient.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package client; - - -import com.alibaba.fastjson.JSONObject; -import common.model.DtmConsumer; -import common.model.DtmServerInfo; -import common.utils.HttpUtil; -import okhttp3.Response; -import saga.Saga; -import tcc.Tcc; - -import java.util.Objects; - -/** - * @author lixiaoshuang - */ -public class DtmClient { - - private String ipPort; - - public DtmClient(String ipPort) { - this.ipPort = ipPort; - } - - /** - * 生成全局事务id - * - * @return - * @throws Exception - */ - public String genGid() throws Exception { - DtmServerInfo dtmServerInfo = new DtmServerInfo(ipPort); - JSONObject jsonObject = null; - try { - Response response = HttpUtil.get(dtmServerInfo.newGid()); - if (Objects.nonNull(response.body())) { - String result = response.body().string(); - jsonObject = JSONObject.parseObject(result); - } - } catch (Exception e) { - throw new Exception("Can’t get gid, please check the dtm server."); - } - if (Objects.isNull(jsonObject)) { - throw new Exception("Can’t get gid, please check the dtm server."); - } - Object code = jsonObject.get("code"); - if (null != code && (int) code > 0) { - Object message = jsonObject.get("message"); - throw new Exception(message.toString()); - } - return jsonObject.get("gid").toString(); - } - - /** - * tcc事务 - * - * @param gid - * @param function - * @return - * @throws Exception - */ - public void tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(ipPort, gid); - tcc.tccGlobalTransaction(function); - } - - /** - * create a new saga - * @param gid - */ - public Saga newSaga(String gid) { - return new Saga(ipPort, gid); - } -} diff --git a/src/main/java/common/constant/Constant.java b/src/main/java/common/constant/Constant.java deleted file mode 100644 index c90a7de..0000000 --- a/src/main/java/common/constant/Constant.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package common.constant; - -/** - * @author lixiaoshuang - */ -public class Constant { - - public static final int DEFAULT_INITIAL_CAPACITY = 16; - - public static final String SUCCESS_RESULT = "SUCCESS"; - - public static final String FAILURE_RESULT = "FAILURE"; - -} diff --git a/src/main/java/common/constant/ParamFieldConstant.java b/src/main/java/common/constant/ParamFieldConstant.java deleted file mode 100644 index 3da26d0..0000000 --- a/src/main/java/common/constant/ParamFieldConstant.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package common.constant; - -/** - * @author lixiaoshuang - */ -public class ParamFieldConstant { - - public static final String GID = "gid"; - - public static final String TRANS_TYPE = "trans_type"; - - public static final String BRANCH_ID = "branch_id"; - - public static final String STATUS = "status"; - - public static final String DATA = "data"; - - public static final String TRY = "try"; - - public static final String CONFIRM = "confirm"; - - public static final String CANCEL = "cancel"; - - public static final String OP = "op"; - - public static final String CODE = "code"; - - public static final String MESSAGE = "message"; - - public static final String DTM_RESULT = "dtm_result"; - - public static final String ACTION = "action"; - - public static final String COMPENSATE = "compensate"; - - public static final String STEPS = "steps"; - - public static final String PAYLOADS = "payloads"; - - public static final String CUSTOM_DATA = "custom_data"; - - public static final String WAIT_RESULT = "wait_result"; - - public static final String TIMEOUT_TO_FAIL = "timeout_to_fail"; - - public static final String RETRY_INTERVAL = "retry_interval"; - - public static final String PASSTHROGH_HEADERS = "passthrough_headers"; - - public static final String BRANCH_HEADERS = "branch_headers"; - -} diff --git a/src/main/java/common/enums/TransTypeEnum.java b/src/main/java/common/enums/TransTypeEnum.java deleted file mode 100644 index 7336c41..0000000 --- a/src/main/java/common/enums/TransTypeEnum.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package common.enums; - -public enum TransTypeEnum { - // 事务类型 - TCC("tcc"), SAGA("saga"); - - TransTypeEnum(String value) { - this.value = value; - } - - private String value; - - public String getValue() { - return this.value; - } - -} \ No newline at end of file diff --git a/src/main/java/common/model/DtmConsumer.java b/src/main/java/common/model/DtmConsumer.java deleted file mode 100644 index 2b5ffdb..0000000 --- a/src/main/java/common/model/DtmConsumer.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package common.model; - -/** - * @author lixiaoshuang - */ -@FunctionalInterface -public interface DtmConsumer { - - void accept(T t) throws Exception; -} diff --git a/src/main/java/common/model/DtmServerInfo.java b/src/main/java/common/model/DtmServerInfo.java deleted file mode 100644 index c2fc8b2..0000000 --- a/src/main/java/common/model/DtmServerInfo.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package common.model; - -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author lixiaoshuang - */ -@Data -@NoArgsConstructor -public class DtmServerInfo { - - /** - * ip+port - */ - private String ipPort; - - - public static final String PREFIX = "http://"; - - public static final String BASE = "/api/dtmsvr"; - - public static final String NEW_GID = BASE + "/newGid"; - - public static final String PREPARE = BASE + "/prepare"; - - public static final String SUBMIT = BASE + "/submit"; - - public static final String ABORT = BASE + "/abort"; - - public static final String REGISTER_TCC_BRANCH = BASE + "/registerTccBranch"; - - public DtmServerInfo(String ipPort) { - this.ipPort = ipPort; - } - - /** - * 生成gid url - * - * @return - */ - public String newGid() { - return PREFIX + ipPort + NEW_GID; - } - - /** - * 生成gid url - * - * @return - */ - public String prepare() { - return PREFIX + ipPort + PREPARE; - } - - /** - * submit 阶段 url - * - * @return - */ - public String submit() { - return PREFIX + ipPort + SUBMIT; - } - - /** - * abort 阶段 url - * - * @return - */ - public String abort() { - return PREFIX + ipPort + ABORT; - } - - /** - * 注册tcc 事务分支 - * - * @return - */ - public String registerTccBranch() { - return PREFIX + ipPort + REGISTER_TCC_BRANCH; - } - -} diff --git a/src/main/java/common/model/TransBase.java b/src/main/java/common/model/TransBase.java deleted file mode 100644 index 9d3ecdf..0000000 --- a/src/main/java/common/model/TransBase.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package common.model; - -import common.enums.TransTypeEnum; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -@Data -@NoArgsConstructor -public class TransBase { - - /** - * 全局事务id - */ - private String gid; - - /** - * 事务类型 - */ - private TransTypeEnum transTypeEnum; - - private boolean waitResult; - - private long timeoutToFail; - - private long retryInterval; - - private Map branchHeaders = new HashMap<>(); - - private ArrayList passthroughHeaders = new ArrayList<>(); - - private String customData; - - private ArrayList> steps = new ArrayList<>(); - - private ArrayList payloads = new ArrayList<>(); - - public TransBase(TransTypeEnum transTypeEnum, String gid, boolean waitResult) { - this.gid = gid; - this.transTypeEnum = transTypeEnum; - this.waitResult = waitResult; - } -} \ No newline at end of file diff --git a/src/main/java/common/model/TransResponse.java b/src/main/java/common/model/TransResponse.java deleted file mode 100644 index b9a6631..0000000 --- a/src/main/java/common/model/TransResponse.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package common.model; - -import lombok.Data; - -/** - * @author lixiaoshuang - */ -@Data -public class TransResponse { - - private String dtmResult; - - public TransResponse(String dtmResult) { - this.dtmResult = dtmResult; - } - - public static TransResponse buildTransResponse(String result) { - return new TransResponse(result); - } -} diff --git a/src/main/java/common/utils/BranchIdGeneratorUtil.java b/src/main/java/common/utils/BranchIdGeneratorUtil.java deleted file mode 100644 index a7fad79..0000000 --- a/src/main/java/common/utils/BranchIdGeneratorUtil.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package common.utils; - -import lombok.Data; - -/** - * @author lixiaoshuang - */ -@Data -public class BranchIdGeneratorUtil { - - private static final int MAX_BRANCH_ID = 99; - - private static final int LENGTH = 20; - - private String branchId; - - private int subBranchId; - - public BranchIdGeneratorUtil(String branchId) { - this.branchId = branchId; - } - - /** - * 生成注册分支id - * - * @return - * @throws Exception - */ - public String genBranchId() throws Exception { - if (this.subBranchId >= MAX_BRANCH_ID) { - throw new Exception("branch id is larger than 99"); - } - if (this.branchId.length() >= LENGTH) { - throw new Exception("total branch id is longer than 20"); - } - this.subBranchId++; - return this.branchId + String.format("%02d", this.subBranchId); - } -} \ No newline at end of file diff --git a/src/main/java/common/utils/HttpUtil.java b/src/main/java/common/utils/HttpUtil.java deleted file mode 100644 index b608199..0000000 --- a/src/main/java/common/utils/HttpUtil.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package common.utils; - -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; - -import java.io.IOException; -import java.util.concurrent.TimeUnit; - -/** - * @author lixiaoshuang - */ -public class HttpUtil { - - private static final OkHttpClient CLIENT = new OkHttpClient.Builder().connectTimeout(15, TimeUnit.SECONDS) - .readTimeout(5, TimeUnit.SECONDS).writeTimeout(5, TimeUnit.SECONDS).build(); - - public static final MediaType MEDIA_TYPE = MediaType.get("application/json; charset=utf-8"); - - /** - * get 请求 - * - * @param url - * @return - * @throws IOException - */ - public static Response get(String url) throws IOException { - Request request = new Request.Builder().url(url).get().build(); - return CLIENT.newCall(request).execute(); - } - - /** - * post 请求 - * - * @param url - * @param json - * @return - * @throws IOException - */ - public static Response post(String url, String json) throws IOException { - RequestBody body = RequestBody.create(MEDIA_TYPE, json); - Request request = new Request.Builder().url(url).post(body).build(); - return CLIENT.newCall(request).execute(); - } -} diff --git a/src/main/java/common/utils/StreamUtil.java b/src/main/java/common/utils/StreamUtil.java deleted file mode 100644 index 0d1af20..0000000 --- a/src/main/java/common/utils/StreamUtil.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package common.utils; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -/** - * @author lixiaoshuang - */ -public class StreamUtil { - - public static byte[] copyToByteArray(InputStream in) throws IOException { - if (in == null) { - return new byte[0]; - } else { - ByteArrayOutputStream out = new ByteArrayOutputStream(4096); - copy(in, out); - return out.toByteArray(); - } - } - - private static int copy(InputStream in, OutputStream out) throws IOException { - int byteCount = 0; - if (null == in) { - return byteCount; - } - if (null == out) { - return byteCount; - } - int bytesRead; - for (byte[] buffer = new byte[4096]; (bytesRead = in.read(buffer)) != -1; byteCount += bytesRead) { - out.write(buffer, 0, bytesRead); - } - out.flush(); - return byteCount; - } - -} diff --git a/src/main/java/exception/FailureException.java b/src/main/java/exception/FailureException.java deleted file mode 100644 index 768dc9d..0000000 --- a/src/main/java/exception/FailureException.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package exception; - -public class FailureException extends Exception { - - public FailureException(String message) { - super(message); - } -} diff --git a/src/main/java/saga/Saga.java b/src/main/java/saga/Saga.java deleted file mode 100644 index 9a24e57..0000000 --- a/src/main/java/saga/Saga.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package saga; - -import com.alibaba.fastjson.JSONObject; -import common.constant.Constant; -import common.constant.ParamFieldConstant; -import common.model.DtmServerInfo; -import common.utils.HttpUtil; -import common.enums.TransTypeEnum; -import common.model.TransBase; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -public class Saga { - - private static final String ORDERS = "orders"; - - private static final String CONCURRENT = "concurrent"; - - private TransBase transBase; - - private DtmServerInfo dtmServerInfo; - - private boolean concurrent; - - private Map> orders; - - public Saga(String ipPort, String gid) { - this.dtmServerInfo = new DtmServerInfo(ipPort); - this.transBase = new TransBase(TransTypeEnum.SAGA, gid, false); - this.concurrent = false; - this.orders = new HashMap<>(); - } - - public Saga add(String action, String compensate, Object postData) { - HashMap step = new HashMap<>(); - step.put(ParamFieldConstant.ACTION, action); - step.put(ParamFieldConstant.COMPENSATE, compensate); - transBase.getSteps().add(step); - transBase.getPayloads().add(JSONObject.toJSONString(postData)); - return this; - } - - public Saga addBranchOrder(Integer branch, ArrayList preBranches) { - orders.put(branch.toString(), preBranches); - return this; - } - - public Saga enableConcurrent() { - concurrent = true; - return this; - } - - public void submit() throws Exception { - addConcurrentContext(); - HashMap mapParam = new HashMap<>(Constant.DEFAULT_INITIAL_CAPACITY); - mapParam.put(ParamFieldConstant.GID, transBase.getGid()); - mapParam.put(ParamFieldConstant.TRANS_TYPE, TransTypeEnum.SAGA.getValue()); - mapParam.put(ParamFieldConstant.STEPS, transBase.getSteps()); - mapParam.put(ParamFieldConstant.PAYLOADS, transBase.getPayloads()); - mapParam.put(ParamFieldConstant.CUSTOM_DATA, transBase.getCustomData()); - mapParam.put(ParamFieldConstant.WAIT_RESULT, transBase.isWaitResult()); - mapParam.put(ParamFieldConstant.TIMEOUT_TO_FAIL, transBase.getTimeoutToFail()); - mapParam.put(ParamFieldConstant.RETRY_INTERVAL, transBase.getRetryInterval()); - mapParam.put(ParamFieldConstant.PASSTHROGH_HEADERS, transBase.getPassthroughHeaders()); - mapParam.put(ParamFieldConstant.BRANCH_HEADERS, transBase.getBranchHeaders()); - - HttpUtil.post(dtmServerInfo.submit(), JSONObject.toJSONString(mapParam)); - } - - public Saga enableWaitResult() { - transBase.setWaitResult(true); - return this; - } - - public Saga setTimeoutToFail(long timeoutToFail) { - transBase.setTimeoutToFail(timeoutToFail); - return this; - } - - public Saga setRetryInterval(long retryInterval) { - transBase.setRetryInterval(retryInterval); - return this; - } - - public Saga setBranchHeaders(Map headers) { - transBase.setBranchHeaders(headers); - return this; - } - - public Saga setPassthroughHeaders(ArrayList passthroughHeaders) { - transBase.setPassthroughHeaders(passthroughHeaders); - return this; - } - - private void addConcurrentContext() { - if (concurrent) { - HashMap data = new HashMap<>(); - data.put(ORDERS, orders); - data.put(CONCURRENT, true); - transBase.setCustomData(JSONObject.toJSONString(data)); - } - } -} diff --git a/src/main/java/tcc/Tcc.java b/src/main/java/tcc/Tcc.java deleted file mode 100644 index b0e3ca9..0000000 --- a/src/main/java/tcc/Tcc.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package tcc; - -import com.alibaba.fastjson.JSONObject; -import common.constant.Constant; -import common.model.DtmConsumer; -import common.model.DtmServerInfo; -import common.utils.HttpUtil; -import common.utils.BranchIdGeneratorUtil; -import common.constant.ParamFieldConstant; -import common.enums.TransTypeEnum; -import common.model.TransBase; -import exception.FailureException; -import okhttp3.Response; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashMap; - -/** - * @author lixiaoshuang - */ -public class Tcc { - - private static final String DEFAULT_STATUS = "prepared"; - - private static final String OP = "try"; - - private static final String FAIL_RESULT = "FAILURE"; - - Logger log = LoggerFactory.getLogger(Tcc.class); - - - /** - * 事务信息 - */ - private TransBase transBase; - - /** - * server 信息 - */ - private DtmServerInfo dtmServerInfo; - - /** - * id 生成器 - */ - private BranchIdGeneratorUtil branchIdGeneratorUtil; - - public Tcc(String ipPort, String gid) { - this.dtmServerInfo = new DtmServerInfo(ipPort); - this.branchIdGeneratorUtil = new BranchIdGeneratorUtil(""); - this.transBase = new TransBase(TransTypeEnum.TCC, gid, false); - } - - public void tccGlobalTransaction(DtmConsumer consumer) throws Exception { - HashMap paramMap = new HashMap<>(Constant.DEFAULT_INITIAL_CAPACITY); - paramMap.put(ParamFieldConstant.GID, transBase.getGid()); - paramMap.put(ParamFieldConstant.TRANS_TYPE, TransTypeEnum.TCC.getValue()); - - try { - Response response = HttpUtil.post(dtmServerInfo.prepare(), JSONObject.toJSONString(paramMap)); - this.checkResult(response); - } catch (FailureException failureException) { - log.info("tccGlobalTransaction fail message:{}" + failureException.getLocalizedMessage()); - throw failureException; - } - - try { - consumer.accept(this); - HttpUtil.post(dtmServerInfo.submit(), JSONObject.toJSONString(paramMap)); - } catch (Exception e) { - HttpUtil.post(dtmServerInfo.abort(), JSONObject.toJSONString(paramMap)); - throw e; - } - } - - public Response callBranch(Object body, String tryUrl, String confirmUrl, String cancelUrl) throws Exception { - String branchId = branchIdGeneratorUtil.genBranchId(); - HashMap registerParam = new HashMap<>(Constant.DEFAULT_INITIAL_CAPACITY); - registerParam.put(ParamFieldConstant.GID, transBase.getGid()); - registerParam.put(ParamFieldConstant.BRANCH_ID, branchId); - registerParam.put(ParamFieldConstant.TRANS_TYPE, TransTypeEnum.TCC.getValue()); - registerParam.put(ParamFieldConstant.STATUS, DEFAULT_STATUS); - registerParam.put(ParamFieldConstant.DATA, JSONObject.toJSONString(body)); - registerParam.put(ParamFieldConstant.TRY, tryUrl); - registerParam.put(ParamFieldConstant.CONFIRM, confirmUrl); - registerParam.put(ParamFieldConstant.CANCEL, cancelUrl); - - Response registerResponse = HttpUtil - .post(dtmServerInfo.registerTccBranch(), JSONObject.toJSONString(registerParam)); - this.checkResult(registerResponse); - - Response tryResponse = HttpUtil - .post(splicingTryUrl(tryUrl, transBase.getGid(), TransTypeEnum.TCC.getValue(), branchId, OP), - JSONObject.toJSONString(body)); - this.checkResult(tryResponse); - - return tryResponse; - } - - /** - * 和go 保持同样的发送方式 参数拼在url后边 - */ - private String splicingTryUrl(String tryUrl, String gid, String transType, String branchId, String op) { - return tryUrl + "?gid=" + gid + "&trans_type=" + transType + "&branch_id=" + branchId + "&op=" + op; - } - - - public void checkResult(Response response)throws Exception { - int errorCode = 400; - if (response.code() >= errorCode){ - throw new FailureException(response.message()); - } - String result = response.body().string(); - if (StringUtils.isBlank(result)) { - throw new FailureException("response is null"); - } - if (result.contains(FAIL_RESULT)){ - throw new FailureException("Service returned failed"); - } - } -} \ No newline at end of file diff --git a/src/main/java/xa/Xa.java b/src/main/java/xa/Xa.java deleted file mode 100644 index 3d394f9..0000000 --- a/src/main/java/xa/Xa.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package xa; - -public class Xa { - -} From c02dc1bc86abaa370eb3e43cd84884ca853f26fe Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Wed, 27 Apr 2022 13:23:55 +0800 Subject: [PATCH 03/24] change exception class name --- .../pub/dtm/client/exception/DtmException.java | 11 ----------- .../pub/dtm/client/exception/FailureException.java | 11 +++++++++++ .../main/java/pub/dtm/client/utils/FeignUtils.java | 14 +++++++------- .../main/java/pub/dtm/client/utils/HttpUtils.java | 8 ++++---- .../compile/default-compile/createdFiles.lst | 2 +- .../java/pub/dtm/client/barrier/BranchBarrier.java | 4 ++-- .../src/main/java/pub/dtm/client/tcc/Tcc.java | 10 +++++----- 7 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 dtmcli-common/src/main/java/pub/dtm/client/exception/DtmException.java create mode 100644 dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java diff --git a/dtmcli-common/src/main/java/pub/dtm/client/exception/DtmException.java b/dtmcli-common/src/main/java/pub/dtm/client/exception/DtmException.java deleted file mode 100644 index a5a4998..0000000 --- a/dtmcli-common/src/main/java/pub/dtm/client/exception/DtmException.java +++ /dev/null @@ -1,11 +0,0 @@ -package pub.dtm.client.exception; - -public class DtmException extends Exception { - public DtmException(String msg) { - super(msg); - } - - public DtmException(Throwable e) { - super(e); - } -} diff --git a/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java b/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java new file mode 100644 index 0000000..d09487f --- /dev/null +++ b/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java @@ -0,0 +1,11 @@ +package pub.dtm.client.exception; + +public class FailureException extends Exception { + public FailureException(String msg) { + super(msg); + } + + public FailureException(Throwable e) { + super(e); + } +} diff --git a/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java index e8294c4..348ec03 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java @@ -1,7 +1,7 @@ package pub.dtm.client.utils; import pub.dtm.client.constant.Constants; -import pub.dtm.client.exception.DtmException; +import pub.dtm.client.exception.FailureException; import feign.Response; import pub.dtm.client.interfaces.feign.IURIParser; import pub.dtm.client.model.feign.ServiceMessage; @@ -35,16 +35,16 @@ public static String generatorURI(ServiceMessage serviceMessage, boolean httpTyp return uriParser.generatorURI(serviceMessage, httpType); } - public static void checkResult(Response response) throws DtmException { + public static void checkResult(Response response) throws FailureException { if (response.status() >= Constants.RESP_ERR_CODE){ if (response.reason() != null) { - throw new DtmException(response.reason()); + throw new FailureException(response.reason()); } try { log.error("response code is {}, but unknown reason, response body is {}", response.status(), IOUtils.toString(response.body().asReader(StandardCharsets.UTF_8))); } finally { - throw new DtmException("response code is " + response.status()); + throw new FailureException("response code is " + response.status()); } } String result = ""; @@ -54,13 +54,13 @@ public static void checkResult(Response response) throws DtmException { result = IOUtils.toString(inputStream, StandardCharsets.UTF_8); } } catch (IOException e) { - throw new DtmException("response is null"); + throw new FailureException("response is null"); } if (StringUtils.isBlank(result)) { - throw new DtmException("response is null"); + throw new FailureException("response is null"); } if (result.contains(Constants.FAILURE_RESULT)){ - throw new DtmException("Service returned failed"); + throw new FailureException("Service returned failed"); } } } diff --git a/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java index 1b5bec7..2cde2eb 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java @@ -1,7 +1,7 @@ package pub.dtm.client.utils; import pub.dtm.client.constant.Constants; -import pub.dtm.client.exception.DtmException; +import pub.dtm.client.exception.FailureException; import okhttp3.MediaType; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -49,15 +49,15 @@ public static String splicingUrl(String ip, int port, String path) { public static void checkResult(Response response) throws Exception { if (response.code() >= Constants.RESP_ERR_CODE){ - throw new DtmException(response.message()); + throw new FailureException(response.message()); } ResponseBody body = response.body(); String result; if (body == null || StringUtils.isBlank(result = body.string())) { - throw new DtmException("response is null"); + throw new FailureException("response is null"); } if (result.contains(Constants.FAILURE_RESULT)){ - throw new DtmException("Service returned failed"); + throw new FailureException("Service returned failed"); } } } diff --git a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index cb90b51..69be70b 100644 --- a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -5,9 +5,9 @@ pub/dtm/client/utils/FeignUtils.class pub/dtm/client/model/param/OperatorParam.class pub/dtm/client/enums/TransTypeEnum.class pub/dtm/client/model/dtm/TransBase.class +pub/dtm/client/exception/FailureException.class pub/dtm/client/model/feign/ServiceMessage.class pub/dtm/client/interfaces/dtm/DtmConsumer.class pub/dtm/client/constant/Constants.class pub/dtm/client/interfaces/feign/IDtmFeignClient.class -pub/dtm/client/exception/DtmException.class pub/dtm/client/interfaces/feign/IURIParser.class diff --git a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java index a87093e..78913df 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java @@ -3,7 +3,7 @@ import com.google.gson.Gson; import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; -import pub.dtm.client.exception.DtmException; +import pub.dtm.client.exception.FailureException; import pub.dtm.client.interfaces.dtm.DtmConsumer; import lombok.Data; import lombok.NoArgsConstructor; @@ -31,7 +31,7 @@ public class BranchBarrier extends TransBase { public BranchBarrier(Map paramsMap) throws Exception { if (paramsMap == null || paramsMap.isEmpty()) { - throw new DtmException("build BranchBarrier error, paramsMap can not be empty."); + throw new FailureException("build BranchBarrier error, paramsMap can not be empty."); } Gson gson = new Gson(); BarrierParam barrierParam = gson.fromJson(gson.toJson(paramsMap), BarrierParam.class); diff --git a/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java index 4d3fe3d..860a185 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java @@ -5,7 +5,7 @@ import pub.dtm.client.constant.Constants; import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; -import pub.dtm.client.exception.DtmException; +import pub.dtm.client.exception.FailureException; import pub.dtm.client.interfaces.dtm.DtmConsumer; import pub.dtm.client.interfaces.feign.IDtmFeignClient; import pub.dtm.client.model.dtm.TransBase; @@ -53,7 +53,7 @@ public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { log.info("prepare response: {}", resp); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction prepare fail. returned dtm_result is: {}, transaction gid: {}", resp.getDtmResult(), this.getGid()); - throw new DtmException("TCC Transaction prepare fail"); + throw new FailureException("TCC Transaction prepare fail"); } try { consumer.accept(this); @@ -61,7 +61,7 @@ public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { } catch (Exception e) { log.error("TCC transaction submit fail, start abort it. transaction gid: {}", this.getGid()); feignClient.abort(operatorParam); - throw new DtmException(e); + throw new FailureException(e); } return this.getGid(); } @@ -77,7 +77,7 @@ public feign.Response callBranch(Object body, ServiceMessage tryMessage, Service DtmResponse resp = feignClient.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); - throw new DtmException("TCC Transaction register branch fail"); + throw new FailureException("TCC Transaction register branch fail"); } Map paramsMap = new HashMap<>(); @@ -103,7 +103,7 @@ public Response callBranch(Object body, String tryUrl, String confirmUrl, String DtmResponse resp = feignClient.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); - throw new DtmException("TCC Transaction register branch fail"); + throw new FailureException("TCC Transaction register branch fail"); } Map paramsMap = new HashMap<>(); From 80821ac864dcd7c59f7886017ea7b689f67aebdd Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Wed, 4 May 2022 20:38:07 +0800 Subject: [PATCH 04/24] the desc of update --- NewVersion.md | 17 +++++++++++++++++ pic_ref/newversion.png | Bin 0 -> 34833 bytes pic_ref/oldversion.png | Bin 0 -> 18873 bytes 3 files changed, 17 insertions(+) create mode 100644 NewVersion.md create mode 100644 pic_ref/newversion.png create mode 100644 pic_ref/oldversion.png diff --git a/NewVersion.md b/NewVersion.md new file mode 100644 index 0000000..883524d --- /dev/null +++ b/NewVersion.md @@ -0,0 +1,17 @@ +# new version +新版本相比于旧版本Java client的的改造 +## 旧版本客户端 +![avatar](pic_ref/oldversion.png) +### 旧版本在设计上可以改进的一些地方 +1.引入的类从引入路径看不出来自哪个jar包，比如exception.FailureException。在大型项目中可能会出现多个相同的类名，如果不明确包名可能会导致意义混乱，甚至引入冲突。 +2.tcc等类直接依赖了dtmsvr信息，这样的依赖方式对后期的维护不友好，如果修改了DtmServerInfo的属性，那么后期需要修改所有支持的方式。应该做一个客户端这样的东西专门用来发送请求。 +3.向dtmsvr传递参数时使用了map来传递，虽然这对用户是无感知的，但是客户在debug的时候使用map比较麻烦，感觉使用一个param对象比较好 +## 新版本客户端 +![avatar](pic_ref/newversion.png) +### 新版本中改进的地方 +1.由于新版本需要同时支持http和feign两种交互方式，因此将请求dtmsvr相关的部分以及整个client的公共部分抽取出来形成了dtmcli-common模块，这样后续如果需要支持更多的交互方式只需要改动dtmcli-common中的代码，并在core新增代码 +2.springcloud版本的client不在乎需要传入ipport这样的配置参数，一切通过feign+nacos/euraka集成起来处理。因此将java-client和spring-client分开处理了 +3.对于一些非springcloud的项目我们也提供了java-client来处理，java-client支持像以前那样直接配置endpoint的方式，同时为了适配frontend服务，也支持通过配置nacos服务中心地址这样的方式来动态查找dtmsvr具体的地址。 +4.优化了整个项目的包结构，让引入dtmcli-java的时候能够快速找到来自哪个包 + + diff --git a/pic_ref/newversion.png b/pic_ref/newversion.png new file mode 100644 index 0000000000000000000000000000000000000000..57828ec866e7f8244b6d3806066227892d2a352a GIT binary patch literal 34833 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 j%Z Date: Wed, 4 May 2022 20:43:27 +0800 Subject: [PATCH 05/24] remove target --- .../target/maven-archiver/pom.properties | 5 ----- .../compile/default-compile/createdFiles.lst | 13 ----------- .../compile/default-compile/inputFiles.lst | 13 ----------- .../default-testCompile/inputFiles.lst | 0 .../target/maven-archiver/pom.properties | 5 ----- .../compile/default-compile/createdFiles.lst | 4 ---- .../compile/default-compile/inputFiles.lst | 4 ---- .../default-testCompile/inputFiles.lst | 0 .../target/maven-archiver/pom.properties | 5 ----- .../compile/default-compile/createdFiles.lst | 5 ----- .../compile/default-compile/inputFiles.lst | 5 ----- .../default-testCompile/inputFiles.lst | 0 .../spring-configuration-metadata.json | 22 ------------------- .../target/classes/META-INF/spring.factories | 1 - .../target/maven-archiver/pom.properties | 5 ----- .../compile/default-compile/createdFiles.lst | 6 ----- .../compile/default-compile/inputFiles.lst | 5 ----- .../default-testCompile/inputFiles.lst | 0 18 files changed, 98 deletions(-) delete mode 100644 dtmcli-common/target/maven-archiver/pom.properties delete mode 100644 dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst delete mode 100644 dtmcli-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst delete mode 100644 dtmcli-core/target/maven-archiver/pom.properties delete mode 100644 dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst delete mode 100644 dtmcli-core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst delete mode 100644 dtmcli-java/target/maven-archiver/pom.properties delete mode 100644 dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst delete mode 100644 dtmcli-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst delete mode 100644 dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 dtmcli-spring/target/classes/META-INF/spring.factories delete mode 100644 dtmcli-spring/target/maven-archiver/pom.properties delete mode 100644 dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst delete mode 100644 dtmcli-spring/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst diff --git a/dtmcli-common/target/maven-archiver/pom.properties b/dtmcli-common/target/maven-archiver/pom.properties deleted file mode 100644 index a97deb0..0000000 --- a/dtmcli-common/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Tue Apr 26 17:58:45 CST 2022 -version=1.0.0 -groupId=pub.dtm -artifactId=dtmcli-common diff --git a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 69be70b..0000000 --- a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,13 +0,0 @@ -pub/dtm/client/model/responses/DtmResponse.class -pub/dtm/client/constant/ParamFieldConstants.class -pub/dtm/client/utils/HttpUtils.class -pub/dtm/client/utils/FeignUtils.class -pub/dtm/client/model/param/OperatorParam.class -pub/dtm/client/enums/TransTypeEnum.class -pub/dtm/client/model/dtm/TransBase.class -pub/dtm/client/exception/FailureException.class -pub/dtm/client/model/feign/ServiceMessage.class -pub/dtm/client/interfaces/dtm/DtmConsumer.class -pub/dtm/client/constant/Constants.class -pub/dtm/client/interfaces/feign/IDtmFeignClient.class -pub/dtm/client/interfaces/feign/IURIParser.class diff --git a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 8a337b3..0000000 --- a/dtmcli-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,13 +0,0 @@ -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/exception/DtmException.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java diff --git a/dtmcli-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/dtmcli-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/dtmcli-core/target/maven-archiver/pom.properties b/dtmcli-core/target/maven-archiver/pom.properties deleted file mode 100644 index 9a7e43f..0000000 --- a/dtmcli-core/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Tue Apr 26 17:58:45 CST 2022 -version=1.0.0 -groupId=pub.dtm -artifactId=dtmcli-core diff --git a/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index d26f489..0000000 --- a/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,4 +0,0 @@ -pub/dtm/client/tcc/Tcc.class -pub/dtm/client/barrier/BranchBarrier.class -pub/dtm/client/barrier/BarrierParam.class -pub/dtm/client/base/BranchIdGenerator.class diff --git a/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 85e740c..0000000 --- a/dtmcli-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,4 +0,0 @@ -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java diff --git a/dtmcli-core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/dtmcli-core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/dtmcli-java/target/maven-archiver/pom.properties b/dtmcli-java/target/maven-archiver/pom.properties deleted file mode 100644 index 7b70382..0000000 --- a/dtmcli-java/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Tue Apr 26 17:58:47 CST 2022 -version=1.0.0 -groupId=pub.dtm -artifactId=dtmcli-java diff --git a/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 2e58121..0000000 --- a/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,5 +0,0 @@ -pub/dtm/client/utils/NacosUtils.class -pub/dtm/client/feign/DtmFeignClient.class -pub/dtm/client/feign/URIParser.class -pub/dtm/client/DtmClient.class -pub/dtm/client/properties/DtmProperties.class diff --git a/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 6386389..0000000 --- a/dtmcli-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,5 +0,0 @@ -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java diff --git a/dtmcli-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/dtmcli-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json b/dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index a141efd..0000000 --- a/dtmcli-spring/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "groups": [ - { - "name": "dtm.service", - "type": "pub.dtm.client.properties.DtmProperties", - "sourceType": "pub.dtm.client.properties.DtmProperties" - } - ], - "properties": [ - { - "name": "dtm.service.name", - "type": "java.lang.String", - "sourceType": "pub.dtm.client.properties.DtmProperties" - }, - { - "name": "dtm.service.registry-type", - "type": "java.lang.String", - "sourceType": "pub.dtm.client.properties.DtmProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/dtmcli-spring/target/classes/META-INF/spring.factories b/dtmcli-spring/target/classes/META-INF/spring.factories deleted file mode 100644 index f780708..0000000 --- a/dtmcli-spring/target/classes/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=pub.dtm.client.configuration.DtmConfiguration \ No newline at end of file diff --git a/dtmcli-spring/target/maven-archiver/pom.properties b/dtmcli-spring/target/maven-archiver/pom.properties deleted file mode 100644 index 79c9b9e..0000000 --- a/dtmcli-spring/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Tue Apr 26 17:58:46 CST 2022 -version=1.0.0 -groupId=pub.dtm -artifactId=dtmcli-spring diff --git a/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index e23c293..0000000 --- a/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,6 +0,0 @@ -META-INF/spring-configuration-metadata.json -pub/dtm/client/feign/URIParser.class -pub/dtm/client/feign/DtmFeignClient.class -pub/dtm/client/configuration/DtmConfiguration.class -pub/dtm/client/DtmClient.class -pub/dtm/client/properties/DtmProperties.class diff --git a/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 25eb68e..0000000 --- a/dtmcli-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,5 +0,0 @@ -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java -/Users/horse/ideaProjects/dtmcli-java-parent/dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java diff --git a/dtmcli-spring/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/dtmcli-spring/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 From fe3405d59fc60a72505dbb04ae71a46f7688bf9d Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Wed, 4 May 2022 20:44:36 +0800 Subject: [PATCH 06/24] remove target --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e7ad09b..d4dd614 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,4 @@ hs_err_pid* .idea *.iml -/target \ No newline at end of file +/*/target/ \ No newline at end of file From 46aac732af3a037ca27bd0e6fc8b97bbf174ad73 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Sun, 8 May 2022 21:01:33 +0800 Subject: [PATCH 07/24] support saga & code fix --- LICENSE | 2 +- dtmcli-common/pom.xml | 6 +- .../pub/dtm/client/constant/Constants.java | 29 +++ .../client/constant/ParamFieldConstants.java | 49 +++++ .../pub/dtm/client/enums/TransTypeEnum.java | 62 +++++- .../client/exception/FailureException.java | 29 +++ .../client/interfaces/dtm/DtmConsumer.java | 30 +++ .../interfaces/feign/IDtmFeignClient.java | 40 ++++ .../client/interfaces/feign/IURIParser.java | 36 ++++ .../pub/dtm/client/log/DtmFeignLogger.java | 63 ++++++ .../pub/dtm/client/model/dtm/TransBase.java | 34 +++- .../client/model/feign/ServiceMessage.java | 74 ++++--- .../dtm/client/model/param/OperatorParam.java | 82 ++++---- .../client/model/param/SagaOperatorParam.java | 82 ++++++++ .../client/model/param/TccOperatorParam.java | 81 ++++++++ .../client/model/responses/DtmResponse.java | 38 +++- .../java/pub/dtm/client/utils/FeignUtils.java | 53 ++++++ .../java/pub/dtm/client/utils/HttpUtils.java | 60 ++++++ .../java/pub/dtm/client/utils/JsonUtils.java | 51 +++++ .../pub/dtm/client/barrier/BarrierParam.java | 37 +++- .../pub/dtm/client/barrier/BranchBarrier.java | 51 ++++- .../dtm/client/base/BranchIdGenerator.java | 41 +++- .../main/java/pub/dtm/client/saga/Saga.java | 180 ++++++++++++++++++ .../src/main/java/pub/dtm/client/tcc/Tcc.java | 91 +++++++-- dtmcli-java/pom.xml | 7 +- .../main/java/pub/dtm/client/DtmClient.java | 76 +++++++- .../pub/dtm/client/feign/DtmFeignClient.java | 30 ++- .../java/pub/dtm/client/feign/URIParser.java | 28 ++- .../dtm/client/properties/DtmProperties.java | 24 +++ .../java/pub/dtm/client/utils/NacosUtils.java | 24 +++ .../main/java/pub/dtm/client/DtmClient.java | 51 +++++ .../configuration/DtmConfiguration.java | 40 ++++ .../pub/dtm/client/feign/DtmFeignClient.java | 24 +++ .../java/pub/dtm/client/feign/URIParser.java | 24 +++ .../dtm/client/properties/DtmProperties.java | 24 +++ pom.xml | 13 +- 36 files changed, 1535 insertions(+), 131 deletions(-) create mode 100644 dtmcli-common/src/main/java/pub/dtm/client/log/DtmFeignLogger.java create mode 100644 dtmcli-common/src/main/java/pub/dtm/client/model/param/SagaOperatorParam.java create mode 100644 dtmcli-common/src/main/java/pub/dtm/client/model/param/TccOperatorParam.java create mode 100644 dtmcli-common/src/main/java/pub/dtm/client/utils/JsonUtils.java create mode 100644 dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java diff --git a/LICENSE b/LICENSE index d9b58da..5dabd2b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 yedf +Copyright (c) 2022 yedf Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/pom.xml b/dtmcli-common/pom.xml index 17984f8..7d8cf22 100644 --- a/dtmcli-common/pom.xml +++ b/dtmcli-common/pom.xml @@ -21,14 +21,10 @@ - - com.google.code.gson - gson - com.fasterxml.jackson.core - jackson-annotations + jackson-databind diff --git a/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java b/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java index 84e71bb..1beb3f5 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java @@ -1,5 +1,34 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.constant; +/** + * Constants + * + * @author horseLk + */ public class Constants { public static final String MICRO_SERVICE_NAME_KEY = "dtm.service.name"; diff --git a/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java b/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java index 0b0c747..eea3fb4 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java @@ -1,5 +1,34 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.constant; +/** + * Constants for dtm server parameter key + * + * @author horseLk + */ public class ParamFieldConstants { public static final String GID = "gid"; @@ -24,4 +53,24 @@ public class ParamFieldConstants { public static final String MESSAGE = "message"; public static final String DTM_RESULT = "dtm_result"; + + public static final String ACTION = "action"; + + public static final String COMPENSATE = "compensate"; + + public static final String STEPS = "steps"; + + public static final String PAYLOADS = "payloads"; + + public static final String CUSTOM_DATA = "custom_data"; + + public static final String WAIT_RESULT = "wait_result"; + + public static final String TIMEOUT_TO_FAIL = "timeout_to_fail"; + + public static final String RETRY_INTERVAL = "retry_interval"; + + public static final String PASSTHROGH_HEADERS = "passthrough_headers"; + + public static final String BRANCH_HEADERS = "branch_headers"; } diff --git a/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java b/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java index 0f06343..c136495 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java @@ -1,9 +1,53 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.enums; +import java.util.HashMap; +import java.util.Map; + +/** + * Transtype enum + * + * @author horseLk + */ public enum TransTypeEnum { + /** + * tcc + */ TCC("tcc"), + /** + * xa + */ XA("xa"), + /** + * msg + */ MSG("msg"), + /** + * saga + */ SAGA("saga") ; @@ -11,19 +55,23 @@ public enum TransTypeEnum { this.value = value; } - private String value; + /** + * Trans type string + */ + private final String value; - @Override - public String toString() { + public String getValue() { return this.value; } + private static Map exist = new HashMap<>(); + public static TransTypeEnum parseString(String value) { - for (TransTypeEnum transType : TransTypeEnum.values()) { - if (transType.value.equals(value)) { - return transType; + if (exist.isEmpty()) { + for (TransTypeEnum transType : TransTypeEnum.values()) { + exist.put(transType.value, transType); } } - return null; + return exist.get(value); } } diff --git a/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java b/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java index d09487f..de02747 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java @@ -1,5 +1,34 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.exception; +/** + * dtm common exception + * + * @author horseLk + */ public class FailureException extends Exception { public FailureException(String msg) { super(msg); diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java index 8f3cda1..35dd954 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java @@ -1,7 +1,37 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.interfaces.dtm; import pub.dtm.client.model.dtm.TransBase; +/** + * Functional Interface for Transtype to process busi request + * + * @param + * @author horseLk + */ @FunctionalInterface public interface DtmConsumer { void accept(T t) throws Exception; diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java index b2d8122..f3fde98 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java @@ -7,20 +7,60 @@ import java.net.URI; import java.util.Map; +/** + * A feign client interface for dtm svr, we designed different implements for different client. + * + * @author horseLk + */ public interface IDtmFeignClient { + /** + * get a new gid + */ DtmResponse newGid(); + /** + * test connection + */ DtmResponse ping(); + /** + * prepare + * @param body prepare body + */ DtmResponse prepare(OperatorParam body); + /** + * submit + * @param body submit bosy + */ DtmResponse submit(OperatorParam body); + /** + * abort + * @param body abort body + */ DtmResponse abort(OperatorParam body); + /** + * registerBranch + * @param body registerBranch body + */ DtmResponse registerBranch(OperatorParam body); + /** + * use feign send busi get request + * @param host busi host + * @param path busi path + * @param queryMap querymao + */ Response busiGet(URI host, String path, Map queryMap); + /** + * use feign send busi post request + * @param host busi host + * @param path busi path + * @param queryMap query map + * @param body request body + */ Response busiPost(URI host, String path, Map queryMap, Object body); } diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java index c742355..2c1c162 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java @@ -1,7 +1,43 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.interfaces.feign; import pub.dtm.client.model.feign.ServiceMessage; +/** + * URI Parser interface + * + * @author horseLk + */ public interface IURIParser { + /** + * according to serviceMessage and connection driver generate uri + * @param serviceMessage service message + * @param httpType true means http, false means microservice + * @return uri + * @throws Exception exception + */ String generatorURI(ServiceMessage serviceMessage, boolean httpType) throws Exception; } diff --git a/dtmcli-common/src/main/java/pub/dtm/client/log/DtmFeignLogger.java b/dtmcli-common/src/main/java/pub/dtm/client/log/DtmFeignLogger.java new file mode 100644 index 0000000..fb1a27b --- /dev/null +++ b/dtmcli-common/src/main/java/pub/dtm/client/log/DtmFeignLogger.java @@ -0,0 +1,63 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package pub.dtm.client.log; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Custom feign logger for print detail feign log + * + * @author horseLk + */ +public class DtmFeignLogger extends feign.Logger { + private final Logger logger; + + public DtmFeignLogger() { + this(feign.Logger.class); + } + + public DtmFeignLogger(Class clazz) { + this(LoggerFactory.getLogger(clazz)); + } + + public DtmFeignLogger(String name) { + this(LoggerFactory.getLogger(name)); + } + + DtmFeignLogger(Logger logger) { + this.logger = logger; + } + + @Override + protected void log(String configKey, String format, Object... args) { + // Not using SLF4J's support for parameterized messages (even though it + // would be more efficient) because it would + // require the incoming message formats to be SLF4J-specific. + if (logger.isInfoEnabled()) { + logger.info(String.format(methodTag(configKey) + format, args)); + } + } +} diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java b/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java index 0fd84f2..9a3070a 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java @@ -1,3 +1,27 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.model.dtm; import pub.dtm.client.enums.TransTypeEnum; @@ -5,6 +29,11 @@ import lombok.Data; import lombok.NoArgsConstructor; +/** + * base Class for different Trans type + * + * @author horseLk + */ @Data @NoArgsConstructor @AllArgsConstructor @@ -15,9 +44,12 @@ public class TransBase { private String gid; /** - * 事务类型 + * trans type */ private TransTypeEnum transTypeEnum; + /** + * is wait for result + */ private boolean waitResult; } diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java b/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java index ed5c685..34a824c 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java @@ -1,18 +1,62 @@ -package pub.dtm.client.model.feign; +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package pub.dtm.client.model.feign; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; +/** + * Service message for micro service + * + * @author horseLk + */ +@Data +@NoArgsConstructor public class ServiceMessage { + /** + * service name + */ private String serviceName; + /** + * group name + */ private String groupName = "DEFAULT_GROUP"; + /** + * clusters + */ private List cluster = new ArrayList<>(); + /** + * request path + */ private String path; public ServiceMessage(String serviceName, String path){ @@ -27,30 +71,6 @@ public ServiceMessage(String serviceName, String groupName, List cluster this.path = path; } - public String getServiceName() { - return serviceName; - } - - public void setServiceName(String serviceName) { - this.serviceName = serviceName; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public List getCluster() { - return cluster; - } - - public void setCluster(List cluster) { - this.cluster = cluster; - } - public String getPath() { if (StringUtils.startsWith(path, "/")) { return path; @@ -58,10 +78,6 @@ public String getPath() { return "/" + path; } - public void setPath(String path) { - this.path = path; - } - @Override public String toString() { String _path = path; diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java b/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java index d6e0834..f523278 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java @@ -1,58 +1,72 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.model.param; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.gson.annotations.SerializedName; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +/** + * Request Param for dtm svr + * + * @author horseLk + */ @Data @NoArgsConstructor @AllArgsConstructor +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "subType") +@JsonSubTypes({ + @JsonSubTypes.Type(value = TccOperatorParam.class, name = "tcc"), + @JsonSubTypes.Type(value = SagaOperatorParam.class, name = "saga") +}) public class OperatorParam { - @SerializedName(ParamFieldConstants.GID) + /** + * gid + */ @JsonProperty(ParamFieldConstants.GID) private String gid; - @SerializedName(ParamFieldConstants.TRANS_TYPE) + /** + * trans type string value + */ @JsonProperty(ParamFieldConstants.TRANS_TYPE) private String transType; - @SerializedName(ParamFieldConstants.BRANCH_ID) - @JsonProperty(ParamFieldConstants.BRANCH_ID) - private String branchId; - - @SerializedName(ParamFieldConstants.STATUS) - @JsonProperty(ParamFieldConstants.STATUS) - private String status; - - @SerializedName(ParamFieldConstants.DATA) - @JsonProperty(ParamFieldConstants.DATA) - private String data; - - @SerializedName(ParamFieldConstants.CONFIRM) - @JsonProperty(ParamFieldConstants.CONFIRM) - private String confirm; - - @SerializedName(ParamFieldConstants.CANCEL) - @JsonProperty(ParamFieldConstants.CANCEL) - private String cancel; - - public OperatorParam(String gid, TransTypeEnum transType, String branchId, - String status, String data, String confirmUrl, String cancelUrl) { - this.gid = gid; - this.transType = transType.toString(); - this.branchId = branchId; - this.status = status; - this.data = data; - this.confirm = confirmUrl; - this.cancel = cancelUrl; - } + /** + * this attribute just for mark different sub class for encode/decode. + */ + @JsonProperty("subType") + private String subType; public OperatorParam(String gid, TransTypeEnum transType) { this.gid = gid; - this.transType = transType.toString(); + this.transType = transType.getValue(); } } diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/param/SagaOperatorParam.java b/dtmcli-common/src/main/java/pub/dtm/client/model/param/SagaOperatorParam.java new file mode 100644 index 0000000..6a25dad --- /dev/null +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/param/SagaOperatorParam.java @@ -0,0 +1,82 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package pub.dtm.client.model.param; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import pub.dtm.client.constant.ParamFieldConstants; +import pub.dtm.client.enums.TransTypeEnum; + +import java.util.List; +import java.util.Map; + +/** + * Saga Operator Param + * + * @author horseLk + */ +@Data +@NoArgsConstructor +public class SagaOperatorParam extends OperatorParam { + @JsonProperty(ParamFieldConstants.STEPS) + private List> steps; + + @JsonProperty(ParamFieldConstants.PAYLOADS) + private List payloads; + + @JsonProperty(ParamFieldConstants.CUSTOM_DATA) + private String customData; + + @JsonProperty(ParamFieldConstants.WAIT_RESULT) + private boolean waitResult; + + @JsonProperty(ParamFieldConstants.TIMEOUT_TO_FAIL) + private long timeoutToFail; + + @JsonProperty(ParamFieldConstants.RETRY_INTERVAL) + private long retryInterval; + + @JsonProperty(ParamFieldConstants.PASSTHROGH_HEADERS) + private List passthroughHeaders; + + @JsonProperty(ParamFieldConstants.BRANCH_HEADERS) + private Map branchHeaders; + + public SagaOperatorParam(String gid, TransTypeEnum transType, List> steps, + List payloads, String customData, boolean waitResult, long timeoutToFail, + long retryInterval, List passthroughHeaders, Map branchHeaders) { + super(gid, transType); + setSubType(transType.getValue()); + this.steps = steps; + this.payloads = payloads; + this.customData = customData; + this.waitResult = waitResult; + this.timeoutToFail = timeoutToFail; + this.retryInterval = retryInterval; + this.passthroughHeaders = passthroughHeaders; + this.branchHeaders = branchHeaders; + } +} diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/param/TccOperatorParam.java b/dtmcli-common/src/main/java/pub/dtm/client/model/param/TccOperatorParam.java new file mode 100644 index 0000000..1bb4175 --- /dev/null +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/param/TccOperatorParam.java @@ -0,0 +1,81 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package pub.dtm.client.model.param; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import pub.dtm.client.constant.ParamFieldConstants; +import pub.dtm.client.enums.TransTypeEnum; + +/** + * Tcc Operator Param + * @author horseLk + */ +@Data +@NoArgsConstructor +public class TccOperatorParam extends OperatorParam { + /** + * branch id + */ + @JsonProperty(ParamFieldConstants.BRANCH_ID) + private String branchId; + + /** + * status + */ + @JsonProperty(ParamFieldConstants.STATUS) + private String status; + + /** + * data + */ + @JsonProperty(ParamFieldConstants.DATA) + private String data; + + /** + * branch confirm uri + */ + @JsonProperty(ParamFieldConstants.CONFIRM) + private String confirm; + + /** + * branch cancel uri + */ + @JsonProperty(ParamFieldConstants.CANCEL) + private String cancel; + + + public TccOperatorParam(String gid, TransTypeEnum transTypeEnum, String branchId, String status, String data, + String confirm, String cancel) { + super(gid, transTypeEnum); + setSubType(transTypeEnum.getValue()); + this.branchId = branchId; + this.status = status; + this.data = data; + this.confirm = confirm; + this.cancel = cancel; + } +} diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java b/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java index 8d2c659..8ad9a68 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java @@ -1,20 +1,52 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.model.responses; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +/** + * Response from dtm svr + * + * @author horseLk + */ @Data @AllArgsConstructor @NoArgsConstructor public class DtmResponse { - @SerializedName("dtm_result") + /** + * dtm_result + */ @JsonProperty("dtm_result") private String dtmResult; - @SerializedName("gid") + /** + * gid + */ @JsonProperty("gid") private String gid; diff --git a/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java index 348ec03..4f9d38e 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java @@ -1,3 +1,27 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.utils; import pub.dtm.client.constant.Constants; @@ -15,15 +39,32 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; +/** + * Feign Utils + * + * @author horseLk + */ public class FeignUtils { + /** + * log + */ private static final Logger log = LoggerFactory.getLogger(FeignUtils.class); + /** + * URIParser + */ private static IURIParser uriParser; public static void setUriParser(IURIParser uriParser) { FeignUtils.uriParser = uriParser; } + /** + * Get gid from DtmResponse + * @param base dtmResponse + * @return gid + * @throws Exception exception + */ public static String parseGid(DtmResponse base) throws Exception { if (base == null || !Constants.SUCCESS_RESULT.equals(base.getDtmResult())) { throw new Exception("get new gid from dtm server fail."); @@ -31,10 +72,22 @@ public static String parseGid(DtmResponse base) throws Exception { return base.getGid(); } + /** + * generate uri + * @param serviceMessage service message + * @param httpType true means http, false means micro service + * @return uri + * @throws Exception exception + */ public static String generatorURI(ServiceMessage serviceMessage, boolean httpType) throws Exception { return uriParser.generatorURI(serviceMessage, httpType); } + /** + * check response + * @param response feign response + * @throws FailureException exception + */ public static void checkResult(Response response) throws FailureException { if (response.status() >= Constants.RESP_ERR_CODE){ if (response.reason() != null) { diff --git a/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java index 2cde2eb..f04d24e 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java @@ -1,3 +1,27 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.utils; import pub.dtm.client.constant.Constants; @@ -14,23 +38,47 @@ import java.util.Map; import java.util.concurrent.TimeUnit; +/** + * Http utils + * + * @author horseLk + */ public class HttpUtils { private static final OkHttpClient CLIENT = new OkHttpClient.Builder().connectTimeout(15, TimeUnit.SECONDS) .readTimeout(5, TimeUnit.SECONDS).writeTimeout(5, TimeUnit.SECONDS).build(); public static final MediaType MEDIA_TYPE = MediaType.get("application/json; charset=utf-8"); + /** + * send get request + * @param url url + * @return http response + * @throws IOException exception + */ public static Response get(String url) throws IOException { Request request = new Request.Builder().url(url).get().build(); return CLIENT.newCall(request).execute(); } + /** + * send post request + * @param url url + * @param json body json + * @return http response + * @throws IOException exception + */ public static Response post(String url, String json) throws IOException { RequestBody body = RequestBody.create(MEDIA_TYPE, json); Request request = new Request.Builder().url(url).post(body).build(); return CLIENT.newCall(request).execute(); } + /** + * splice url with query map + * @param url main url + * @param params query map + * @return string + */ public static String splicingUrl(String url, Map params) { if (params == null || params.isEmpty()) { return url; @@ -43,10 +91,22 @@ public static String splicingUrl(String url, Map params) { } + /** + * splice url without query map + * @param ip ip + * @param port port + * @param path path + * @return string + */ public static String splicingUrl(String ip, int port, String path) { return Constants.HTTP_PREFIX + ip + ":" + String.valueOf(port) + path; } + /** + * check response + * @param response http response + * @throws Exception exception + */ public static void checkResult(Response response) throws Exception { if (response.code() >= Constants.RESP_ERR_CODE){ throw new FailureException(response.message()); diff --git a/dtmcli-common/src/main/java/pub/dtm/client/utils/JsonUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/JsonUtils.java new file mode 100644 index 0000000..ca381c2 --- /dev/null +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/JsonUtils.java @@ -0,0 +1,51 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package pub.dtm.client.utils; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.io.IOException; + +/** + * Json Utils + * + * @author horseLk + */ +public class JsonUtils { + private static final ObjectMapper objectMapper = new ObjectMapper(); + + public static T parseJson(String json, Class clzz) throws JsonProcessingException { + return objectMapper.readValue(json, clzz); + } + + public static T parseJson(byte[] bytes, Class clzz) throws IOException { + return objectMapper.readValue(bytes, clzz); + } + + public static String toJson(Object object) throws JsonProcessingException { + return objectMapper.writeValueAsString(object); + } +} diff --git a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java index a8f9e54..e2d65c8 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java @@ -1,30 +1,59 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.barrier; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +/** + * Branch barrier parameter + * + * @author horseLk + */ @Data @NoArgsConstructor @AllArgsConstructor public class BarrierParam { /** - * 事务类型 + * trans type */ private String trans_type[]; /** - * 全局事务id + * gid */ private String gid[]; /** - * 分支id + * branch id */ private String branch_id[]; /** - * 操作 + * operator */ private String op[]; } diff --git a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java index 78913df..ac976b8 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java @@ -1,6 +1,29 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.barrier; -import com.google.gson.Gson; import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; import pub.dtm.client.exception.FailureException; @@ -11,6 +34,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pub.dtm.client.utils.JsonUtils; import java.sql.Connection; import java.sql.PreparedStatement; @@ -18,23 +42,36 @@ import java.util.Map; import java.util.Objects; +/** + * Branch barrier service + * + * @author horseLk + */ @Data @NoArgsConstructor public class BranchBarrier extends TransBase { private static final Logger log = LoggerFactory.getLogger(BranchBarrier.class); + /** + * branch id + */ private String branchId; + /** + * operator + */ private String op; + /** + * barrier id + */ private int barrierId; public BranchBarrier(Map paramsMap) throws Exception { if (paramsMap == null || paramsMap.isEmpty()) { throw new FailureException("build BranchBarrier error, paramsMap can not be empty."); } - Gson gson = new Gson(); - BarrierParam barrierParam = gson.fromJson(gson.toJson(paramsMap), BarrierParam.class); + BarrierParam barrierParam = JsonUtils.parseJson(JsonUtils.toJson(paramsMap), BarrierParam.class); if (ArrayUtils.isNotEmpty(barrierParam.getTrans_type())) { this.setTransTypeEnum(TransTypeEnum.parseString(barrierParam.getTrans_type()[0])); } @@ -49,6 +86,12 @@ public BranchBarrier(Map paramsMap) throws Exception { } } + /** + * Busi can call method call() to open branch barrier + * @param connection data source connection + * @param consumer consumer + * @throws Exception exception + */ public void call(Connection connection, DtmConsumer consumer) throws Exception { ++this.barrierId; connection.setAutoCommit(false); @@ -76,7 +119,7 @@ private boolean insertBarrier(Connection connection) throws SQLException { try { String sql = "insert ignore into barrier(trans_type, gid, branch_id, op, barrier_id, reason) values(?,?,?,?,?,?)"; preparedStatement = connection.prepareStatement(sql); - preparedStatement.setString(1, this.getTransTypeEnum().toString()); + preparedStatement.setString(1, this.getTransTypeEnum().getValue()); preparedStatement.setString(2, this.getGid()); preparedStatement.setString(3, branchId); preparedStatement.setString(4, op); diff --git a/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java b/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java index dd6d599..c76fee2 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java @@ -1,12 +1,47 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.base; +/** + * BranchIdGenerator for generate branch id + * + * @author horseLk + */ public class BranchIdGenerator { private static final int MAX_BRANCH_ID = 99; private static final int LENGTH = 20; + /** + * branch id prefix + */ private final String branchId; + /** + * last branch id + */ private int subBranchId; public BranchIdGenerator(String branchId) { @@ -14,10 +49,10 @@ public BranchIdGenerator(String branchId) { } /** - * 生成注册分支id + * generate branch id * - * @return - * @throws Exception + * @return branch id + * @throws Exception exception */ public String genBranchId() throws Exception { if (this.subBranchId >= MAX_BRANCH_ID) { diff --git a/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java b/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java new file mode 100644 index 0000000..d99e8b3 --- /dev/null +++ b/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java @@ -0,0 +1,180 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package pub.dtm.client.saga; + +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import pub.dtm.client.constant.ParamFieldConstants; +import pub.dtm.client.enums.TransTypeEnum; +import pub.dtm.client.exception.FailureException; +import pub.dtm.client.interfaces.feign.IDtmFeignClient; +import pub.dtm.client.model.dtm.TransBase; +import pub.dtm.client.model.feign.ServiceMessage; +import pub.dtm.client.model.param.SagaOperatorParam; +import pub.dtm.client.utils.FeignUtils; +import pub.dtm.client.utils.JsonUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Saga trans type service + * + * @author horseLk + */ +@Data +@NoArgsConstructor +public class Saga extends TransBase { + private static final Logger log = LoggerFactory.getLogger(Saga.class); + + private static final String ORDERS = "orders"; + + private static final String CONCURRENT = "concurrent"; + + private IDtmFeignClient feignClient; + + private boolean concurrent; + + private Map> orders; + + private long timeoutToFail; + + private long retryInterval; + + private Map branchHeaders = new HashMap<>(); + + private List passthroughHeaders = new ArrayList<>(); + + private String customData; + + private List> steps = new ArrayList<>(); + + private List payloads = new ArrayList<>(); + + public Saga(String gid, IDtmFeignClient feignClient) { + super(gid, TransTypeEnum.SAGA, false); + this.concurrent = false; + this.orders = new HashMap<>(); + this.feignClient = feignClient; + } + + public Saga add(ServiceMessage action, ServiceMessage compensate, Object postData) { + Map step = new HashMap<>(); + try { + step.put(ParamFieldConstants.ACTION, FeignUtils.generatorURI(action, false)); + step.put(ParamFieldConstants.COMPENSATE, FeignUtils.generatorURI(compensate, false)); + this.payloads.add(JsonUtils.toJson(postData)); + } catch (Exception e) { + log.error("saga add branch error."); + } + this.steps.add(step); + + return this; + } + + public Saga add(String action, String compensate, Object postData) { + Map step = new HashMap<>(); + step.put(ParamFieldConstants.ACTION, action); + step.put(ParamFieldConstants.COMPENSATE, compensate); + this.steps.add(step); + try { + this.payloads.add(JsonUtils.toJson(postData)); + } catch (Exception e) { + log.error("encode json error."); + } + return this; + } + + public String submit() throws Exception { + if (StringUtils.isEmpty(this.getGid())) { + this.setGid(FeignUtils.parseGid(feignClient.newGid())); + } + addConcurrentContext(); + SagaOperatorParam operatorParam = new SagaOperatorParam(this.getGid(), TransTypeEnum.SAGA, this.getSteps(), + this.getPayloads(), this.getCustomData(), this.isWaitResult(), this.getTimeoutToFail(), + this.getRetryInterval(), this.getPassthroughHeaders(), this.getBranchHeaders()); + + try { + feignClient.submit(operatorParam); + } catch (Exception e) { + log.error("saga transaction submit failed, transaction gid is {}", this.getGid()); + throw new FailureException(e); + } + return this.getGid(); + } + + public Saga addBranchOrder(Integer branch, List preBranches) { + orders.put(branch.toString(), preBranches); + return this; + } + + public Saga enableConcurrent() { + concurrent = true; + return this; + } + + public Saga enableWaitResult() { + this.setWaitResult(true); + return this; + } + + public Saga setTimeoutToFail(long timeoutToFail) { + this.setTimeoutToFail(timeoutToFail); + return this; + } + + public Saga setRetryInterval(long retryInterval) { + this.setRetryInterval(retryInterval); + return this; + } + + public Saga setBranchHeaders(Map headers) { + this.setBranchHeaders(headers); + return this; + } + + public Saga setPassthroughHeaders(ArrayList passthroughHeaders) { + this.setPassthroughHeaders(passthroughHeaders); + return this; + } + + private void addConcurrentContext() { + if (concurrent) { + HashMap data = new HashMap<>(); + data.put(ORDERS, orders); + data.put(CONCURRENT, true); + try { + this.setCustomData(JsonUtils.toJson(data)); + } catch (Exception e) { + log.error("encode json error."); + } + } + } +} diff --git a/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java index 860a185..0e59655 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java @@ -1,7 +1,31 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.tcc; +import lombok.NoArgsConstructor; import pub.dtm.client.base.BranchIdGenerator; -import com.google.gson.Gson; import pub.dtm.client.constant.Constants; import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; @@ -10,26 +34,40 @@ import pub.dtm.client.interfaces.feign.IDtmFeignClient; import pub.dtm.client.model.dtm.TransBase; import pub.dtm.client.model.feign.ServiceMessage; -import pub.dtm.client.model.param.OperatorParam; import okhttp3.Response; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pub.dtm.client.model.param.OperatorParam; +import pub.dtm.client.model.param.TccOperatorParam; import pub.dtm.client.model.responses.DtmResponse; import pub.dtm.client.utils.FeignUtils; import pub.dtm.client.utils.HttpUtils; +import pub.dtm.client.utils.JsonUtils; import java.net.URI; import java.util.HashMap; import java.util.Map; +/** + * Tcc trans type service + * + * @author horseLk + */ +@NoArgsConstructor public class Tcc extends TransBase { private static final Logger log = LoggerFactory.getLogger(Tcc.class); private static final String OP = "try"; - private final BranchIdGenerator branchIdGenerator; + /** + * branch id generator + */ + private BranchIdGenerator branchIdGenerator; + /** + * feign client + */ private IDtmFeignClient feignClient; public Tcc(String gid, IDtmFeignClient feignClient) { @@ -42,7 +80,14 @@ public void setFeignClient(IDtmFeignClient feignClient) { this.feignClient = feignClient; } + /** + * start a tcc distribute transaction + * @param consumer consumer + * @return gid + * @throws Exception exception + */ public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { + // if tcc's gid is empty, need to request a new gid from dtm svr if (StringUtils.isEmpty(this.getGid())) { this.setGid(FeignUtils.parseGid(feignClient.newGid())); } @@ -66,14 +111,23 @@ public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { return this.getGid(); } + /** + * busi can call method callBranch() to set tcc transaction's branch. + * the callBranch for micro service driver + * @param body busi body + * @param tryMessage service message of try operator + * @param confirmMessage service message of confirm operator + * @param cancelMessage service message of cancel operator + * @return feign response + * @throws Exception exception + */ public feign.Response callBranch(Object body, ServiceMessage tryMessage, ServiceMessage confirmMessage, ServiceMessage cancelMessage) throws Exception { - Gson gson = new Gson(); log.info("call method Tcc.callBranch, tryMessage: {}, confirmMessage: {}, cancelMessage: {}", - gson.toJson(tryMessage), gson.toJson(confirmMessage), gson.toJson(cancelMessage)); + JsonUtils.toJson(tryMessage), JsonUtils.toJson(confirmMessage), JsonUtils.toJson(cancelMessage)); String branchId = this.branchIdGenerator.genBranchId(); - OperatorParam operatorParam = new OperatorParam(this.getGid(), TransTypeEnum.TCC, Constants.DEFAULT_STATUS, branchId, - gson.toJson(body), FeignUtils.generatorURI(confirmMessage, false), FeignUtils.generatorURI(cancelMessage, false)); + TccOperatorParam operatorParam = new TccOperatorParam(this.getGid(), TransTypeEnum.TCC, branchId, Constants.DEFAULT_STATUS, + JsonUtils.toJson(body), FeignUtils.generatorURI(confirmMessage, false), FeignUtils.generatorURI(cancelMessage, false)); DtmResponse resp = feignClient.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); @@ -82,7 +136,7 @@ public feign.Response callBranch(Object body, ServiceMessage tryMessage, Service Map paramsMap = new HashMap<>(); paramsMap.put(ParamFieldConstants.GID, this.getGid()); - paramsMap.put(ParamFieldConstants.TRANS_TYPE, TransTypeEnum.TCC.toString()); + paramsMap.put(ParamFieldConstants.TRANS_TYPE, TransTypeEnum.TCC.getValue()); paramsMap.put(ParamFieldConstants.BRANCH_ID, branchId); paramsMap.put(ParamFieldConstants.OP, OP); @@ -93,13 +147,22 @@ public feign.Response callBranch(Object body, ServiceMessage tryMessage, Service return response; } + /** + * busi can call method callBranch() to set tcc transaction's branch. + * the callBranch for http driver + * @param body busi body + * @param tryUrl http url of try operator + * @param confirmUrl http url of confirm operator + * @param cancelUrl http url of cancel operator + * @return http response + * @throws Exception exception + */ public Response callBranch(Object body, String tryUrl, String confirmUrl, String cancelUrl) throws Exception { log.info("call method Tcc.callBranch, tryUrl: {}, confirmUrl: {}, cancelUrl: {}", tryUrl, confirmUrl, cancelUrl); - String branchId = branchIdGenerator.genBranchId(); - Gson gson = new Gson(); + String branchId = this.branchIdGenerator.genBranchId(); - OperatorParam operatorParam = new OperatorParam(this.getGid(), TransTypeEnum.TCC, Constants.DEFAULT_STATUS, - branchId, gson.toJson(body), confirmUrl, cancelUrl); + TccOperatorParam operatorParam = new TccOperatorParam(this.getGid(), TransTypeEnum.TCC, branchId, Constants.DEFAULT_STATUS, + JsonUtils.toJson(body), confirmUrl, cancelUrl); DtmResponse resp = feignClient.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); @@ -108,10 +171,10 @@ public Response callBranch(Object body, String tryUrl, String confirmUrl, String Map paramsMap = new HashMap<>(); paramsMap.put(ParamFieldConstants.GID, this.getGid()); - paramsMap.put(ParamFieldConstants.TRANS_TYPE, TransTypeEnum.TCC.toString()); + paramsMap.put(ParamFieldConstants.TRANS_TYPE, TransTypeEnum.TCC.getValue()); paramsMap.put(ParamFieldConstants.BRANCH_ID, branchId); paramsMap.put(ParamFieldConstants.OP, OP); - Response tryResponse = HttpUtils.post(HttpUtils.splicingUrl(tryUrl, paramsMap), gson.toJson(body)); + Response tryResponse = HttpUtils.post(HttpUtils.splicingUrl(tryUrl, paramsMap), JsonUtils.toJson(body)); log.info("try response is: {}", tryResponse); HttpUtils.checkResult(tryResponse); return tryResponse; diff --git a/dtmcli-java/pom.xml b/dtmcli-java/pom.xml index a8f9be0..091b766 100644 --- a/dtmcli-java/pom.xml +++ b/dtmcli-java/pom.xml @@ -32,14 +32,9 @@ nacos-client - - com.google.code.gson - gson - - io.github.openfeign - feign-gson + feign-jackson diff --git a/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java index cac9fad..e4f3fda 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java @@ -1,18 +1,44 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client; import com.alibaba.nacos.api.naming.pojo.Instance; +import feign.jackson.JacksonDecoder; +import feign.jackson.JacksonEncoder; import pub.dtm.client.constant.Constants; import pub.dtm.client.feign.DtmFeignClient; import feign.Feign; import pub.dtm.client.feign.URIParser; -import feign.gson.GsonDecoder; -import feign.gson.GsonEncoder; import pub.dtm.client.interfaces.dtm.DtmConsumer; import pub.dtm.client.interfaces.feign.IDtmFeignClient; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pub.dtm.client.log.DtmFeignLogger; import pub.dtm.client.properties.DtmProperties; +import pub.dtm.client.saga.Saga; import pub.dtm.client.tcc.Tcc; import pub.dtm.client.utils.NacosUtils; @@ -37,7 +63,7 @@ public DtmClient() { String endpoint = null; try { // redirect connect to dtm - endpoint = DtmProperties.get("dtm.server.endpoint"); + endpoint = DtmProperties.get("dtm.ipport"); // connect to dtm by nacos if (StringUtils.isEmpty(endpoint)) { Instance instance = NacosUtils.selectOneHealthyInstance(DtmProperties.get(Constants.MICRO_SERVICE_NAME_KEY), @@ -54,8 +80,11 @@ public DtmClient() { } IDtmFeignClient feignClient = Feign .builder() - .decoder(new GsonDecoder()) - .encoder(new GsonEncoder()) + .decoder(new JacksonDecoder()) + .encoder(new JacksonEncoder()) +// if you need read detail log of feign, please cancel the note. +// .logLevel(feign.Logger.Level.FULL) +// .logger(new DtmFeignLogger()) .target(DtmFeignClient.class, Constants.HTTP_PREFIX + endpoint); if (feignClient == null) { log.error("initial dtm client for java error, feign client can't be null."); @@ -75,8 +104,11 @@ public DtmClient(String endpoint) { } IDtmFeignClient feignClient = Feign .builder() - .decoder(new GsonDecoder()) - .encoder(new GsonEncoder()) + .decoder(new JacksonDecoder()) + .encoder(new JacksonEncoder()) +// if you need read detail log of feign, please cancel the note. +// .logLevel(feign.Logger.Level.FULL) +// .logger(new DtmFeignLogger()) .target(DtmFeignClient.class, Constants.HTTP_PREFIX + endpoint); if (feignClient == null) { @@ -97,13 +129,43 @@ private List genClusters(String clusterStr) { return Arrays.asList(split); } + /** + * start a tcc transaction without gid, client send a request to dtm svr for obtain a new gid. + * @param function consumer + * @return gid + * @throws Exception exception + */ public String tccGlobalTransaction(DtmConsumer function) throws Exception { Tcc tcc = new Tcc(null, feignClient); return tcc.tccGlobalTransaction(function); } + /** + * start a tcc transaction with a custom gid. + * @param gid gid + * @param function consumer + * @return gid + * @throws Exception exception + */ public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { Tcc tcc = new Tcc(gid, feignClient); return tcc.tccGlobalTransaction(function); } + + /** + * start a saga transaction with custom gid + * @param gid gid + * @return Saga + */ + public Saga newSaga(String gid) { + return new Saga(gid, feignClient); + } + + /** + * start a saga transaction without gid, client send a request to dtm svr for obtain a new gid. + * @return Saga + */ + public Saga newSaga() { + return new Saga(null, feignClient); + } } diff --git a/dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java b/dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java index d4fe99d..3ef1a28 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java @@ -1,6 +1,34 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.feign; -import feign.*; +import feign.Headers; +import feign.Param; +import feign.QueryMap; +import feign.RequestLine; +import feign.Response; import pub.dtm.client.constant.Constants; import pub.dtm.client.interfaces.feign.IDtmFeignClient; import pub.dtm.client.model.param.OperatorParam; diff --git a/dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java b/dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java index ccc73b3..697c7dd 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java @@ -1,3 +1,27 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.feign; import com.alibaba.nacos.api.naming.pojo.Instance; @@ -15,9 +39,9 @@ public class URIParser implements IURIParser { @Override public String generatorURI(ServiceMessage serviceMessage, boolean httpType) throws Exception { - Instance instance = NacosUtils.selectOneHealthyInstance(serviceMessage.getServiceName(), - serviceMessage.getGroupName(), serviceMessage.getCluster()); if (httpType) { + Instance instance = NacosUtils.selectOneHealthyInstance(serviceMessage.getServiceName(), + serviceMessage.getGroupName(), serviceMessage.getCluster()); return Constants.HTTP_PREFIX + instance.toInetAddr(); } return DtmProperties.get("dtm.service.registryType") + "://" + serviceMessage.toString(); diff --git a/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java b/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java index 8c23607..06bb7b9 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java @@ -1,3 +1,27 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.properties; import java.io.FileInputStream; diff --git a/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java b/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java index 53c73a9..4529176 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java @@ -1,3 +1,27 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.utils; import com.alibaba.nacos.api.naming.NamingFactory; diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java index 3c79d06..bf9b409 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java @@ -1,9 +1,34 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client; import pub.dtm.client.interfaces.dtm.DtmConsumer; import pub.dtm.client.interfaces.feign.IDtmFeignClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import pub.dtm.client.saga.Saga; import pub.dtm.client.tcc.Tcc; @Component @@ -15,13 +40,39 @@ public DtmClient(IDtmFeignClient feignClient) { this.feignClient = feignClient; } + /** + * start a tcc transaction without gid, client send a request to dtm svr for obtain a new gid. + * @return gid + */ public String tccGlobalTransaction(DtmConsumer function) throws Exception { Tcc tcc = new Tcc(null, feignClient); return tcc.tccGlobalTransaction(function); } + /** + * start a tcc transaction with custom gid + * @param gid gid + * @return gid + */ public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { Tcc tcc = new Tcc(gid, feignClient); return tcc.tccGlobalTransaction(function); } + + /** + * start a saga transaction with custom gid + * @param gid gid + * @return Saga + */ + public Saga newSaga(String gid) { + return new Saga(gid, feignClient); + } + + /** + * start a saga transaction without gid, client send a request to dtm svr for obtain a new gid. + * @return Saga + */ + public Saga newSaga() { + return new Saga(null, feignClient); + } } diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java b/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java index 6f11268..5e7d9d7 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java @@ -1,5 +1,30 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.configuration; +import feign.Logger; import pub.dtm.client.feign.URIParser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -9,6 +34,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; +import pub.dtm.client.log.DtmFeignLogger; import pub.dtm.client.properties.DtmProperties; @Component @@ -26,4 +52,18 @@ public URIParser uriParser() { URIParser.setRegistryType(dtmProperties.getRegistryType()); return new URIParser(); } + + /** + * if you need read detail log, please cancel note. + */ +// @Bean +// Logger.Level feignLoggerLevel() { +// return Logger.Level.FULL; +// } +// +// @Bean +// Logger feignLogger() { +// return new DtmFeignLogger(); +// } + } diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java b/dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java index 5d81022..7c6d7d8 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java @@ -1,3 +1,27 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.feign; import pub.dtm.client.constant.Constants; diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java b/dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java index 160c604..389a648 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java @@ -1,3 +1,27 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.feign; import pub.dtm.client.constant.Constants; diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java b/dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java index f3be4ef..3f7e5d9 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java @@ -1,3 +1,27 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.properties; import lombok.Data; diff --git a/pom.xml b/pom.xml index 7556db6..ba38075 100644 --- a/pom.xml +++ b/pom.xml @@ -24,8 +24,7 @@ 1.8 UTF-8 4.12 - 2.8.6 - 2.13.2 + 2.12.2 1.18.0 11.8 3.12.0 @@ -43,15 +42,9 @@ test - - com.google.code.gson - gson - ${gson.version} - - com.fasterxml.jackson.core - jackson-annotations + jackson-databind ${jackson.version} @@ -69,7 +62,7 @@ io.github.openfeign - feign-gson + feign-jackson ${feign.version} From 1dfd22a3c8431a2e326eac29e4ade8de49a6f070 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Wed, 11 May 2022 21:59:51 +0800 Subject: [PATCH 08/24] fix --- .../pub/dtm/client/enums/TransTypeEnum.java | 15 +-- .../client/interfaces/ICommunicationStub.java | 96 +++++++++++++++++++ .../interfaces/feign/IDtmFeignClient.java | 87 ++++++----------- .../main/java/pub/dtm/client/saga/Saga.java | 12 +-- .../src/main/java/pub/dtm/client/tcc/Tcc.java | 26 ++--- .../main/java/pub/dtm/client/DtmClient.java | 15 +-- .../main/java/pub/dtm/client/DtmClient.java | 16 ++-- .../configuration/DtmConfiguration.java | 1 + 8 files changed, 170 insertions(+), 98 deletions(-) create mode 100644 dtmcli-common/src/main/java/pub/dtm/client/interfaces/ICommunicationStub.java diff --git a/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java b/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java index c136495..77c64d3 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java @@ -64,14 +64,15 @@ public String getValue() { return this.value; } - private static Map exist = new HashMap<>(); + private static final Map EXIST = new HashMap<>(); - public static TransTypeEnum parseString(String value) { - if (exist.isEmpty()) { - for (TransTypeEnum transType : TransTypeEnum.values()) { - exist.put(transType.value, transType); - } + static { + for (TransTypeEnum transType : TransTypeEnum.values()) { + EXIST.put(transType.value, transType); } - return exist.get(value); + } + + public static TransTypeEnum parseString(String value) { + return EXIST.get(value); } } diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/ICommunicationStub.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/ICommunicationStub.java new file mode 100644 index 0000000..4aa7c26 --- /dev/null +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/ICommunicationStub.java @@ -0,0 +1,96 @@ +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package pub.dtm.client.interfaces; + +import feign.Response; +import pub.dtm.client.model.param.OperatorParam; +import pub.dtm.client.model.responses.DtmResponse; + +import java.net.URI; +import java.util.Map; + +/** + * Base stub to communication with server. + * + * @author horseLk + */ +public interface ICommunicationStub { + /** + * get stubType + * @return type + */ + String stubType(); + + /** + * get a new gid + */ + DtmResponse newGid(); + + /** + * test connection + */ + DtmResponse ping(); + + /** + * prepare + * @param body prepare body + */ + DtmResponse prepare(OperatorParam body); + + /** + * submit + * @param body submit bosy + */ + DtmResponse submit(OperatorParam body); + + /** + * abort + * @param body abort body + */ + DtmResponse abort(OperatorParam body); + + /** + * registerBranch + * @param body registerBranch body + */ + DtmResponse registerBranch(OperatorParam body); + + /** + * use feign send busi get request + * @param host busi host + * @param path busi path + * @param queryMap querymao + */ + Response busiGet(URI host, String path, Map queryMap); + + /** + * use feign send busi post request + * @param host busi host + * @param path busi path + * @param queryMap query map + * @param body request body + */ + Response busiPost(URI host, String path, Map queryMap, Object body); +} diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java index f3fde98..b8c87f4 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java @@ -1,66 +1,39 @@ -package pub.dtm.client.interfaces.feign; +/* + * MIT License + * + * Copyright (c) 2022 yedf + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ -import feign.Response; -import pub.dtm.client.model.param.OperatorParam; -import pub.dtm.client.model.responses.DtmResponse; +package pub.dtm.client.interfaces.feign; -import java.net.URI; -import java.util.Map; +import pub.dtm.client.interfaces.ICommunicationStub; /** * A feign client interface for dtm svr, we designed different implements for different client. * * @author horseLk */ -public interface IDtmFeignClient { - /** - * get a new gid - */ - DtmResponse newGid(); - - /** - * test connection - */ - DtmResponse ping(); - - /** - * prepare - * @param body prepare body - */ - DtmResponse prepare(OperatorParam body); - - /** - * submit - * @param body submit bosy - */ - DtmResponse submit(OperatorParam body); - - /** - * abort - * @param body abort body - */ - DtmResponse abort(OperatorParam body); - - /** - * registerBranch - * @param body registerBranch body - */ - DtmResponse registerBranch(OperatorParam body); - - /** - * use feign send busi get request - * @param host busi host - * @param path busi path - * @param queryMap querymao - */ - Response busiGet(URI host, String path, Map queryMap); - - /** - * use feign send busi post request - * @param host busi host - * @param path busi path - * @param queryMap query map - * @param body request body - */ - Response busiPost(URI host, String path, Map queryMap, Object body); +public interface IDtmFeignClient extends ICommunicationStub { + @Override + default String stubType() { + return "feign"; + } } diff --git a/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java b/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java index d99e8b3..ea60a60 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java @@ -32,7 +32,7 @@ import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; import pub.dtm.client.exception.FailureException; -import pub.dtm.client.interfaces.feign.IDtmFeignClient; +import pub.dtm.client.interfaces.ICommunicationStub; import pub.dtm.client.model.dtm.TransBase; import pub.dtm.client.model.feign.ServiceMessage; import pub.dtm.client.model.param.SagaOperatorParam; @@ -58,7 +58,7 @@ public class Saga extends TransBase { private static final String CONCURRENT = "concurrent"; - private IDtmFeignClient feignClient; + private ICommunicationStub communicationStub; private boolean concurrent; @@ -78,11 +78,11 @@ public class Saga extends TransBase { private List payloads = new ArrayList<>(); - public Saga(String gid, IDtmFeignClient feignClient) { + public Saga(String gid, ICommunicationStub communicationStub) { super(gid, TransTypeEnum.SAGA, false); this.concurrent = false; this.orders = new HashMap<>(); - this.feignClient = feignClient; + this.communicationStub = communicationStub; } public Saga add(ServiceMessage action, ServiceMessage compensate, Object postData) { @@ -114,7 +114,7 @@ public Saga add(String action, String compensate, Object postData) { public String submit() throws Exception { if (StringUtils.isEmpty(this.getGid())) { - this.setGid(FeignUtils.parseGid(feignClient.newGid())); + this.setGid(FeignUtils.parseGid(communicationStub.newGid())); } addConcurrentContext(); SagaOperatorParam operatorParam = new SagaOperatorParam(this.getGid(), TransTypeEnum.SAGA, this.getSteps(), @@ -122,7 +122,7 @@ public String submit() throws Exception { this.getRetryInterval(), this.getPassthroughHeaders(), this.getBranchHeaders()); try { - feignClient.submit(operatorParam); + communicationStub.submit(operatorParam); } catch (Exception e) { log.error("saga transaction submit failed, transaction gid is {}", this.getGid()); throw new FailureException(e); diff --git a/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java index 0e59655..9a5535a 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java @@ -30,8 +30,8 @@ import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; import pub.dtm.client.exception.FailureException; +import pub.dtm.client.interfaces.ICommunicationStub; import pub.dtm.client.interfaces.dtm.DtmConsumer; -import pub.dtm.client.interfaces.feign.IDtmFeignClient; import pub.dtm.client.model.dtm.TransBase; import pub.dtm.client.model.feign.ServiceMessage; import okhttp3.Response; @@ -68,16 +68,16 @@ public class Tcc extends TransBase { /** * feign client */ - private IDtmFeignClient feignClient; + private ICommunicationStub communicationStub; - public Tcc(String gid, IDtmFeignClient feignClient) { + public Tcc(String gid, ICommunicationStub communicationStub) { super(gid, TransTypeEnum.TCC, false); this.branchIdGenerator = new BranchIdGenerator(Constants.EMPTY_STRING); - this.feignClient = feignClient; + this.communicationStub = communicationStub; } - public void setFeignClient(IDtmFeignClient feignClient) { - this.feignClient = feignClient; + public void setCommunicationStub(ICommunicationStub communicationStub) { + this.communicationStub = communicationStub; } /** @@ -89,12 +89,12 @@ public void setFeignClient(IDtmFeignClient feignClient) { public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { // if tcc's gid is empty, need to request a new gid from dtm svr if (StringUtils.isEmpty(this.getGid())) { - this.setGid(FeignUtils.parseGid(feignClient.newGid())); + this.setGid(FeignUtils.parseGid(communicationStub.newGid())); } log.info("the tcc transaction's gid is {}", this.getGid()); OperatorParam operatorParam = new OperatorParam(this.getGid(), TransTypeEnum.TCC); - DtmResponse resp = feignClient.prepare(operatorParam); + DtmResponse resp = communicationStub.prepare(operatorParam); log.info("prepare response: {}", resp); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction prepare fail. returned dtm_result is: {}, transaction gid: {}", resp.getDtmResult(), this.getGid()); @@ -102,10 +102,10 @@ public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { } try { consumer.accept(this); - feignClient.submit(operatorParam); + communicationStub.submit(operatorParam); } catch (Exception e) { log.error("TCC transaction submit fail, start abort it. transaction gid: {}", this.getGid()); - feignClient.abort(operatorParam); + communicationStub.abort(operatorParam); throw new FailureException(e); } return this.getGid(); @@ -128,7 +128,7 @@ public feign.Response callBranch(Object body, ServiceMessage tryMessage, Service TccOperatorParam operatorParam = new TccOperatorParam(this.getGid(), TransTypeEnum.TCC, branchId, Constants.DEFAULT_STATUS, JsonUtils.toJson(body), FeignUtils.generatorURI(confirmMessage, false), FeignUtils.generatorURI(cancelMessage, false)); - DtmResponse resp = feignClient.registerBranch(operatorParam); + DtmResponse resp = communicationStub.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); throw new FailureException("TCC Transaction register branch fail"); @@ -140,7 +140,7 @@ public feign.Response callBranch(Object body, ServiceMessage tryMessage, Service paramsMap.put(ParamFieldConstants.BRANCH_ID, branchId); paramsMap.put(ParamFieldConstants.OP, OP); - feign.Response response = feignClient.busiPost(new URI(FeignUtils.generatorURI(tryMessage, true)), + feign.Response response = communicationStub.busiPost(new URI(FeignUtils.generatorURI(tryMessage, true)), tryMessage.getPath(), paramsMap, body); log.info("busi post is: {}", response); FeignUtils.checkResult(response); @@ -163,7 +163,7 @@ public Response callBranch(Object body, String tryUrl, String confirmUrl, String TccOperatorParam operatorParam = new TccOperatorParam(this.getGid(), TransTypeEnum.TCC, branchId, Constants.DEFAULT_STATUS, JsonUtils.toJson(body), confirmUrl, cancelUrl); - DtmResponse resp = feignClient.registerBranch(operatorParam); + DtmResponse resp = communicationStub.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); throw new FailureException("TCC Transaction register branch fail"); diff --git a/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java index e4f3fda..4b2ccdb 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java @@ -31,6 +31,7 @@ import pub.dtm.client.feign.DtmFeignClient; import feign.Feign; import pub.dtm.client.feign.URIParser; +import pub.dtm.client.interfaces.ICommunicationStub; import pub.dtm.client.interfaces.dtm.DtmConsumer; import pub.dtm.client.interfaces.feign.IDtmFeignClient; import org.apache.commons.lang3.StringUtils; @@ -54,7 +55,7 @@ public class DtmClient { private static final Logger log = LoggerFactory.getLogger(DtmClient.class); - private IDtmFeignClient feignClient; + private ICommunicationStub communicationStub; public DtmClient() { // init URIParser @@ -91,7 +92,7 @@ public DtmClient() { System.exit(-1); } - this.feignClient = feignClient; + this.communicationStub = feignClient; } public DtmClient(String endpoint) { @@ -116,7 +117,7 @@ public DtmClient(String endpoint) { System.exit(-1); } - this.feignClient = feignClient; + this.communicationStub = feignClient; } private List genClusters(String clusterStr) { @@ -136,7 +137,7 @@ private List genClusters(String clusterStr) { * @throws Exception exception */ public String tccGlobalTransaction(DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(null, feignClient); + Tcc tcc = new Tcc(null, communicationStub); return tcc.tccGlobalTransaction(function); } @@ -148,7 +149,7 @@ public String tccGlobalTransaction(DtmConsumer function) throws Exception { * @throws Exception exception */ public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(gid, feignClient); + Tcc tcc = new Tcc(gid, communicationStub); return tcc.tccGlobalTransaction(function); } @@ -158,7 +159,7 @@ public String tccGlobalTransaction(String gid, DtmConsumer function) throws * @return Saga */ public Saga newSaga(String gid) { - return new Saga(gid, feignClient); + return new Saga(gid, communicationStub); } /** @@ -166,6 +167,6 @@ public Saga newSaga(String gid) { * @return Saga */ public Saga newSaga() { - return new Saga(null, feignClient); + return new Saga(null, communicationStub); } } diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java index bf9b409..041f080 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java @@ -24,8 +24,8 @@ package pub.dtm.client; +import pub.dtm.client.interfaces.ICommunicationStub; import pub.dtm.client.interfaces.dtm.DtmConsumer; -import pub.dtm.client.interfaces.feign.IDtmFeignClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import pub.dtm.client.saga.Saga; @@ -34,10 +34,10 @@ @Component public class DtmClient { @Autowired - private IDtmFeignClient feignClient; + private ICommunicationStub communicationStub; - public DtmClient(IDtmFeignClient feignClient) { - this.feignClient = feignClient; + public DtmClient(ICommunicationStub communicationStub) { + this.communicationStub = communicationStub; } /** @@ -45,7 +45,7 @@ public DtmClient(IDtmFeignClient feignClient) { * @return gid */ public String tccGlobalTransaction(DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(null, feignClient); + Tcc tcc = new Tcc(null, communicationStub); return tcc.tccGlobalTransaction(function); } @@ -55,7 +55,7 @@ public String tccGlobalTransaction(DtmConsumer function) throws Exception { * @return gid */ public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(gid, feignClient); + Tcc tcc = new Tcc(gid, communicationStub); return tcc.tccGlobalTransaction(function); } @@ -65,7 +65,7 @@ public String tccGlobalTransaction(String gid, DtmConsumer function) throws * @return Saga */ public Saga newSaga(String gid) { - return new Saga(gid, feignClient); + return new Saga(gid, communicationStub); } /** @@ -73,6 +73,6 @@ public Saga newSaga(String gid) { * @return Saga */ public Saga newSaga() { - return new Saga(null, feignClient); + return new Saga(null, communicationStub); } } diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java b/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java index 5e7d9d7..22e8eb8 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java @@ -25,6 +25,7 @@ package pub.dtm.client.configuration; import feign.Logger; +import pub.dtm.client.DtmClient; import pub.dtm.client.feign.URIParser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; From d958ea34b4598284dac8e89631f0a11282479398 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Thu, 12 May 2022 01:32:36 +0800 Subject: [PATCH 09/24] fix --- dtmcli-common/pom.xml | 6 +- .../IDtmCommunicationClient.java} | 6 +- .../{feign => communication}/IURIParser.java | 2 +- .../interfaces/feign/IDtmFeignClient.java | 39 ---- .../java/pub/dtm/client/utils/FeignUtils.java | 2 +- dtmcli-core/pom.xml | 16 +- .../main/java/pub/dtm/client/saga/Saga.java | 12 +- .../src/main/java/pub/dtm/client/tcc/Tcc.java | 26 +-- dtmcli-java/pom.xml | 20 +- .../main/java/pub/dtm/client/DtmClient.java | 26 ++- .../DtmFeignClient.java | 11 +- .../{feign => communication}/URIParser.java | 4 +- dtmcli-spring/pom.xml | 17 +- .../main/java/pub/dtm/client/DtmClient.java | 16 +- .../DtmFeignClient.java | 11 +- .../{feign => communication}/URIParser.java | 4 +- .../configuration/DtmConfiguration.java | 9 +- pom.xml | 202 ++++++++++++++++-- 18 files changed, 284 insertions(+), 145 deletions(-) rename dtmcli-common/src/main/java/pub/dtm/client/interfaces/{ICommunicationStub.java => communication/IDtmCommunicationClient.java} (92%) rename dtmcli-common/src/main/java/pub/dtm/client/interfaces/{feign => communication}/IURIParser.java (97%) delete mode 100644 dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java rename dtmcli-java/src/main/java/pub/dtm/client/{feign => communication}/DtmFeignClient.java (90%) rename dtmcli-java/src/main/java/pub/dtm/client/{feign => communication}/URIParser.java (95%) rename dtmcli-spring/src/main/java/pub/dtm/client/{feign => communication}/DtmFeignClient.java (91%) rename dtmcli-spring/src/main/java/pub/dtm/client/{feign => communication}/URIParser.java (94%) diff --git a/dtmcli-common/pom.xml b/dtmcli-common/pom.xml index 7d8cf22..19ce8ea 100644 --- a/dtmcli-common/pom.xml +++ b/dtmcli-common/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> dtmcli-java-parent - pub.dtm - 1.0.0 + io.github.dtm-labs + 2.0.3-Release 4.0.0 dtmcli-common - 1.0.0 + 2.0.3-Release jar dtmcli-common diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/ICommunicationStub.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IDtmCommunicationClient.java similarity index 92% rename from dtmcli-common/src/main/java/pub/dtm/client/interfaces/ICommunicationStub.java rename to dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IDtmCommunicationClient.java index 4aa7c26..9e61358 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/ICommunicationStub.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IDtmCommunicationClient.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.interfaces; +package pub.dtm.client.interfaces.communication; import feign.Response; import pub.dtm.client.model.param.OperatorParam; @@ -32,11 +32,11 @@ import java.util.Map; /** - * Base stub to communication with server. + * A feign client interface for dtm svr, we designed different implements for different client. * * @author horseLk */ -public interface ICommunicationStub { +public interface IDtmCommunicationClient { /** * get stubType * @return type diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IURIParser.java similarity index 97% rename from dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java rename to dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IURIParser.java index 2c1c162..d994fca 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IURIParser.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IURIParser.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.interfaces.feign; +package pub.dtm.client.interfaces.communication; import pub.dtm.client.model.feign.ServiceMessage; diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java deleted file mode 100644 index b8c87f4..0000000 --- a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/feign/IDtmFeignClient.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2022 yedf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package pub.dtm.client.interfaces.feign; - -import pub.dtm.client.interfaces.ICommunicationStub; - -/** - * A feign client interface for dtm svr, we designed different implements for different client. - * - * @author horseLk - */ -public interface IDtmFeignClient extends ICommunicationStub { - @Override - default String stubType() { - return "feign"; - } -} diff --git a/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java index 4f9d38e..9bf5aa3 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java @@ -27,7 +27,7 @@ import pub.dtm.client.constant.Constants; import pub.dtm.client.exception.FailureException; import feign.Response; -import pub.dtm.client.interfaces.feign.IURIParser; +import pub.dtm.client.interfaces.communication.IURIParser; import pub.dtm.client.model.feign.ServiceMessage; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/dtmcli-core/pom.xml b/dtmcli-core/pom.xml index e425578..d0a4432 100644 --- a/dtmcli-core/pom.xml +++ b/dtmcli-core/pom.xml @@ -4,21 +4,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> dtmcli-java-parent - pub.dtm - 1.0.0 + io.github.dtm-labs + 2.0.3-Release 4.0.0 dtmcli-core - 1.0.0 + 2.0.3-Release jar dtmcli-core + + UTF-8 + 1.8 + 1.8 + + - pub.dtm + io.github.dtm-labs dtmcli-common - 1.0.0 + 2.0.3-Release diff --git a/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java b/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java index ea60a60..723843e 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java @@ -32,7 +32,7 @@ import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; import pub.dtm.client.exception.FailureException; -import pub.dtm.client.interfaces.ICommunicationStub; +import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; import pub.dtm.client.model.dtm.TransBase; import pub.dtm.client.model.feign.ServiceMessage; import pub.dtm.client.model.param.SagaOperatorParam; @@ -58,7 +58,7 @@ public class Saga extends TransBase { private static final String CONCURRENT = "concurrent"; - private ICommunicationStub communicationStub; + private IDtmCommunicationClient dtmCommunicationClient; private boolean concurrent; @@ -78,11 +78,11 @@ public class Saga extends TransBase { private List payloads = new ArrayList<>(); - public Saga(String gid, ICommunicationStub communicationStub) { + public Saga(String gid, IDtmCommunicationClient dtmCommunicationClient) { super(gid, TransTypeEnum.SAGA, false); this.concurrent = false; this.orders = new HashMap<>(); - this.communicationStub = communicationStub; + this.dtmCommunicationClient = dtmCommunicationClient; } public Saga add(ServiceMessage action, ServiceMessage compensate, Object postData) { @@ -114,7 +114,7 @@ public Saga add(String action, String compensate, Object postData) { public String submit() throws Exception { if (StringUtils.isEmpty(this.getGid())) { - this.setGid(FeignUtils.parseGid(communicationStub.newGid())); + this.setGid(FeignUtils.parseGid(dtmCommunicationClient.newGid())); } addConcurrentContext(); SagaOperatorParam operatorParam = new SagaOperatorParam(this.getGid(), TransTypeEnum.SAGA, this.getSteps(), @@ -122,7 +122,7 @@ public String submit() throws Exception { this.getRetryInterval(), this.getPassthroughHeaders(), this.getBranchHeaders()); try { - communicationStub.submit(operatorParam); + dtmCommunicationClient.submit(operatorParam); } catch (Exception e) { log.error("saga transaction submit failed, transaction gid is {}", this.getGid()); throw new FailureException(e); diff --git a/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java index 9a5535a..5a30c4a 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java @@ -30,7 +30,7 @@ import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; import pub.dtm.client.exception.FailureException; -import pub.dtm.client.interfaces.ICommunicationStub; +import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; import pub.dtm.client.interfaces.dtm.DtmConsumer; import pub.dtm.client.model.dtm.TransBase; import pub.dtm.client.model.feign.ServiceMessage; @@ -68,16 +68,16 @@ public class Tcc extends TransBase { /** * feign client */ - private ICommunicationStub communicationStub; + private IDtmCommunicationClient dtmCommunicationClient; - public Tcc(String gid, ICommunicationStub communicationStub) { + public Tcc(String gid, IDtmCommunicationClient dtmCommunicationClient) { super(gid, TransTypeEnum.TCC, false); this.branchIdGenerator = new BranchIdGenerator(Constants.EMPTY_STRING); - this.communicationStub = communicationStub; + this.dtmCommunicationClient = dtmCommunicationClient; } - public void setCommunicationStub(ICommunicationStub communicationStub) { - this.communicationStub = communicationStub; + public void setdtmCommunicationClient(IDtmCommunicationClient dtmCommunicationClient) { + this.dtmCommunicationClient = dtmCommunicationClient; } /** @@ -89,12 +89,12 @@ public void setCommunicationStub(ICommunicationStub communicationStub) { public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { // if tcc's gid is empty, need to request a new gid from dtm svr if (StringUtils.isEmpty(this.getGid())) { - this.setGid(FeignUtils.parseGid(communicationStub.newGid())); + this.setGid(FeignUtils.parseGid(dtmCommunicationClient.newGid())); } log.info("the tcc transaction's gid is {}", this.getGid()); OperatorParam operatorParam = new OperatorParam(this.getGid(), TransTypeEnum.TCC); - DtmResponse resp = communicationStub.prepare(operatorParam); + DtmResponse resp = dtmCommunicationClient.prepare(operatorParam); log.info("prepare response: {}", resp); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction prepare fail. returned dtm_result is: {}, transaction gid: {}", resp.getDtmResult(), this.getGid()); @@ -102,10 +102,10 @@ public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { } try { consumer.accept(this); - communicationStub.submit(operatorParam); + dtmCommunicationClient.submit(operatorParam); } catch (Exception e) { log.error("TCC transaction submit fail, start abort it. transaction gid: {}", this.getGid()); - communicationStub.abort(operatorParam); + dtmCommunicationClient.abort(operatorParam); throw new FailureException(e); } return this.getGid(); @@ -128,7 +128,7 @@ public feign.Response callBranch(Object body, ServiceMessage tryMessage, Service TccOperatorParam operatorParam = new TccOperatorParam(this.getGid(), TransTypeEnum.TCC, branchId, Constants.DEFAULT_STATUS, JsonUtils.toJson(body), FeignUtils.generatorURI(confirmMessage, false), FeignUtils.generatorURI(cancelMessage, false)); - DtmResponse resp = communicationStub.registerBranch(operatorParam); + DtmResponse resp = dtmCommunicationClient.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); throw new FailureException("TCC Transaction register branch fail"); @@ -140,7 +140,7 @@ public feign.Response callBranch(Object body, ServiceMessage tryMessage, Service paramsMap.put(ParamFieldConstants.BRANCH_ID, branchId); paramsMap.put(ParamFieldConstants.OP, OP); - feign.Response response = communicationStub.busiPost(new URI(FeignUtils.generatorURI(tryMessage, true)), + feign.Response response = dtmCommunicationClient.busiPost(new URI(FeignUtils.generatorURI(tryMessage, true)), tryMessage.getPath(), paramsMap, body); log.info("busi post is: {}", response); FeignUtils.checkResult(response); @@ -163,7 +163,7 @@ public Response callBranch(Object body, String tryUrl, String confirmUrl, String TccOperatorParam operatorParam = new TccOperatorParam(this.getGid(), TransTypeEnum.TCC, branchId, Constants.DEFAULT_STATUS, JsonUtils.toJson(body), confirmUrl, cancelUrl); - DtmResponse resp = communicationStub.registerBranch(operatorParam); + DtmResponse resp = dtmCommunicationClient.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); throw new FailureException("TCC Transaction register branch fail"); diff --git a/dtmcli-java/pom.xml b/dtmcli-java/pom.xml index 091b766..d8182df 100644 --- a/dtmcli-java/pom.xml +++ b/dtmcli-java/pom.xml @@ -4,27 +4,33 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> dtmcli-java-parent - pub.dtm - 1.0.0 + io.github.dtm-labs + 2.0.3-Release 4.0.0 dtmcli-java - 1.0.0 + 2.0.3-Release jar dtmcli-java + + UTF-8 + 1.8 + 1.8 + + - pub.dtm + io.github.dtm-labs dtmcli-common - 1.0.0 + 2.0.3-Release - pub.dtm + io.github.dtm-labs dtmcli-core - 1.0.0 + 2.0.3-Release diff --git a/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java index 4b2ccdb..d23da09 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java @@ -28,16 +28,14 @@ import feign.jackson.JacksonDecoder; import feign.jackson.JacksonEncoder; import pub.dtm.client.constant.Constants; -import pub.dtm.client.feign.DtmFeignClient; +import pub.dtm.client.communication.DtmFeignClient; import feign.Feign; -import pub.dtm.client.feign.URIParser; -import pub.dtm.client.interfaces.ICommunicationStub; +import pub.dtm.client.communication.URIParser; import pub.dtm.client.interfaces.dtm.DtmConsumer; -import pub.dtm.client.interfaces.feign.IDtmFeignClient; +import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pub.dtm.client.log.DtmFeignLogger; import pub.dtm.client.properties.DtmProperties; import pub.dtm.client.saga.Saga; import pub.dtm.client.tcc.Tcc; @@ -55,7 +53,7 @@ public class DtmClient { private static final Logger log = LoggerFactory.getLogger(DtmClient.class); - private ICommunicationStub communicationStub; + private IDtmCommunicationClient dtmCommunicationClient; public DtmClient() { // init URIParser @@ -79,7 +77,7 @@ public DtmClient() { log.error("can not resolve dtm server message from config file, you can use nacos or redirect configure to config it."); System.exit(-1); } - IDtmFeignClient feignClient = Feign + IDtmCommunicationClient feignClient = Feign .builder() .decoder(new JacksonDecoder()) .encoder(new JacksonEncoder()) @@ -92,7 +90,7 @@ public DtmClient() { System.exit(-1); } - this.communicationStub = feignClient; + this.dtmCommunicationClient = feignClient; } public DtmClient(String endpoint) { @@ -103,7 +101,7 @@ public DtmClient(String endpoint) { log.error("dtm server endpoint can not be empty."); System.exit(-1); } - IDtmFeignClient feignClient = Feign + IDtmCommunicationClient feignClient = Feign .builder() .decoder(new JacksonDecoder()) .encoder(new JacksonEncoder()) @@ -117,7 +115,7 @@ public DtmClient(String endpoint) { System.exit(-1); } - this.communicationStub = feignClient; + this.dtmCommunicationClient = feignClient; } private List genClusters(String clusterStr) { @@ -137,7 +135,7 @@ private List genClusters(String clusterStr) { * @throws Exception exception */ public String tccGlobalTransaction(DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(null, communicationStub); + Tcc tcc = new Tcc(null, dtmCommunicationClient); return tcc.tccGlobalTransaction(function); } @@ -149,7 +147,7 @@ public String tccGlobalTransaction(DtmConsumer function) throws Exception { * @throws Exception exception */ public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(gid, communicationStub); + Tcc tcc = new Tcc(gid, dtmCommunicationClient); return tcc.tccGlobalTransaction(function); } @@ -159,7 +157,7 @@ public String tccGlobalTransaction(String gid, DtmConsumer function) throws * @return Saga */ public Saga newSaga(String gid) { - return new Saga(gid, communicationStub); + return new Saga(gid, dtmCommunicationClient); } /** @@ -167,6 +165,6 @@ public Saga newSaga(String gid) { * @return Saga */ public Saga newSaga() { - return new Saga(null, communicationStub); + return new Saga(null, dtmCommunicationClient); } } diff --git a/dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java b/dtmcli-java/src/main/java/pub/dtm/client/communication/DtmFeignClient.java similarity index 90% rename from dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java rename to dtmcli-java/src/main/java/pub/dtm/client/communication/DtmFeignClient.java index 3ef1a28..c9e6b5c 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/feign/DtmFeignClient.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/communication/DtmFeignClient.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.feign; +package pub.dtm.client.communication; import feign.Headers; import feign.Param; @@ -30,7 +30,7 @@ import feign.RequestLine; import feign.Response; import pub.dtm.client.constant.Constants; -import pub.dtm.client.interfaces.feign.IDtmFeignClient; +import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; import pub.dtm.client.model.param.OperatorParam; import pub.dtm.client.model.responses.DtmResponse; @@ -38,7 +38,12 @@ import java.util.Map; @Headers("Content-Type: application/json") -public interface DtmFeignClient extends IDtmFeignClient { +public interface DtmFeignClient extends IDtmCommunicationClient { + @Override + default String stubType() { + return "open-feign"; + } + @Override @RequestLine(Constants.GET_METHOD + Constants.NEW_GID_URL) DtmResponse newGid(); diff --git a/dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java b/dtmcli-java/src/main/java/pub/dtm/client/communication/URIParser.java similarity index 95% rename from dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java rename to dtmcli-java/src/main/java/pub/dtm/client/communication/URIParser.java index 697c7dd..912dda8 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/feign/URIParser.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/communication/URIParser.java @@ -22,11 +22,11 @@ * SOFTWARE. */ -package pub.dtm.client.feign; +package pub.dtm.client.communication; import com.alibaba.nacos.api.naming.pojo.Instance; import pub.dtm.client.constant.Constants; -import pub.dtm.client.interfaces.feign.IURIParser; +import pub.dtm.client.interfaces.communication.IURIParser; import pub.dtm.client.model.feign.ServiceMessage; import pub.dtm.client.properties.DtmProperties; import pub.dtm.client.utils.FeignUtils; diff --git a/dtmcli-spring/pom.xml b/dtmcli-spring/pom.xml index e47f7c7..7f927de 100644 --- a/dtmcli-spring/pom.xml +++ b/dtmcli-spring/pom.xml @@ -4,17 +4,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> dtmcli-java-parent - pub.dtm - 1.0.0 + io.github.dtm-labs + 2.0.3-Release 4.0.0 dtmcli-spring - 1.0.0 + 2.0.3-Release jar dtmcli-spring + UTF-8 + 1.8 + 1.8 3.1.1 2021.0.1.0 2.1.2.RELEASE @@ -24,15 +27,15 @@ - pub.dtm + io.github.dtm-labs dtmcli-common - 1.0.0 + 2.0.3-Release - pub.dtm + io.github.dtm-labs dtmcli-core - 1.0.0 + 2.0.3-Release diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java index 041f080..a28b284 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java @@ -24,7 +24,7 @@ package pub.dtm.client; -import pub.dtm.client.interfaces.ICommunicationStub; +import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; import pub.dtm.client.interfaces.dtm.DtmConsumer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,10 +34,10 @@ @Component public class DtmClient { @Autowired - private ICommunicationStub communicationStub; + private IDtmCommunicationClient dtmCommunicationClient; - public DtmClient(ICommunicationStub communicationStub) { - this.communicationStub = communicationStub; + public DtmClient(IDtmCommunicationClient dtmCommunicationClient) { + this.dtmCommunicationClient = dtmCommunicationClient; } /** @@ -45,7 +45,7 @@ public DtmClient(ICommunicationStub communicationStub) { * @return gid */ public String tccGlobalTransaction(DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(null, communicationStub); + Tcc tcc = new Tcc(null, dtmCommunicationClient); return tcc.tccGlobalTransaction(function); } @@ -55,7 +55,7 @@ public String tccGlobalTransaction(DtmConsumer function) throws Exception { * @return gid */ public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(gid, communicationStub); + Tcc tcc = new Tcc(gid, dtmCommunicationClient); return tcc.tccGlobalTransaction(function); } @@ -65,7 +65,7 @@ public String tccGlobalTransaction(String gid, DtmConsumer function) throws * @return Saga */ public Saga newSaga(String gid) { - return new Saga(gid, communicationStub); + return new Saga(gid, dtmCommunicationClient); } /** @@ -73,6 +73,6 @@ public Saga newSaga(String gid) { * @return Saga */ public Saga newSaga() { - return new Saga(null, communicationStub); + return new Saga(null, dtmCommunicationClient); } } diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java b/dtmcli-spring/src/main/java/pub/dtm/client/communication/DtmFeignClient.java similarity index 91% rename from dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java rename to dtmcli-spring/src/main/java/pub/dtm/client/communication/DtmFeignClient.java index 7c6d7d8..9a4a1b5 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/feign/DtmFeignClient.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/communication/DtmFeignClient.java @@ -22,11 +22,11 @@ * SOFTWARE. */ -package pub.dtm.client.feign; +package pub.dtm.client.communication; import pub.dtm.client.constant.Constants; import feign.Response; -import pub.dtm.client.interfaces.feign.IDtmFeignClient; +import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; import pub.dtm.client.model.param.OperatorParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; @@ -41,7 +41,12 @@ import java.util.Map; @FeignClient(value = "${dtm.service.name}") -public interface DtmFeignClient extends IDtmFeignClient { +public interface DtmFeignClient extends IDtmCommunicationClient { + @Override + default String stubType() { + return "feign-spring"; + } + @Override @GetMapping(Constants.NEW_GID_URL) DtmResponse newGid(); diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java b/dtmcli-spring/src/main/java/pub/dtm/client/communication/URIParser.java similarity index 94% rename from dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java rename to dtmcli-spring/src/main/java/pub/dtm/client/communication/URIParser.java index 389a648..d6b098e 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/feign/URIParser.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/communication/URIParser.java @@ -22,10 +22,10 @@ * SOFTWARE. */ -package pub.dtm.client.feign; +package pub.dtm.client.communication; import pub.dtm.client.constant.Constants; -import pub.dtm.client.interfaces.feign.IURIParser; +import pub.dtm.client.interfaces.communication.IURIParser; import pub.dtm.client.model.feign.ServiceMessage; import pub.dtm.client.utils.FeignUtils; diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java b/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java index 22e8eb8..dcd5c52 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java +++ b/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java @@ -24,9 +24,7 @@ package pub.dtm.client.configuration; -import feign.Logger; -import pub.dtm.client.DtmClient; -import pub.dtm.client.feign.URIParser; +import pub.dtm.client.communication.URIParser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -35,13 +33,12 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import pub.dtm.client.log.DtmFeignLogger; import pub.dtm.client.properties.DtmProperties; @Component -@ComponentScan({"pub.dtm.client.feign", "pub.dtm.client"}) +@ComponentScan({"pub.dtm.client"}) @Configuration -@EnableFeignClients("pub.dtm.client.feign") +@EnableFeignClients("pub.dtm.client.communication") @EnableConfigurationProperties(DtmProperties.class) public class DtmConfiguration { @Autowired diff --git a/pom.xml b/pom.xml index ba38075..b48857a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - pub.dtm + io.github.dtm-labs dtmcli-java-parent - 1.0.0 + 2.0.3-Release pom dtmcli-java-parent + The java client for dtm + https://github.com/dtm-labs/dtmcli-java dtmcli-common @@ -92,25 +94,181 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - - ${project.build.sourceEncoding} - - - - + + + + MIT + https://spdx.org/licenses/MIT.html + + + + https://github.com/dtm-labs/dtmcli-java.git + https://github.com/dtm-labs/dtmcli-java + + + + horseLk + horsekiao@gmail.com + + Developer + + +8 + + + + + + release + + + + src/main/java + + **/*.properties + **/*.sample + + + + dtmcli-common/src/main/java + + **/*.properties + **/*.sample + + + + dtmcli-core/src/main/java + + **/*.properties + **/*.sample + + + + dtmcli-java/src/main/java + + **/*.properties + **/*.sample + + + dtmcli-spring/src/main/java + + **/*.properties + **/*.sa + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + ${project.build.sourceEncoding} + + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + private + true + UTF-8 + UTF-8 + UTF-8 + -Xdoclint:none + /Library/Java/JavaVirtualMachines/jdk1.8.0_261.jdk/Contents/Home/bin/javadoc + + + + + package + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + verify + + sign + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + 1.8 + 1.8 + true + true + UTF-8 + false + ${project.build.sourceEncoding} + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.1 + + + + + + ossrh + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + + ossrh + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 600f6a4fd4d3405dda19e3123ed6daa56d4e71f8 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Mon, 16 May 2022 00:18:45 +0800 Subject: [PATCH 10/24] update to 2.0.4 --- dtmcli-common/pom.xml | 4 ++-- dtmcli-core/pom.xml | 6 +++--- dtmcli-java/pom.xml | 8 ++++---- {dtmcli-spring => dtmcli-springcloud}/pom.xml | 12 ++++++------ .../java/pub/dtm/client/springcloud}/DtmClient.java | 10 +++------- .../springcloud}/communication/DtmFeignClient.java | 8 ++++---- .../client/springcloud}/communication/URIParser.java | 2 +- .../springcloud}/configuration/DtmConfiguration.java | 8 ++++---- .../springcloud}/properties/DtmProperties.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- pom.xml | 4 ++-- 11 files changed, 31 insertions(+), 35 deletions(-) rename {dtmcli-spring => dtmcli-springcloud}/pom.xml (93%) rename {dtmcli-spring/src/main/java/pub/dtm/client => dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud}/DtmClient.java (94%) rename {dtmcli-spring/src/main/java/pub/dtm/client => dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud}/communication/DtmFeignClient.java (98%) rename {dtmcli-spring/src/main/java/pub/dtm/client => dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud}/communication/URIParser.java (97%) rename {dtmcli-spring/src/main/java/pub/dtm/client => dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud}/configuration/DtmConfiguration.java (90%) rename {dtmcli-spring/src/main/java/pub/dtm/client => dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud}/properties/DtmProperties.java (96%) rename {dtmcli-spring => dtmcli-springcloud}/src/main/resources/META-INF/spring.factories (53%) diff --git a/dtmcli-common/pom.xml b/dtmcli-common/pom.xml index 19ce8ea..1b37747 100644 --- a/dtmcli-common/pom.xml +++ b/dtmcli-common/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.0.3-Release + 2.0.4 4.0.0 dtmcli-common - 2.0.3-Release + 2.0.4 jar dtmcli-common diff --git a/dtmcli-core/pom.xml b/dtmcli-core/pom.xml index d0a4432..112ddfc 100644 --- a/dtmcli-core/pom.xml +++ b/dtmcli-core/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.0.3-Release + 2.0.4 4.0.0 dtmcli-core - 2.0.3-Release + 2.0.4 jar dtmcli-core @@ -24,7 +24,7 @@ io.github.dtm-labs dtmcli-common - 2.0.3-Release + 2.0.4 diff --git a/dtmcli-java/pom.xml b/dtmcli-java/pom.xml index d8182df..9290278 100644 --- a/dtmcli-java/pom.xml +++ b/dtmcli-java/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.0.3-Release + 2.0.4 4.0.0 dtmcli-java - 2.0.3-Release + 2.0.4 jar dtmcli-java @@ -24,13 +24,13 @@ io.github.dtm-labs dtmcli-common - 2.0.3-Release + 2.0.4 io.github.dtm-labs dtmcli-core - 2.0.3-Release + 2.0.4 diff --git a/dtmcli-spring/pom.xml b/dtmcli-springcloud/pom.xml similarity index 93% rename from dtmcli-spring/pom.xml rename to dtmcli-springcloud/pom.xml index 7f927de..4e3a3c6 100644 --- a/dtmcli-spring/pom.xml +++ b/dtmcli-springcloud/pom.xml @@ -5,14 +5,14 @@ dtmcli-java-parent io.github.dtm-labs - 2.0.3-Release + 2.0.4 4.0.0 - dtmcli-spring - 2.0.3-Release + dtmcli-springcloud + 2.0.4 jar - dtmcli-spring + dtmcli-springcloud UTF-8 @@ -29,13 +29,13 @@ io.github.dtm-labs dtmcli-common - 2.0.3-Release + 2.0.4 io.github.dtm-labs dtmcli-core - 2.0.3-Release + 2.0.4 diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/DtmClient.java similarity index 94% rename from dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/DtmClient.java index a28b284..982e2b6 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/DtmClient.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/DtmClient.java @@ -22,12 +22,12 @@ * SOFTWARE. */ -package pub.dtm.client; +package pub.dtm.client.springcloud; -import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; -import pub.dtm.client.interfaces.dtm.DtmConsumer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; +import pub.dtm.client.interfaces.dtm.DtmConsumer; import pub.dtm.client.saga.Saga; import pub.dtm.client.tcc.Tcc; @@ -36,10 +36,6 @@ public class DtmClient { @Autowired private IDtmCommunicationClient dtmCommunicationClient; - public DtmClient(IDtmCommunicationClient dtmCommunicationClient) { - this.dtmCommunicationClient = dtmCommunicationClient; - } - /** * start a tcc transaction without gid, client send a request to dtm svr for obtain a new gid. * @return gid diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/communication/DtmFeignClient.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/DtmFeignClient.java similarity index 98% rename from dtmcli-spring/src/main/java/pub/dtm/client/communication/DtmFeignClient.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/DtmFeignClient.java index 9a4a1b5..04fa15f 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/communication/DtmFeignClient.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/DtmFeignClient.java @@ -22,12 +22,9 @@ * SOFTWARE. */ -package pub.dtm.client.communication; +package pub.dtm.client.springcloud.communication; -import pub.dtm.client.constant.Constants; import feign.Response; -import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; -import pub.dtm.client.model.param.OperatorParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.http.MediaType; @@ -35,6 +32,9 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import pub.dtm.client.constant.Constants; +import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; +import pub.dtm.client.model.param.OperatorParam; import pub.dtm.client.model.responses.DtmResponse; import java.net.URI; diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/communication/URIParser.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/URIParser.java similarity index 97% rename from dtmcli-spring/src/main/java/pub/dtm/client/communication/URIParser.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/URIParser.java index d6b098e..7845e89 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/communication/URIParser.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/URIParser.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.communication; +package pub.dtm.client.springcloud.communication; import pub.dtm.client.constant.Constants; import pub.dtm.client.interfaces.communication.IURIParser; diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/configuration/DtmConfiguration.java similarity index 90% rename from dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/configuration/DtmConfiguration.java index dcd5c52..940db45 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/configuration/DtmConfiguration.java @@ -22,9 +22,9 @@ * SOFTWARE. */ -package pub.dtm.client.configuration; +package pub.dtm.client.springcloud.configuration; -import pub.dtm.client.communication.URIParser; +import pub.dtm.client.springcloud.communication.URIParser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -33,12 +33,12 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import pub.dtm.client.properties.DtmProperties; +import pub.dtm.client.springcloud.properties.DtmProperties; @Component @ComponentScan({"pub.dtm.client"}) @Configuration -@EnableFeignClients("pub.dtm.client.communication") +@EnableFeignClients("pub.dtm.client.springcloud.communication") @EnableConfigurationProperties(DtmProperties.class) public class DtmConfiguration { @Autowired diff --git a/dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/properties/DtmProperties.java similarity index 96% rename from dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/properties/DtmProperties.java index 3f7e5d9..695a6a4 100644 --- a/dtmcli-spring/src/main/java/pub/dtm/client/properties/DtmProperties.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/properties/DtmProperties.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.properties; +package pub.dtm.client.springcloud.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/dtmcli-spring/src/main/resources/META-INF/spring.factories b/dtmcli-springcloud/src/main/resources/META-INF/spring.factories similarity index 53% rename from dtmcli-spring/src/main/resources/META-INF/spring.factories rename to dtmcli-springcloud/src/main/resources/META-INF/spring.factories index f780708..14a43a5 100644 --- a/dtmcli-spring/src/main/resources/META-INF/spring.factories +++ b/dtmcli-springcloud/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=pub.dtm.client.configuration.DtmConfiguration \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=pub.dtm.client.springcloud.configuration.DtmConfiguration \ No newline at end of file diff --git a/pom.xml b/pom.xml index b48857a..87464b7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.dtm-labs dtmcli-java-parent - 2.0.3-Release + 2.0.4 pom dtmcli-java-parent @@ -16,7 +16,7 @@ dtmcli-common dtmcli-core - dtmcli-spring + dtmcli-springcloud dtmcli-java From a8fb4e19c548bfaee9a4df8e3abb7ea35414d914 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Mon, 16 May 2022 22:57:44 +0800 Subject: [PATCH 11/24] boot2.6.x --- dtmcli-springcloud/pom.xml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dtmcli-springcloud/pom.xml b/dtmcli-springcloud/pom.xml index 4e3a3c6..b0b40cf 100644 --- a/dtmcli-springcloud/pom.xml +++ b/dtmcli-springcloud/pom.xml @@ -18,10 +18,11 @@ UTF-8 1.8 1.8 - 3.1.1 - 2021.0.1.0 - 2.1.2.RELEASE + + + 2021.0.1 + 2021.0.1.0 2.6.3 @@ -54,7 +55,7 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - ${cloud.nacos.version} + @@ -71,7 +72,7 @@ org.springframework.cloud spring-cloud-starter-openfeign - ${cloud.feign.version} + org.springframework.cloud @@ -89,6 +90,13 @@ pom import + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${alibaba-cloud.version} + pom + import + From 4503805f94b88e8fd47779b2b523751f97801e50 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Mon, 16 May 2022 23:21:17 +0800 Subject: [PATCH 12/24] update readme --- README.md | 58 ++++++++++++++++++++------------------ dtmcli-springcloud/pom.xml | 7 +---- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 12ca8cb..c06d904 100644 --- a/README.md +++ b/README.md @@ -45,29 +45,18 @@ DTM是一款跨语言的开源分布式事务管理器，优雅的解决了幂 ## 使用方式 -### 步骤一：JitPack 存储库添加到您的构建文件 - -Maven： - -```bash - - - jitpack.io - https://jitpack.io - - -``` - -Gradle： - -```bash -allprojects { - repositories { - ... - maven { url 'https://jitpack.io' } - } - } -``` +### 步骤一：确定你需要使用的版本 +1. 您的项目是springcloud项目 +- 您的项目中springboot版本>=2.4.0，请选择dtmcli-springcloud相应的版本直接接入即可 +- 您的项目中的springboot版本<2.4.0，请选择dtmcli-java接入，dtmcli-java也提供了微服务相关的接口，请设置nacos服务中心的相关配置即可使用 +2. 您的项目是普通项目/没有接入微服务的spring(boot)项目 +- 请选择dtmcli-java，并设置相应的配置即可 + +| artifact| version | 适用版本 |备注| +|:-----:|:----:|:----:|:----:| +|dtmcli-springcloud| 2.1.x| 2.6.0 <= springboot version < 2.6.latest| | +|dtmcli-springcloud| 2.1.x| 2.4.0 <= springboot version < 2.5.13| springboot 版本>=2.5.0，需要设置spring.cloud.compatibility-verifier.enabled=false| +|dtmcli-java| 2.1.x| others| | ### 步骤二：添加依赖项 @@ -75,9 +64,9 @@ Maven： ```bash - com.github.yedf - dtmcli-java - Tag + io.github.dtm-labs + dtmcli-springcloud + ${dtmcli.version} ``` @@ -85,10 +74,25 @@ Gradle: ```bash dependencies { - implementation 'com.github.yedf:dtmcli-java:Tag' + implementation 'io.github.dtm-labs:dtmcli-springcloud:${dtmcli.version}' } ``` +### 步骤三：设置dtmcli-java配置 +如果您引入了dtmcli-java，则需要新建一个`dtm-conf.properties`配置文件 +- 情形一：您引入了nacos等服务中心组件的配置文件 +``` +serverAddr=127.0.0.1:8848 +username=nacos +password=nacos +namespace=c3dc917d-906a-429d-90a9-85012b41014e +dtm.service.name=dtmService +dtm.service.registryType=nacos +``` +- 情形二：您直连dtmsvr +``` +dtm.ipport=127.0.0.1:36789 +``` ## 示例 ```bash diff --git a/dtmcli-springcloud/pom.xml b/dtmcli-springcloud/pom.xml index b0b40cf..fdb9803 100644 --- a/dtmcli-springcloud/pom.xml +++ b/dtmcli-springcloud/pom.xml @@ -18,9 +18,7 @@ UTF-8 1.8 1.8 - - - + 2021.0.1 2021.0.1.0 2.6.3 @@ -55,7 +53,6 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - @@ -72,12 +69,10 @@ org.springframework.cloud spring-cloud-starter-openfeign - org.springframework.cloud spring-cloud-loadbalancer - From 32d715de11891b87d3c05bde50ab94a4c92740fb Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Tue, 17 May 2022 22:28:33 +0800 Subject: [PATCH 13/24] upgrade version --- dtmcli-common/pom.xml | 4 ++-- dtmcli-core/pom.xml | 6 +++--- dtmcli-java/pom.xml | 8 ++++---- dtmcli-springcloud/pom.xml | 8 ++++---- .../java/pub/dtm/client/{springcloud => }/DtmClient.java | 2 +- .../{springcloud => }/communication/DtmFeignClient.java | 2 +- .../client/{springcloud => }/communication/URIParser.java | 2 +- .../{springcloud => }/configuration/DtmConfiguration.java | 8 ++++---- .../{springcloud => }/properties/DtmProperties.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- pom.xml | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) rename dtmcli-springcloud/src/main/java/pub/dtm/client/{springcloud => }/DtmClient.java (98%) rename dtmcli-springcloud/src/main/java/pub/dtm/client/{springcloud => }/communication/DtmFeignClient.java (98%) rename dtmcli-springcloud/src/main/java/pub/dtm/client/{springcloud => }/communication/URIParser.java (97%) rename dtmcli-springcloud/src/main/java/pub/dtm/client/{springcloud => }/configuration/DtmConfiguration.java (90%) rename dtmcli-springcloud/src/main/java/pub/dtm/client/{springcloud => }/properties/DtmProperties.java (96%) diff --git a/dtmcli-common/pom.xml b/dtmcli-common/pom.xml index 1b37747..c9f97ea 100644 --- a/dtmcli-common/pom.xml +++ b/dtmcli-common/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.0.4 + 2.1.0 4.0.0 dtmcli-common - 2.0.4 + 2.1.0 jar dtmcli-common diff --git a/dtmcli-core/pom.xml b/dtmcli-core/pom.xml index 112ddfc..9ff5b1b 100644 --- a/dtmcli-core/pom.xml +++ b/dtmcli-core/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.0.4 + 2.1.0 4.0.0 dtmcli-core - 2.0.4 + 2.1.0 jar dtmcli-core @@ -24,7 +24,7 @@ io.github.dtm-labs dtmcli-common - 2.0.4 + 2.1.0 diff --git a/dtmcli-java/pom.xml b/dtmcli-java/pom.xml index 9290278..fe8f5fb 100644 --- a/dtmcli-java/pom.xml +++ b/dtmcli-java/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.0.4 + 2.1.0 4.0.0 dtmcli-java - 2.0.4 + 2.1.0 jar dtmcli-java @@ -24,13 +24,13 @@ io.github.dtm-labs dtmcli-common - 2.0.4 + 2.1.0 io.github.dtm-labs dtmcli-core - 2.0.4 + 2.1.0 diff --git a/dtmcli-springcloud/pom.xml b/dtmcli-springcloud/pom.xml index fdb9803..11abf08 100644 --- a/dtmcli-springcloud/pom.xml +++ b/dtmcli-springcloud/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.0.4 + 2.1.0 4.0.0 dtmcli-springcloud - 2.0.4 + 2.1.0.2 jar dtmcli-springcloud @@ -28,13 +28,13 @@ io.github.dtm-labs dtmcli-common - 2.0.4 + 2.1.0 io.github.dtm-labs dtmcli-core - 2.0.4 + 2.1.0 diff --git a/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/DtmClient.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/DtmClient.java similarity index 98% rename from dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/DtmClient.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/DtmClient.java index 982e2b6..3a0c34a 100644 --- a/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/DtmClient.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/DtmClient.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.springcloud; +package pub.dtm.client; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/DtmFeignClient.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/communication/DtmFeignClient.java similarity index 98% rename from dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/DtmFeignClient.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/communication/DtmFeignClient.java index 04fa15f..25a6996 100644 --- a/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/DtmFeignClient.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/communication/DtmFeignClient.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.springcloud.communication; +package pub.dtm.client.communication; import feign.Response; import org.springframework.cloud.openfeign.FeignClient; diff --git a/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/URIParser.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/communication/URIParser.java similarity index 97% rename from dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/URIParser.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/communication/URIParser.java index 7845e89..d6b098e 100644 --- a/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/communication/URIParser.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/communication/URIParser.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.springcloud.communication; +package pub.dtm.client.communication; import pub.dtm.client.constant.Constants; import pub.dtm.client.interfaces.communication.IURIParser; diff --git a/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/configuration/DtmConfiguration.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java similarity index 90% rename from dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/configuration/DtmConfiguration.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java index 940db45..4a05b44 100644 --- a/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/configuration/DtmConfiguration.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java @@ -22,9 +22,10 @@ * SOFTWARE. */ -package pub.dtm.client.springcloud.configuration; +package pub.dtm.client.configuration; -import pub.dtm.client.springcloud.communication.URIParser; +import pub.dtm.client.communication.URIParser; +import pub.dtm.client.properties.DtmProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -33,12 +34,11 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import pub.dtm.client.springcloud.properties.DtmProperties; @Component @ComponentScan({"pub.dtm.client"}) @Configuration -@EnableFeignClients("pub.dtm.client.springcloud.communication") +@EnableFeignClients("pub.dtm.client.communication") @EnableConfigurationProperties(DtmProperties.class) public class DtmConfiguration { @Autowired diff --git a/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/properties/DtmProperties.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/properties/DtmProperties.java similarity index 96% rename from dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/properties/DtmProperties.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/properties/DtmProperties.java index 695a6a4..3f7e5d9 100644 --- a/dtmcli-springcloud/src/main/java/pub/dtm/client/springcloud/properties/DtmProperties.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/properties/DtmProperties.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.springcloud.properties; +package pub.dtm.client.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/dtmcli-springcloud/src/main/resources/META-INF/spring.factories b/dtmcli-springcloud/src/main/resources/META-INF/spring.factories index 14a43a5..f780708 100644 --- a/dtmcli-springcloud/src/main/resources/META-INF/spring.factories +++ b/dtmcli-springcloud/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=pub.dtm.client.springcloud.configuration.DtmConfiguration \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=pub.dtm.client.configuration.DtmConfiguration \ No newline at end of file diff --git a/pom.xml b/pom.xml index 87464b7..184b473 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.dtm-labs dtmcli-java-parent - 2.0.4 + 2.1.0 pom dtmcli-java-parent From 6cf770389267471649d5d6d9d474fa0daa6d6e53 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Wed, 18 May 2022 00:42:42 +0800 Subject: [PATCH 14/24] upgrade version --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c06d904..3f61250 100644 --- a/README.md +++ b/README.md @@ -54,9 +54,9 @@ DTM是一款跨语言的开源分布式事务管理器，优雅的解决了幂 | artifact| version | 适用版本 |备注| |:-----:|:----:|:----:|:----:| -|dtmcli-springcloud| 2.1.x| 2.6.0 <= springboot version < 2.6.latest| | -|dtmcli-springcloud| 2.1.x| 2.4.0 <= springboot version < 2.5.13| springboot 版本>=2.5.0，需要设置spring.cloud.compatibility-verifier.enabled=false| -|dtmcli-java| 2.1.x| others| | +|dtmcli-springcloud| 2.1.0.1| 2.4.0 <= springboot version < 2.5.13| springboot 版本>=2.5.0，需要设置spring.cloud.compatibility-verifier.enabled=false| +|dtmcli-springcloud| 2.1.0.2| 2.6.0 <= springboot version < 2.6.latest| | +|dtmcli-java| 2.1.0| others| | ### 步骤二：添加依赖项 @@ -129,7 +129,11 @@ dtm.ipport=127.0.0.1:36789 ### 完整示例 +#### dtmcli-java使用示例 [dtmcli-java-sample](https://github.com/dtm-labs/dtmcli-java-sample) +[dtmcli-java-sample-use-configuration](https://github.com/horseLk/dtmcli-java-conf) +#### dtmcli-springcloud使用示例 +[dtmcli-java-spring-sample](https://github.com/dtm-labs/dtmcli-java-spring-sample) ### License From eeff36034efd705a64feb7598697e7febbffb0a8 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Wed, 18 May 2022 01:12:29 +0800 Subject: [PATCH 15/24] update reademe --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f61250..eecfa20 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ dtm.ipport=127.0.0.1:36789 #### dtmcli-java使用示例 [dtmcli-java-sample](https://github.com/dtm-labs/dtmcli-java-sample) -[dtmcli-java-sample-use-configuration](https://github.com/horseLk/dtmcli-java-conf) +[dtmcli-java-sample-use-configuration](https://github.com/horseLk/dtmcli-java-sample-with-conf) #### dtmcli-springcloud使用示例 [dtmcli-java-spring-sample](https://github.com/dtm-labs/dtmcli-java-spring-sample) From 005303a2945bdd229243a6796c7d3bd1048f3eff Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Wed, 18 May 2022 23:10:26 +0800 Subject: [PATCH 16/24] add server center plugin --- dtmcli-springcloud/pom.xml | 27 -------- eureka-plugin/pom.xml | 61 ++++++++++++++++ .../configuration/EurekaConfiguration.java | 11 +++ nacos-plugin/pom.xml | 69 +++++++++++++++++++ pom.xml | 2 + 5 files changed, 143 insertions(+), 27 deletions(-) create mode 100644 eureka-plugin/pom.xml create mode 100644 eureka-plugin/src/main/java/pub/dtm/client/configuration/EurekaConfiguration.java create mode 100644 nacos-plugin/pom.xml diff --git a/dtmcli-springcloud/pom.xml b/dtmcli-springcloud/pom.xml index 11abf08..a46bcb6 100644 --- a/dtmcli-springcloud/pom.xml +++ b/dtmcli-springcloud/pom.xml @@ -50,30 +50,10 @@ true - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - - - com.netflix.ribbon - ribbon - - - - org.springframework.cloud spring-cloud-starter-openfeign - - org.springframework.cloud - spring-cloud-loadbalancer - @@ -85,13 +65,6 @@ pom import - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${alibaba-cloud.version} - pom - import - diff --git a/eureka-plugin/pom.xml b/eureka-plugin/pom.xml new file mode 100644 index 0000000..ea11d35 --- /dev/null +++ b/eureka-plugin/pom.xml @@ -0,0 +1,61 @@ + + + + dtmcli-java-parent + io.github.dtm-labs + 2.1.0 + + 4.0.0 + + eureka-plugin + 2.1.0 + jar + nacos-plugin + + + UTF-8 + 1.8 + 1.8 + + 2021.0.1 + 2.6.3 + + + + + org.springframework.boot + spring-boot-starter + ${springboot.version} + + + + org.springframework.boot + spring-boot-configuration-processor + ${springboot.version} + true + + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + \ No newline at end of file diff --git a/eureka-plugin/src/main/java/pub/dtm/client/configuration/EurekaConfiguration.java b/eureka-plugin/src/main/java/pub/dtm/client/configuration/EurekaConfiguration.java new file mode 100644 index 0000000..070b634 --- /dev/null +++ b/eureka-plugin/src/main/java/pub/dtm/client/configuration/EurekaConfiguration.java @@ -0,0 +1,11 @@ +package pub.dtm.client.configuration; + +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; + +/** + * @author horseLk + * @date 2022-05-18 22:40 + */ +@EnableEurekaClient +public class EurekaConfiguration { +} diff --git a/nacos-plugin/pom.xml b/nacos-plugin/pom.xml new file mode 100644 index 0000000..06cd18c --- /dev/null +++ b/nacos-plugin/pom.xml @@ -0,0 +1,69 @@ + + + + dtmcli-java-parent + io.github.dtm-labs + 2.1.0 + + 4.0.0 + + nacos-plugin + 2.1.0 + jar + nacos-plugin + + + UTF-8 + 1.8 + 1.8 + + 2021.0.1 + 2021.0.1.0 + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + org.springframework.cloud + spring-cloud-starter-netflix-ribbon + + + com.netflix.ribbon + ribbon + + + + + + org.springframework.cloud + spring-cloud-loadbalancer + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${alibaba-cloud.version} + pom + import + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 184b473..5037ece 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,8 @@ dtmcli-core dtmcli-springcloud dtmcli-java + nacos-plugin + eureka-plugin From 8888e09f7732ac849b9434d8fc03825445642386 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Thu, 19 May 2022 23:19:30 +0800 Subject: [PATCH 17/24] upgrade --- dtmcli-common/pom.xml | 4 +-- dtmcli-core/pom.xml | 6 ++-- dtmcli-java/pom.xml | 8 +++--- dtmcli-springcloud/pom.xml | 23 +++------------ eureka-plugin/pom.xml | 22 ++------------- .../main/resources/META-INF/spring.factories | 1 + nacos-plugin/pom.xml | 28 ++----------------- pom.xml | 20 ++++++++++++- 8 files changed, 38 insertions(+), 74 deletions(-) create mode 100644 eureka-plugin/src/main/resources/META-INF/spring.factories diff --git a/dtmcli-common/pom.xml b/dtmcli-common/pom.xml index c9f97ea..5b45adc 100644 --- a/dtmcli-common/pom.xml +++ b/dtmcli-common/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.0 + 2.1.1 4.0.0 dtmcli-common - 2.1.0 + 2.1.1 jar dtmcli-common diff --git a/dtmcli-core/pom.xml b/dtmcli-core/pom.xml index 9ff5b1b..dbdb56c 100644 --- a/dtmcli-core/pom.xml +++ b/dtmcli-core/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.0 + 2.1.1 4.0.0 dtmcli-core - 2.1.0 + 2.1.1 jar dtmcli-core @@ -24,7 +24,7 @@ io.github.dtm-labs dtmcli-common - 2.1.0 + 2.1.1 diff --git a/dtmcli-java/pom.xml b/dtmcli-java/pom.xml index fe8f5fb..1ce28fe 100644 --- a/dtmcli-java/pom.xml +++ b/dtmcli-java/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.0 + 2.1.1 4.0.0 dtmcli-java - 2.1.0 + 2.1.1 jar dtmcli-java @@ -24,13 +24,13 @@ io.github.dtm-labs dtmcli-common - 2.1.0 + 2.1.1 io.github.dtm-labs dtmcli-core - 2.1.0 + 2.1.1 diff --git a/dtmcli-springcloud/pom.xml b/dtmcli-springcloud/pom.xml index a46bcb6..b9208da 100644 --- a/dtmcli-springcloud/pom.xml +++ b/dtmcli-springcloud/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.0 + 2.1.1 4.0.0 dtmcli-springcloud - 2.1.0.2 + 2.1.1.2 jar dtmcli-springcloud @@ -19,8 +19,6 @@ 1.8 1.8 - 2021.0.1 - 2021.0.1.0 2.6.3 @@ -28,13 +26,13 @@ io.github.dtm-labs dtmcli-common - 2.1.0 + 2.1.1 io.github.dtm-labs dtmcli-core - 2.1.0 + 2.1.1 @@ -56,17 +54,4 @@ - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - \ No newline at end of file diff --git a/eureka-plugin/pom.xml b/eureka-plugin/pom.xml index ea11d35..854e4b8 100644 --- a/eureka-plugin/pom.xml +++ b/eureka-plugin/pom.xml @@ -5,21 +5,20 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.0 + 2.1.1 4.0.0 eureka-plugin - 2.1.0 + 2.1.1.2 jar - nacos-plugin + eureka-plugin UTF-8 1.8 1.8 - 2021.0.1 2.6.3 @@ -43,19 +42,4 @@ spring-cloud-starter-netflix-eureka-client - - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - \ No newline at end of file diff --git a/eureka-plugin/src/main/resources/META-INF/spring.factories b/eureka-plugin/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..ed9756f --- /dev/null +++ b/eureka-plugin/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=pub.dtm.client.configuration.EurekaConfiguration \ No newline at end of file diff --git a/nacos-plugin/pom.xml b/nacos-plugin/pom.xml index 06cd18c..d310087 100644 --- a/nacos-plugin/pom.xml +++ b/nacos-plugin/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.0 + 2.1.1 4.0.0 nacos-plugin - 2.1.0 + 2.1.1.2 jar nacos-plugin @@ -18,9 +18,6 @@ UTF-8 1.8 1.8 - - 2021.0.1 - 2021.0.1.0 @@ -45,25 +42,4 @@ spring-cloud-loadbalancer - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${alibaba-cloud.version} - pom - import - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5037ece..0f215b1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.dtm-labs dtmcli-java-parent - 2.1.0 + 2.1.1 pom dtmcli-java-parent @@ -35,6 +35,8 @@ 3.14.9 1.4.2 1.7.30 + 2021.0.1 + 2021.0.1.0 @@ -93,6 +95,22 @@ slf4j-api ${slf4j.version} + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${alibaba-cloud.version} + pom + import + From 1b4e31d186bd45c038cc18a055dd1ca851538c34 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Fri, 20 May 2022 23:48:01 +0800 Subject: [PATCH 18/24] fix --- LICENSE | 2 +- .../pub/dtm/client/constant/Constants.java | 2 +- .../client/constant/ParamFieldConstants.java | 2 +- .../pub/dtm/client/enums/TransTypeEnum.java | 2 +- .../client/exception/FailureException.java | 2 +- .../client/interfaces/dtm/DtmConsumer.java | 2 +- .../IDtmServerStub.java} | 8 +++--- .../{communication => stub}/IURIParser.java | 4 +-- .../pub/dtm/client/log/DtmFeignLogger.java | 2 +- .../pub/dtm/client/model/dtm/TransBase.java | 2 +- .../client/model/feign/ServiceMessage.java | 2 +- .../dtm/client/model/param/OperatorParam.java | 2 +- .../client/model/param/SagaOperatorParam.java | 2 +- .../client/model/param/TccOperatorParam.java | 2 +- .../client/model/responses/DtmResponse.java | 2 +- .../java/pub/dtm/client/utils/FeignUtils.java | 4 +-- .../java/pub/dtm/client/utils/HttpUtils.java | 2 +- .../java/pub/dtm/client/utils/JsonUtils.java | 2 +- .../pub/dtm/client/barrier/BarrierParam.java | 2 +- .../pub/dtm/client/barrier/BranchBarrier.java | 2 +- .../dtm/client/base/BranchIdGenerator.java | 2 +- .../main/java/pub/dtm/client/saga/Saga.java | 14 +++++----- .../src/main/java/pub/dtm/client/tcc/Tcc.java | 28 +++++++++---------- .../main/java/pub/dtm/client/DtmClient.java | 26 ++++++++--------- .../dtm/client/properties/DtmProperties.java | 8 +++++- .../DtmFeignClient.java | 13 ++++++--- .../{communication => stub}/URIParser.java | 11 ++++++-- .../java/pub/dtm/client/utils/NacosUtils.java | 7 ++++- .../main/java/pub/dtm/client/DtmClient.java | 19 ++++++++----- .../configuration/DtmConfiguration.java | 11 ++++++-- .../dtm/client/properties/DtmProperties.java | 7 ++++- .../DtmFeignClient.java | 13 ++++++--- .../{communication => stub}/URIParser.java | 11 ++++++-- .../configuration/EurekaConfiguration.java | 27 +++++++++++++++++- 34 files changed, 159 insertions(+), 88 deletions(-) rename dtmcli-common/src/main/java/pub/dtm/client/interfaces/{communication/IDtmCommunicationClient.java => stub/IDtmServerStub.java} (91%) rename dtmcli-common/src/main/java/pub/dtm/client/interfaces/{communication => stub}/IURIParser.java (95%) rename dtmcli-java/src/main/java/pub/dtm/client/{communication => stub}/DtmFeignClient.java (91%) rename dtmcli-java/src/main/java/pub/dtm/client/{communication => stub}/URIParser.java (91%) rename dtmcli-springcloud/src/main/java/pub/dtm/client/{communication => stub}/DtmFeignClient.java (92%) rename dtmcli-springcloud/src/main/java/pub/dtm/client/{communication => stub}/URIParser.java (90%) diff --git a/LICENSE b/LICENSE index 5dabd2b..9161855 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 yedf +Copyright (c) 2022 dtm-labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java b/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java index 1beb3f5..a0fb213 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/constant/Constants.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java b/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java index eea3fb4..0a38075 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/constant/ParamFieldConstants.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java b/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java index 77c64d3..21d881b 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/enums/TransTypeEnum.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java b/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java index de02747..c5dc22a 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/exception/FailureException.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java index 35dd954..0d7034e 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/dtm/DtmConsumer.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IDtmCommunicationClient.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/stub/IDtmServerStub.java similarity index 91% rename from dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IDtmCommunicationClient.java rename to dtmcli-common/src/main/java/pub/dtm/client/interfaces/stub/IDtmServerStub.java index 9e61358..8d9cd64 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IDtmCommunicationClient.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/stub/IDtmServerStub.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.interfaces.communication; +package pub.dtm.client.interfaces.stub; import feign.Response; import pub.dtm.client.model.param.OperatorParam; @@ -32,11 +32,11 @@ import java.util.Map; /** - * A feign client interface for dtm svr, we designed different implements for different client. + * A stub interface for dtm svr, different client has different implements. * * @author horseLk */ -public interface IDtmCommunicationClient { +public interface IDtmServerStub { /** * get stubType * @return type diff --git a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IURIParser.java b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/stub/IURIParser.java similarity index 95% rename from dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IURIParser.java rename to dtmcli-common/src/main/java/pub/dtm/client/interfaces/stub/IURIParser.java index d994fca..3a77e8b 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/interfaces/communication/IURIParser.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/interfaces/stub/IURIParser.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.interfaces.communication; +package pub.dtm.client.interfaces.stub; import pub.dtm.client.model.feign.ServiceMessage; diff --git a/dtmcli-common/src/main/java/pub/dtm/client/log/DtmFeignLogger.java b/dtmcli-common/src/main/java/pub/dtm/client/log/DtmFeignLogger.java index fb1a27b..ebd1d7c 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/log/DtmFeignLogger.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/log/DtmFeignLogger.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java b/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java index 9a3070a..89c5397 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/dtm/TransBase.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java b/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java index 34a824c..4d570be 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/feign/ServiceMessage.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java b/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java index f523278..efa334d 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/param/OperatorParam.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/param/SagaOperatorParam.java b/dtmcli-common/src/main/java/pub/dtm/client/model/param/SagaOperatorParam.java index 6a25dad..cbe06ae 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/model/param/SagaOperatorParam.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/param/SagaOperatorParam.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/param/TccOperatorParam.java b/dtmcli-common/src/main/java/pub/dtm/client/model/param/TccOperatorParam.java index 1bb4175..11d3b6c 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/model/param/TccOperatorParam.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/param/TccOperatorParam.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java b/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java index 8ad9a68..799a8ad 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/model/responses/DtmResponse.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java index 9bf5aa3..45a9544 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/FeignUtils.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ import pub.dtm.client.constant.Constants; import pub.dtm.client.exception.FailureException; import feign.Response; -import pub.dtm.client.interfaces.communication.IURIParser; +import pub.dtm.client.interfaces.stub.IURIParser; import pub.dtm.client.model.feign.ServiceMessage; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java index f04d24e..94a9e68 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/HttpUtils.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-common/src/main/java/pub/dtm/client/utils/JsonUtils.java b/dtmcli-common/src/main/java/pub/dtm/client/utils/JsonUtils.java index ca381c2..9bf435b 100644 --- a/dtmcli-common/src/main/java/pub/dtm/client/utils/JsonUtils.java +++ b/dtmcli-common/src/main/java/pub/dtm/client/utils/JsonUtils.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java index e2d65c8..2af09f2 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BarrierParam.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java index ac976b8..05ed66c 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/barrier/BranchBarrier.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java b/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java index c76fee2..3725ab3 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/base/BranchIdGenerator.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java b/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java index 723843e..e23bde1 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/saga/Saga.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -32,7 +32,7 @@ import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; import pub.dtm.client.exception.FailureException; -import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; +import pub.dtm.client.interfaces.stub.IDtmServerStub; import pub.dtm.client.model.dtm.TransBase; import pub.dtm.client.model.feign.ServiceMessage; import pub.dtm.client.model.param.SagaOperatorParam; @@ -58,7 +58,7 @@ public class Saga extends TransBase { private static final String CONCURRENT = "concurrent"; - private IDtmCommunicationClient dtmCommunicationClient; + private IDtmServerStub dtmServerStub; private boolean concurrent; @@ -78,11 +78,11 @@ public class Saga extends TransBase { private List payloads = new ArrayList<>(); - public Saga(String gid, IDtmCommunicationClient dtmCommunicationClient) { + public Saga(String gid, IDtmServerStub dtmServerStub) { super(gid, TransTypeEnum.SAGA, false); this.concurrent = false; this.orders = new HashMap<>(); - this.dtmCommunicationClient = dtmCommunicationClient; + this.dtmServerStub = dtmServerStub; } public Saga add(ServiceMessage action, ServiceMessage compensate, Object postData) { @@ -114,7 +114,7 @@ public Saga add(String action, String compensate, Object postData) { public String submit() throws Exception { if (StringUtils.isEmpty(this.getGid())) { - this.setGid(FeignUtils.parseGid(dtmCommunicationClient.newGid())); + this.setGid(FeignUtils.parseGid(dtmServerStub.newGid())); } addConcurrentContext(); SagaOperatorParam operatorParam = new SagaOperatorParam(this.getGid(), TransTypeEnum.SAGA, this.getSteps(), @@ -122,7 +122,7 @@ public String submit() throws Exception { this.getRetryInterval(), this.getPassthroughHeaders(), this.getBranchHeaders()); try { - dtmCommunicationClient.submit(operatorParam); + dtmServerStub.submit(operatorParam); } catch (Exception e) { log.error("saga transaction submit failed, transaction gid is {}", this.getGid()); throw new FailureException(e); diff --git a/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java index 5a30c4a..1f36242 100644 --- a/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java +++ b/dtmcli-core/src/main/java/pub/dtm/client/tcc/Tcc.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -30,7 +30,7 @@ import pub.dtm.client.constant.ParamFieldConstants; import pub.dtm.client.enums.TransTypeEnum; import pub.dtm.client.exception.FailureException; -import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; +import pub.dtm.client.interfaces.stub.IDtmServerStub; import pub.dtm.client.interfaces.dtm.DtmConsumer; import pub.dtm.client.model.dtm.TransBase; import pub.dtm.client.model.feign.ServiceMessage; @@ -68,16 +68,16 @@ public class Tcc extends TransBase { /** * feign client */ - private IDtmCommunicationClient dtmCommunicationClient; + private IDtmServerStub dtmServerStub; - public Tcc(String gid, IDtmCommunicationClient dtmCommunicationClient) { + public Tcc(String gid, IDtmServerStub dtmServerStub) { super(gid, TransTypeEnum.TCC, false); this.branchIdGenerator = new BranchIdGenerator(Constants.EMPTY_STRING); - this.dtmCommunicationClient = dtmCommunicationClient; + this.dtmServerStub = dtmServerStub; } - public void setdtmCommunicationClient(IDtmCommunicationClient dtmCommunicationClient) { - this.dtmCommunicationClient = dtmCommunicationClient; + public void setDtmServerStub(IDtmServerStub dtmServerStub) { + this.dtmServerStub = dtmServerStub; } /** @@ -89,12 +89,12 @@ public void setdtmCommunicationClient(IDtmCommunicationClient dtmCommunicationCl public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { // if tcc's gid is empty, need to request a new gid from dtm svr if (StringUtils.isEmpty(this.getGid())) { - this.setGid(FeignUtils.parseGid(dtmCommunicationClient.newGid())); + this.setGid(FeignUtils.parseGid(dtmServerStub.newGid())); } log.info("the tcc transaction's gid is {}", this.getGid()); OperatorParam operatorParam = new OperatorParam(this.getGid(), TransTypeEnum.TCC); - DtmResponse resp = dtmCommunicationClient.prepare(operatorParam); + DtmResponse resp = dtmServerStub.prepare(operatorParam); log.info("prepare response: {}", resp); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction prepare fail. returned dtm_result is: {}, transaction gid: {}", resp.getDtmResult(), this.getGid()); @@ -102,10 +102,10 @@ public String tccGlobalTransaction(DtmConsumer consumer) throws Exception { } try { consumer.accept(this); - dtmCommunicationClient.submit(operatorParam); + dtmServerStub.submit(operatorParam); } catch (Exception e) { log.error("TCC transaction submit fail, start abort it. transaction gid: {}", this.getGid()); - dtmCommunicationClient.abort(operatorParam); + dtmServerStub.abort(operatorParam); throw new FailureException(e); } return this.getGid(); @@ -128,7 +128,7 @@ public feign.Response callBranch(Object body, ServiceMessage tryMessage, Service TccOperatorParam operatorParam = new TccOperatorParam(this.getGid(), TransTypeEnum.TCC, branchId, Constants.DEFAULT_STATUS, JsonUtils.toJson(body), FeignUtils.generatorURI(confirmMessage, false), FeignUtils.generatorURI(cancelMessage, false)); - DtmResponse resp = dtmCommunicationClient.registerBranch(operatorParam); + DtmResponse resp = dtmServerStub.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); throw new FailureException("TCC Transaction register branch fail"); @@ -140,7 +140,7 @@ public feign.Response callBranch(Object body, ServiceMessage tryMessage, Service paramsMap.put(ParamFieldConstants.BRANCH_ID, branchId); paramsMap.put(ParamFieldConstants.OP, OP); - feign.Response response = dtmCommunicationClient.busiPost(new URI(FeignUtils.generatorURI(tryMessage, true)), + feign.Response response = dtmServerStub.busiPost(new URI(FeignUtils.generatorURI(tryMessage, true)), tryMessage.getPath(), paramsMap, body); log.info("busi post is: {}", response); FeignUtils.checkResult(response); @@ -163,7 +163,7 @@ public Response callBranch(Object body, String tryUrl, String confirmUrl, String TccOperatorParam operatorParam = new TccOperatorParam(this.getGid(), TransTypeEnum.TCC, branchId, Constants.DEFAULT_STATUS, JsonUtils.toJson(body), confirmUrl, cancelUrl); - DtmResponse resp = dtmCommunicationClient.registerBranch(operatorParam); + DtmResponse resp = dtmServerStub.registerBranch(operatorParam); if (!Constants.SUCCESS_RESULT.equals(resp.getDtmResult())) { log.error("TCC transaction register branch fail. transaction gid: {}", this.getGid()); throw new FailureException("TCC Transaction register branch fail"); diff --git a/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java index d23da09..201dd5b 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -28,11 +28,11 @@ import feign.jackson.JacksonDecoder; import feign.jackson.JacksonEncoder; import pub.dtm.client.constant.Constants; -import pub.dtm.client.communication.DtmFeignClient; +import pub.dtm.client.stub.DtmFeignClient; import feign.Feign; -import pub.dtm.client.communication.URIParser; +import pub.dtm.client.stub.URIParser; import pub.dtm.client.interfaces.dtm.DtmConsumer; -import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; +import pub.dtm.client.interfaces.stub.IDtmServerStub; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +53,7 @@ public class DtmClient { private static final Logger log = LoggerFactory.getLogger(DtmClient.class); - private IDtmCommunicationClient dtmCommunicationClient; + private IDtmServerStub dtmServerStub; public DtmClient() { // init URIParser @@ -77,7 +77,7 @@ public DtmClient() { log.error("can not resolve dtm server message from config file, you can use nacos or redirect configure to config it."); System.exit(-1); } - IDtmCommunicationClient feignClient = Feign + IDtmServerStub feignClient = Feign .builder() .decoder(new JacksonDecoder()) .encoder(new JacksonEncoder()) @@ -90,7 +90,7 @@ public DtmClient() { System.exit(-1); } - this.dtmCommunicationClient = feignClient; + this.dtmServerStub = feignClient; } public DtmClient(String endpoint) { @@ -101,7 +101,7 @@ public DtmClient(String endpoint) { log.error("dtm server endpoint can not be empty."); System.exit(-1); } - IDtmCommunicationClient feignClient = Feign + IDtmServerStub feignClient = Feign .builder() .decoder(new JacksonDecoder()) .encoder(new JacksonEncoder()) @@ -115,7 +115,7 @@ public DtmClient(String endpoint) { System.exit(-1); } - this.dtmCommunicationClient = feignClient; + this.dtmServerStub = feignClient; } private List genClusters(String clusterStr) { @@ -135,7 +135,7 @@ private List genClusters(String clusterStr) { * @throws Exception exception */ public String tccGlobalTransaction(DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(null, dtmCommunicationClient); + Tcc tcc = new Tcc(null, dtmServerStub); return tcc.tccGlobalTransaction(function); } @@ -147,7 +147,7 @@ public String tccGlobalTransaction(DtmConsumer function) throws Exception { * @throws Exception exception */ public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(gid, dtmCommunicationClient); + Tcc tcc = new Tcc(gid, dtmServerStub); return tcc.tccGlobalTransaction(function); } @@ -157,7 +157,7 @@ public String tccGlobalTransaction(String gid, DtmConsumer function) throws * @return Saga */ public Saga newSaga(String gid) { - return new Saga(gid, dtmCommunicationClient); + return new Saga(gid, dtmServerStub); } /** @@ -165,6 +165,6 @@ public Saga newSaga(String gid) { * @return Saga */ public Saga newSaga() { - return new Saga(null, dtmCommunicationClient); + return new Saga(null, dtmServerStub); } } diff --git a/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java b/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java index 06bb7b9..7f8c156 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/properties/DtmProperties.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -28,6 +28,12 @@ import java.io.IOException; import java.util.Properties; + +/** + * Load properties of dtm server + * + * @author horse + */ public class DtmProperties { private static Properties dtmProperties; diff --git a/dtmcli-java/src/main/java/pub/dtm/client/communication/DtmFeignClient.java b/dtmcli-java/src/main/java/pub/dtm/client/stub/DtmFeignClient.java similarity index 91% rename from dtmcli-java/src/main/java/pub/dtm/client/communication/DtmFeignClient.java rename to dtmcli-java/src/main/java/pub/dtm/client/stub/DtmFeignClient.java index c9e6b5c..1afbeb3 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/communication/DtmFeignClient.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/stub/DtmFeignClient.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.communication; +package pub.dtm.client.stub; import feign.Headers; import feign.Param; @@ -30,15 +30,20 @@ import feign.RequestLine; import feign.Response; import pub.dtm.client.constant.Constants; -import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; +import pub.dtm.client.interfaces.stub.IDtmServerStub; import pub.dtm.client.model.param.OperatorParam; import pub.dtm.client.model.responses.DtmResponse; import java.net.URI; import java.util.Map; +/** + * IDtmServerStub implements for open-feign + * + * @author horse + */ @Headers("Content-Type: application/json") -public interface DtmFeignClient extends IDtmCommunicationClient { +public interface DtmFeignClient extends IDtmServerStub { @Override default String stubType() { return "open-feign"; diff --git a/dtmcli-java/src/main/java/pub/dtm/client/communication/URIParser.java b/dtmcli-java/src/main/java/pub/dtm/client/stub/URIParser.java similarity index 91% rename from dtmcli-java/src/main/java/pub/dtm/client/communication/URIParser.java rename to dtmcli-java/src/main/java/pub/dtm/client/stub/URIParser.java index 912dda8..e62b1b3 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/communication/URIParser.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/stub/URIParser.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,16 +22,21 @@ * SOFTWARE. */ -package pub.dtm.client.communication; +package pub.dtm.client.stub; import com.alibaba.nacos.api.naming.pojo.Instance; import pub.dtm.client.constant.Constants; -import pub.dtm.client.interfaces.communication.IURIParser; +import pub.dtm.client.interfaces.stub.IURIParser; import pub.dtm.client.model.feign.ServiceMessage; import pub.dtm.client.properties.DtmProperties; import pub.dtm.client.utils.FeignUtils; import pub.dtm.client.utils.NacosUtils; +/** + * Parse url to dtm server for java client. + * + * @author horse + */ public class URIParser implements IURIParser { static { FeignUtils.setUriParser(new URIParser()); diff --git a/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java b/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java index 4529176..da45fd8 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/utils/NacosUtils.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -31,6 +31,11 @@ import java.util.List; +/** + * Nacos utils + * + * @author horse + */ public class NacosUtils { private static NamingService namingService; diff --git a/dtmcli-springcloud/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/DtmClient.java index 3a0c34a..20db1e1 100644 --- a/dtmcli-springcloud/src/main/java/pub/dtm/client/DtmClient.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/DtmClient.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -26,22 +26,27 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; +import pub.dtm.client.interfaces.stub.IDtmServerStub; import pub.dtm.client.interfaces.dtm.DtmConsumer; import pub.dtm.client.saga.Saga; import pub.dtm.client.tcc.Tcc; +/** + * dtm client for spring + * + * @author horseLk + */ @Component public class DtmClient { @Autowired - private IDtmCommunicationClient dtmCommunicationClient; + private IDtmServerStub dtmServerStub; /** * start a tcc transaction without gid, client send a request to dtm svr for obtain a new gid. * @return gid */ public String tccGlobalTransaction(DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(null, dtmCommunicationClient); + Tcc tcc = new Tcc(null, dtmServerStub); return tcc.tccGlobalTransaction(function); } @@ -51,7 +56,7 @@ public String tccGlobalTransaction(DtmConsumer function) throws Exception { * @return gid */ public String tccGlobalTransaction(String gid, DtmConsumer function) throws Exception { - Tcc tcc = new Tcc(gid, dtmCommunicationClient); + Tcc tcc = new Tcc(gid, dtmServerStub); return tcc.tccGlobalTransaction(function); } @@ -61,7 +66,7 @@ public String tccGlobalTransaction(String gid, DtmConsumer function) throws * @return Saga */ public Saga newSaga(String gid) { - return new Saga(gid, dtmCommunicationClient); + return new Saga(gid, dtmServerStub); } /** @@ -69,6 +74,6 @@ public Saga newSaga(String gid) { * @return Saga */ public Saga newSaga() { - return new Saga(null, dtmCommunicationClient); + return new Saga(null, dtmServerStub); } } diff --git a/dtmcli-springcloud/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java index 4a05b44..7f53c22 100644 --- a/dtmcli-springcloud/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/configuration/DtmConfiguration.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,7 +24,7 @@ package pub.dtm.client.configuration; -import pub.dtm.client.communication.URIParser; +import pub.dtm.client.stub.URIParser; import pub.dtm.client.properties.DtmProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -35,10 +35,15 @@ import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; +/** + * Dtm client configuration + * + * @author horse + */ @Component @ComponentScan({"pub.dtm.client"}) @Configuration -@EnableFeignClients("pub.dtm.client.communication") +@EnableFeignClients("pub.dtm.client.stub") @EnableConfigurationProperties(DtmProperties.class) public class DtmConfiguration { @Autowired diff --git a/dtmcli-springcloud/src/main/java/pub/dtm/client/properties/DtmProperties.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/properties/DtmProperties.java index 3f7e5d9..7ecd3b7 100644 --- a/dtmcli-springcloud/src/main/java/pub/dtm/client/properties/DtmProperties.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/properties/DtmProperties.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -27,6 +27,11 @@ import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; +/** + * Load properties of dtm server + * + * @author horse + */ @ConfigurationProperties(prefix = DtmProperties.PREFIX) @Data public class DtmProperties { diff --git a/dtmcli-springcloud/src/main/java/pub/dtm/client/communication/DtmFeignClient.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/stub/DtmFeignClient.java similarity index 92% rename from dtmcli-springcloud/src/main/java/pub/dtm/client/communication/DtmFeignClient.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/stub/DtmFeignClient.java index 25a6996..b1ffe93 100644 --- a/dtmcli-springcloud/src/main/java/pub/dtm/client/communication/DtmFeignClient.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/stub/DtmFeignClient.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package pub.dtm.client.communication; +package pub.dtm.client.stub; import feign.Response; import org.springframework.cloud.openfeign.FeignClient; @@ -33,15 +33,20 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import pub.dtm.client.constant.Constants; -import pub.dtm.client.interfaces.communication.IDtmCommunicationClient; +import pub.dtm.client.interfaces.stub.IDtmServerStub; import pub.dtm.client.model.param.OperatorParam; import pub.dtm.client.model.responses.DtmResponse; import java.net.URI; import java.util.Map; +/** + * IdtmServerStub implements for feign-spring + * + * @author horseLk + */ @FeignClient(value = "${dtm.service.name}") -public interface DtmFeignClient extends IDtmCommunicationClient { +public interface DtmFeignClient extends IDtmServerStub { @Override default String stubType() { return "feign-spring"; diff --git a/dtmcli-springcloud/src/main/java/pub/dtm/client/communication/URIParser.java b/dtmcli-springcloud/src/main/java/pub/dtm/client/stub/URIParser.java similarity index 90% rename from dtmcli-springcloud/src/main/java/pub/dtm/client/communication/URIParser.java rename to dtmcli-springcloud/src/main/java/pub/dtm/client/stub/URIParser.java index d6b098e..a3b3bbf 100644 --- a/dtmcli-springcloud/src/main/java/pub/dtm/client/communication/URIParser.java +++ b/dtmcli-springcloud/src/main/java/pub/dtm/client/stub/URIParser.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 yedf + * Copyright (c) 2022 dtm-labs * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,13 +22,18 @@ * SOFTWARE. */ -package pub.dtm.client.communication; +package pub.dtm.client.stub; import pub.dtm.client.constant.Constants; -import pub.dtm.client.interfaces.communication.IURIParser; +import pub.dtm.client.interfaces.stub.IURIParser; import pub.dtm.client.model.feign.ServiceMessage; import pub.dtm.client.utils.FeignUtils; +/** + * Parse url to dtm server for spring cloud client. + * + * @author horse + */ public class URIParser implements IURIParser { static { FeignUtils.setUriParser(new URIParser()); diff --git a/eureka-plugin/src/main/java/pub/dtm/client/configuration/EurekaConfiguration.java b/eureka-plugin/src/main/java/pub/dtm/client/configuration/EurekaConfiguration.java index 070b634..f62a267 100644 --- a/eureka-plugin/src/main/java/pub/dtm/client/configuration/EurekaConfiguration.java +++ b/eureka-plugin/src/main/java/pub/dtm/client/configuration/EurekaConfiguration.java @@ -1,10 +1,35 @@ +/* + * MIT License + * + * Copyright (c) 2022 dtm-labs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package pub.dtm.client.configuration; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; /** + * Eureka configuration + * * @author horseLk - * @date 2022-05-18 22:40 */ @EnableEurekaClient public class EurekaConfiguration { From 38ecfba3ac43bb54d1b01d5ef512dbc7de4ac217 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Sat, 21 May 2022 01:41:54 +0800 Subject: [PATCH 19/24] fix --- dtmcli-common/pom.xml | 4 ++-- dtmcli-core/pom.xml | 6 +++--- dtmcli-java/pom.xml | 8 ++++---- dtmcli-springcloud/pom.xml | 12 ++++-------- eureka-plugin/pom.xml | 8 ++------ nacos-plugin/pom.xml | 4 ++-- pom.xml | 16 +++++++++++++++- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/dtmcli-common/pom.xml b/dtmcli-common/pom.xml index 5b45adc..880ebee 100644 --- a/dtmcli-common/pom.xml +++ b/dtmcli-common/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.1 + 2.1.2 4.0.0 dtmcli-common - 2.1.1 + 2.1.2 jar dtmcli-common diff --git a/dtmcli-core/pom.xml b/dtmcli-core/pom.xml index dbdb56c..fc6bb4b 100644 --- a/dtmcli-core/pom.xml +++ b/dtmcli-core/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.1 + 2.1.2 4.0.0 dtmcli-core - 2.1.1 + 2.1.2 jar dtmcli-core @@ -24,7 +24,7 @@ io.github.dtm-labs dtmcli-common - 2.1.1 + 2.1.2 diff --git a/dtmcli-java/pom.xml b/dtmcli-java/pom.xml index 1ce28fe..7b1d514 100644 --- a/dtmcli-java/pom.xml +++ b/dtmcli-java/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.1 + 2.1.2 4.0.0 dtmcli-java - 2.1.1 + 2.1.2 jar dtmcli-java @@ -24,13 +24,13 @@ io.github.dtm-labs dtmcli-common - 2.1.1 + 2.1.2 io.github.dtm-labs dtmcli-core - 2.1.1 + 2.1.2 diff --git a/dtmcli-springcloud/pom.xml b/dtmcli-springcloud/pom.xml index b9208da..0197946 100644 --- a/dtmcli-springcloud/pom.xml +++ b/dtmcli-springcloud/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.1 + 2.1.2 4.0.0 dtmcli-springcloud - 2.1.1.2 + 2.1.2.2 jar dtmcli-springcloud @@ -18,33 +18,29 @@ UTF-8 1.8 1.8 - - 2.6.3 io.github.dtm-labs dtmcli-common - 2.1.1 + 2.1.2 io.github.dtm-labs dtmcli-core - 2.1.1 + 2.1.2 org.springframework.boot spring-boot-starter - ${springboot.version} org.springframework.boot spring-boot-configuration-processor - ${springboot.version} true diff --git a/eureka-plugin/pom.xml b/eureka-plugin/pom.xml index 854e4b8..2149129 100644 --- a/eureka-plugin/pom.xml +++ b/eureka-plugin/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.1 + 2.1.2 4.0.0 eureka-plugin - 2.1.1.2 + 2.1.2.2 jar eureka-plugin @@ -18,21 +18,17 @@ UTF-8 1.8 1.8 - - 2.6.3 org.springframework.boot spring-boot-starter - ${springboot.version} org.springframework.boot spring-boot-configuration-processor - ${springboot.version} true diff --git a/nacos-plugin/pom.xml b/nacos-plugin/pom.xml index d310087..0e86b92 100644 --- a/nacos-plugin/pom.xml +++ b/nacos-plugin/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.1 + 2.1.2 4.0.0 nacos-plugin - 2.1.1.2 + 2.1.2.2 jar nacos-plugin diff --git a/pom.xml b/pom.xml index 0f215b1..d42cbe5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.dtm-labs dtmcli-java-parent - 2.1.1 + 2.1.2 pom dtmcli-java-parent @@ -35,6 +35,8 @@ 3.14.9 1.4.2 1.7.30 + + 2.6.3 2021.0.1 2021.0.1.0 @@ -96,6 +98,18 @@ ${slf4j.version} + + org.springframework.boot + spring-boot-starter + ${springboot.version} + + + + org.springframework.boot + spring-boot-configuration-processor + ${springboot.version} + + org.springframework.cloud spring-cloud-dependencies From 0a6683faf8c001d7e7998533b363876d5d97b332 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Sat, 21 May 2022 14:42:13 +0800 Subject: [PATCH 20/24] updat reademe --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eecfa20..958ed9f 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ dtm.ipport=127.0.0.1:36789 ### 完整示例 #### dtmcli-java使用示例 -[dtmcli-java-sample](https://github.com/dtm-labs/dtmcli-java-sample) +[dtmcli-java-sample](https://github.com/dtm-labs/dtmcli-java-sample) [dtmcli-java-sample-use-configuration](https://github.com/horseLk/dtmcli-java-sample-with-conf) #### dtmcli-springcloud使用示例 [dtmcli-java-spring-sample](https://github.com/dtm-labs/dtmcli-java-spring-sample) From 1312f977f18db936b4f42d7a7dbf376a19ec375a Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Sun, 22 May 2022 02:07:38 +0800 Subject: [PATCH 21/24] upgrade version --- dtmcli-common/pom.xml | 4 ++-- dtmcli-core/pom.xml | 6 +++--- dtmcli-java/pom.xml | 8 ++++---- dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java | 4 ++++ dtmcli-springcloud/pom.xml | 8 ++++---- eureka-plugin/pom.xml | 4 ++-- nacos-plugin/pom.xml | 4 ++-- pom.xml | 2 +- 8 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dtmcli-common/pom.xml b/dtmcli-common/pom.xml index 880ebee..03535c7 100644 --- a/dtmcli-common/pom.xml +++ b/dtmcli-common/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.2 + 2.1.3 4.0.0 dtmcli-common - 2.1.2 + 2.1.3 jar dtmcli-common diff --git a/dtmcli-core/pom.xml b/dtmcli-core/pom.xml index fc6bb4b..b90f8d8 100644 --- a/dtmcli-core/pom.xml +++ b/dtmcli-core/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.2 + 2.1.3 4.0.0 dtmcli-core - 2.1.2 + 2.1.3 jar dtmcli-core @@ -24,7 +24,7 @@ io.github.dtm-labs dtmcli-common - 2.1.2 + 2.1.3 diff --git a/dtmcli-java/pom.xml b/dtmcli-java/pom.xml index 7b1d514..307cf75 100644 --- a/dtmcli-java/pom.xml +++ b/dtmcli-java/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.2 + 2.1.3 4.0.0 dtmcli-java - 2.1.2 + 2.1.3 jar dtmcli-java @@ -24,13 +24,13 @@ io.github.dtm-labs dtmcli-common - 2.1.2 + 2.1.3 io.github.dtm-labs dtmcli-core - 2.1.2 + 2.1.3 diff --git a/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java index 201dd5b..85085e2 100644 --- a/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java +++ b/dtmcli-java/src/main/java/pub/dtm/client/DtmClient.java @@ -118,6 +118,10 @@ public DtmClient(String endpoint) { this.dtmServerStub = feignClient; } + public DtmClient(IDtmServerStub dtmServerStub) { + this.dtmServerStub = dtmServerStub; + } + private List genClusters(String clusterStr) { if (StringUtils.isEmpty(clusterStr)) { List clusters = new ArrayList<>(); diff --git a/dtmcli-springcloud/pom.xml b/dtmcli-springcloud/pom.xml index 0197946..9e28787 100644 --- a/dtmcli-springcloud/pom.xml +++ b/dtmcli-springcloud/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.2 + 2.1.3 4.0.0 dtmcli-springcloud - 2.1.2.2 + 2.1.3.2 jar dtmcli-springcloud @@ -24,13 +24,13 @@ io.github.dtm-labs dtmcli-common - 2.1.2 + 2.1.3 io.github.dtm-labs dtmcli-core - 2.1.2 + 2.1.3 diff --git a/eureka-plugin/pom.xml b/eureka-plugin/pom.xml index 2149129..e912d16 100644 --- a/eureka-plugin/pom.xml +++ b/eureka-plugin/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.2 + 2.1.3 4.0.0 eureka-plugin - 2.1.2.2 + 2.1.3.2 jar eureka-plugin diff --git a/nacos-plugin/pom.xml b/nacos-plugin/pom.xml index 0e86b92..46371f4 100644 --- a/nacos-plugin/pom.xml +++ b/nacos-plugin/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.2 + 2.1.3 4.0.0 nacos-plugin - 2.1.2.2 + 2.1.3.2 jar nacos-plugin diff --git a/pom.xml b/pom.xml index d42cbe5..a06e556 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.dtm-labs dtmcli-java-parent - 2.1.2 + 2.1.3 pom dtmcli-java-parent From f5c329f36fe65cddb129023e5e4020bcb1a73e54 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Mon, 23 May 2022 01:00:14 +0800 Subject: [PATCH 22/24] fix --- dtmcli-common/pom.xml | 4 ++-- dtmcli-core/pom.xml | 6 +++--- dtmcli-java/pom.xml | 8 ++++---- dtmcli-springcloud/pom.xml | 34 ++++++++++++++++++++++++++++++---- eureka-plugin/pom.xml | 21 +++++++++++++++++++-- nacos-plugin/pom.xml | 29 +++++++++++++++++++++++++++-- pom.xml | 34 +--------------------------------- 7 files changed, 86 insertions(+), 50 deletions(-) diff --git a/dtmcli-common/pom.xml b/dtmcli-common/pom.xml index 03535c7..8f58649 100644 --- a/dtmcli-common/pom.xml +++ b/dtmcli-common/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.3 + 2.1.4 4.0.0 dtmcli-common - 2.1.3 + 2.1.4 jar dtmcli-common diff --git a/dtmcli-core/pom.xml b/dtmcli-core/pom.xml index b90f8d8..574fb5c 100644 --- a/dtmcli-core/pom.xml +++ b/dtmcli-core/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.3 + 2.1.4 4.0.0 dtmcli-core - 2.1.3 + 2.1.4 jar dtmcli-core @@ -24,7 +24,7 @@ io.github.dtm-labs dtmcli-common - 2.1.3 + 2.1.4 diff --git a/dtmcli-java/pom.xml b/dtmcli-java/pom.xml index 307cf75..d09f884 100644 --- a/dtmcli-java/pom.xml +++ b/dtmcli-java/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.3 + 2.1.4 4.0.0 dtmcli-java - 2.1.3 + 2.1.4 jar dtmcli-java @@ -24,13 +24,13 @@ io.github.dtm-labs dtmcli-common - 2.1.3 + 2.1.4 io.github.dtm-labs dtmcli-core - 2.1.3 + 2.1.4 diff --git a/dtmcli-springcloud/pom.xml b/dtmcli-springcloud/pom.xml index 9e28787..4aabfa9 100644 --- a/dtmcli-springcloud/pom.xml +++ b/dtmcli-springcloud/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.3 + 2.1.4 4.0.0 dtmcli-springcloud - 2.1.3.2 + 2.1.4.2 jar dtmcli-springcloud @@ -18,29 +18,35 @@ UTF-8 1.8 1.8 + + 2.6.3 + 2021.0.1 + 2021.0.1.0 io.github.dtm-labs dtmcli-common - 2.1.3 + 2.1.4 io.github.dtm-labs dtmcli-core - 2.1.3 + 2.1.4 org.springframework.boot spring-boot-starter + ${springboot.version} org.springframework.boot spring-boot-configuration-processor + ${springboot.version} true @@ -50,4 +56,24 @@ + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${alibaba-cloud.version} + pom + import + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + \ No newline at end of file diff --git a/eureka-plugin/pom.xml b/eureka-plugin/pom.xml index e912d16..274fb49 100644 --- a/eureka-plugin/pom.xml +++ b/eureka-plugin/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.3 + 2.1.4 4.0.0 eureka-plugin - 2.1.3.2 + 2.1.4.2 jar eureka-plugin @@ -18,17 +18,22 @@ UTF-8 1.8 1.8 + + 2.6.3 + 2021.0.1 org.springframework.boot spring-boot-starter + ${springboot.version} org.springframework.boot spring-boot-configuration-processor + ${springboot.version} true @@ -38,4 +43,16 @@ spring-cloud-starter-netflix-eureka-client + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + \ No newline at end of file diff --git a/nacos-plugin/pom.xml b/nacos-plugin/pom.xml index 46371f4..1c3eceb 100644 --- a/nacos-plugin/pom.xml +++ b/nacos-plugin/pom.xml @@ -5,12 +5,12 @@ dtmcli-java-parent io.github.dtm-labs - 2.1.3 + 2.1.4 4.0.0 nacos-plugin - 2.1.3.2 + 2.1.4.2 jar nacos-plugin @@ -18,6 +18,9 @@ UTF-8 1.8 1.8 + + 2021.0.1 + 2021.0.1.0 @@ -42,4 +45,26 @@ spring-cloud-loadbalancer + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${alibaba-cloud.version} + pom + import + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index a06e556..c81ae7a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.dtm-labs dtmcli-java-parent - 2.1.3 + 2.1.4 pom dtmcli-java-parent @@ -35,10 +35,6 @@ 3.14.9 1.4.2 1.7.30 - - 2.6.3 - 2021.0.1 - 2021.0.1.0 @@ -97,34 +93,6 @@ slf4j-api ${slf4j.version} - - - org.springframework.boot - spring-boot-starter - ${springboot.version} - - - - org.springframework.boot - spring-boot-configuration-processor - ${springboot.version} - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${alibaba-cloud.version} - pom - import - From a0cbfaf9cced6a3019dca2935fe5dc29f1f70347 Mon Sep 17 00:00:00 2001 From: KuiLiao Date: Mon, 23 May 2022 01:17:08 +0800 Subject: [PATCH 23/24] fix --- dtmcli-springcloud/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dtmcli-springcloud/pom.xml b/dtmcli-springcloud/pom.xml index 4aabfa9..dae4171 100644 --- a/dtmcli-springcloud/pom.xml +++ b/dtmcli-springcloud/pom.xml @@ -21,7 +21,6 @@ 2.6.3 2021.0.1 - 2021.0.1.0 @@ -58,14 +57,6 @@ - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${alibaba-cloud.version} - pom - import - - org.springframework.cloud spring-cloud-dependencies From 33063718433e75fa74496ca69efeecf7bd557da2 Mon Sep 17 00:00:00 2001 From: Kui Liao <54488655+horseLk@users.noreply.github.com> Date: Mon, 23 May 2022 22:59:22 +0800 Subject: [PATCH 24/24] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 958ed9f..277143b 100644 --- a/README.md +++ b/README.md @@ -54,9 +54,9 @@ DTM是一款跨语言的开源分布式事务管理器，优雅的解决了幂 | artifact| version | 适用版本 |备注| |:-----:|:----:|:----:|:----:| -|dtmcli-springcloud| 2.1.0.1| 2.4.0 <= springboot version < 2.5.13| springboot 版本>=2.5.0，需要设置spring.cloud.compatibility-verifier.enabled=false| -|dtmcli-springcloud| 2.1.0.2| 2.6.0 <= springboot version < 2.6.latest| | -|dtmcli-java| 2.1.0| others| | +|dtmcli-springcloud| 2.1.4.1| 2.4.0 <= springboot version < 2.5.13| springboot 版本>=2.5.0，需要设置spring.cloud.compatibility-verifier.enabled=false| +|dtmcli-springcloud| 2.1.4.2| 2.6.0 <= springboot version < 2.6.latest| | +|dtmcli-java| 2.1.4| others| | ### 步骤二：添加依赖项 @@ -139,4 +139,4 @@ dtm.ipport=127.0.0.1:36789 [MIT](https://github.com/dtm-labs/dtmcli/blob/master/LICENSE) -[license-badge]: https://img.shields.io/github/license/dtm-labs/dtmcli-py \ No newline at end of file +[license-badge]: https://img.shields.io/github/license/dtm-labs/dtmcli-py