Merge pull request #42 from horseLk/main

horseLk · web-flow · commit a6e2670ec0ab · 2023-03-02T22:03:40.000+08:00
fix saga bug&amp;support checkresult reutrn result
diff --git a/dtmcli-common/pom.xml b/dtmcli-common/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>dtmcli-java-parent</artifactId>
         <groupId>io.github.dtm-labs</groupId>
-        <version>2.1.6</version>
+        <version>2.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dtmcli-common</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.8</version>
     <packaging>jar</packaging>
     <name>dtmcli-common</name>
 
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
@@ -89,6 +89,16 @@ public static String generatorURI(ServiceMessage serviceMessage, boolean httpTyp
      * @throws FailureException exception
      */
     public static void checkResult(Response response) throws FailureException {
+        checkResultWithReturn(response);
+    }
+
+    /**
+     * check response and return result
+     * @param response
+     * @return
+     * @throws FailureException
+     */
+    public static String checkResultWithReturn(Response response) throws FailureException {
         if (response.status() >= Constants.RESP_ERR_CODE){
             if (response.reason() != null) {
                 throw new FailureException(response.reason());
@@ -115,5 +125,6 @@ public static void checkResult(Response response) throws FailureException {
         if (result.contains(Constants.FAILURE_RESULT)){
             throw new FailureException("Service returned failed");
         }
+        return result;
     }
 }
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
@@ -108,6 +108,16 @@ public static String splicingUrl(String ip, int port, String path) {
      * @throws Exception exception
      */
     public static void checkResult(Response response) throws Exception {
+        checkResultWithReturn(response);
+    }
+
+    /**
+     * check response and return result
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    public static String checkResultWithReturn(Response response) throws Exception {
         if (response.code() >= Constants.RESP_ERR_CODE){
             throw new FailureException(response.message());
         }
@@ -119,5 +129,6 @@ public static void checkResult(Response response) throws Exception {
         if (result.contains(Constants.FAILURE_RESULT)){
             throw new FailureException("Service returned failed");
         }
+        return result;
     }
 }
diff --git a/dtmcli-core/pom.xml b/dtmcli-core/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>dtmcli-java-parent</artifactId>
         <groupId>io.github.dtm-labs</groupId>
-        <version>2.1.6</version>
+        <version>2.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dtmcli-core</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.8</version>
     <packaging>jar</packaging>
     <name>dtmcli-core</name>
 
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
@@ -155,7 +155,7 @@ public Saga setRetryInterval(long retryInterval) {
         return this;
     }
 
-    public Saga setBranchHeaders(Map<String, String> headers) {
+    public Saga setBranchHeaders(Map<String, String> branchHeaders) {
         this.branchHeaders = branchHeaders;
         return this;
     }
@@ -171,7 +171,7 @@ private void addConcurrentContext() {
             data.put(ORDERS, orders);
             data.put(CONCURRENT, true);
             try {
-                this.setCustomData(JsonUtils.toJson(data));
+                this.customData = JsonUtils.toJson(data);
             } catch (Exception e) {
                 log.error("encode json error.");
             }
diff --git a/dtmcli-java/pom.xml b/dtmcli-java/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dtmcli-java</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.8</version>
     <packaging>jar</packaging>
     <name>dtmcli-java</name>
 
@@ -24,13 +24,13 @@
         <dependency>
             <groupId>io.github.dtm-labs</groupId>
             <artifactId>dtmcli-common</artifactId>
-            <version>2.1.6</version>
+            <version>2.1.8</version>
         </dependency>
 
         <dependency>
             <groupId>io.github.dtm-labs</groupId>
             <artifactId>dtmcli-core</artifactId>
-            <version>2.1.6</version>
+            <version>2.1.8</version>
         </dependency>
 
         <dependency>
diff --git a/dtmcli-springcloud/pom.xml b/dtmcli-springcloud/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dtmcli-springcloud</artifactId>
-    <version>2.1.6.2</version>
+    <version>2.1.8.2</version>
     <packaging>jar</packaging>
     <name>dtmcli-springcloud</name>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.github.dtm-labs</groupId>
             <artifactId>dtmcli-common</artifactId>
-            <version>2.1.6</version>
+            <version>2.1.8</version>
         </dependency>
 
         <dependency>
             <groupId>io.github.dtm-labs</groupId>
             <artifactId>dtmcli-core</artifactId>
-            <version>2.1.6</version>
+            <version>2.1.8</version>
         </dependency>
 
         <dependency>
diff --git a/eureka-plugin/pom.xml b/eureka-plugin/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eureka-plugin</artifactId>
-    <version>2.1.6.1</version>
+    <version>2.1.8.2</version>
     <packaging>jar</packaging>
     <name>eureka-plugin</name>
 
diff --git a/nacos-plugin/pom.xml b/nacos-plugin/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>nacos-plugin</artifactId>
-    <version>2.1.6.1</version>
+    <version>2.1.8.2</version>
     <packaging>jar</packaging>
     <name>nacos-plugin</name>
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.dtm-labs</groupId>
     <artifactId>dtmcli-java-parent</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.8</version>
     <packaging>pom</packaging>
 
     <name>dtmcli-java-parent</name>

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,16 @@ public static String splicingUrl(String ip, int port, String path) {`
`108`	`108`	`* @throws Exception exception`
`109`	`109`	`*/`
`110`	`110`	`public static void checkResult(Response response) throws Exception {`
	`111`	`+ checkResultWithReturn(response);`
	`112`	`+ }`
	`113`	`+`
	`114`	`+ /**`
	`115`	`+ * check response and return result`
	`116`	`+ * @param response`
	`117`	`+ * @return`
	`118`	`+ * @throws Exception`
	`119`	`+ */`
	`120`	`+ public static String checkResultWithReturn(Response response) throws Exception {`
`111`	`121`	`if (response.code() >= Constants.RESP_ERR_CODE){`
`112`	`122`	`throw new FailureException(response.message());`
`113`	`123`	`}`
`@@ -119,5 +129,6 @@ public static void checkResult(Response response) throws Exception {`
`119`	`129`	`if (result.contains(Constants.FAILURE_RESULT)){`
`120`	`130`	`throw new FailureException("Service returned failed");`
`121`	`131`	`}`
	`132`	`+ return result;`
`122`	`133`	`}`
`123`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public Saga setRetryInterval(long retryInterval) {`
`155`	`155`	`return this;`
`156`	`156`	`}`
`157`	`157`
`158`		`- public Saga setBranchHeaders(Map<String, String> headers) {`
	`158`	`+ public Saga setBranchHeaders(Map<String, String> branchHeaders) {`
`159`	`159`	`this.branchHeaders = branchHeaders;`
`160`	`160`	`return this;`
`161`	`161`	`}`
`@@ -171,7 +171,7 @@ private void addConcurrentContext() {`
`171`	`171`	`data.put(ORDERS, orders);`
`172`	`172`	`data.put(CONCURRENT, true);`
`173`	`173`	`try {`
`174`		`- this.setCustomData(JsonUtils.toJson(data));`
	`174`	`+ this.customData = JsonUtils.toJson(data);`
`175`	`175`	`} catch (Exception e) {`
`176`	`176`	`log.error("encode json error.");`
`177`	`177`	`}`