Merge pull request #295 from JiazhenBao/main

LCAPHttpClient.exchangeV3 数据格式为非form，异常时返回http错误信息；threadPause_dellge更新groupid为内部可用

Author: JiazhenBao

httpclient/README.md

@@ -24,6 +24,15 @@ TransferCommonException中errorMsg包含了http状态码和返回信息。格式
 
 出参：第三方返回完整信息的String格式  || TransferCommonException异常
 
+## LCAPHttpClient.exchangeV3 数据格式为非form，异常时返回http错误信息
+入参：
+- url: 请求地址
+- httpMethod: 请求方法
+- header: 请求头
+- body: 请求体（json String）
+
+出参：第三方返回完整信息的String格式  || TransferCommonException异常
+
 ## LCAPHttpClient.exchangeWithoutUriEncode 数据格式为非form，url不编码
 入参：
 - url: 请求地址

httpclient/pom.xml

@@ -16,7 +16,7 @@
     <artifactId>httpclient</artifactId>
     <name>httpclient</name>
     <description>httpclient</description>
-    <version>0.17.3</version>
+    <version>0.18.0</version>
 
     <dependencies>
         <dependency>
@@ -72,6 +72,7 @@
             <groupId>com.netease.cloud</groupId>
             <artifactId>codewave-file-connector-library</artifactId>
             <version>1.0.3</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

httpclient/src/main/java/com/netease/http/httpclient/LCAPHttpClient.java

@@ -118,6 +118,37 @@ public String exchangeV2(@Required String url, @Required String httpMethod, @Req
         }
     }
 
+    /**
+     * http/https调用（非form使用，异常时返回http错误码）
+     *
+     * @param url
+     * @param httpMethod
+     * @param header
+     * @param body
+     * @return
+     * @throws URISyntaxException
+     */
+    @NaslLogic
+    @Retryable(value = {Exception.class}, maxAttempts = 3, backoff = @Backoff(delay = 1000L))
+    public String exchangeV3(@Required String url, @Required String httpMethod, @Required Map<String, String> header, @Required String body) throws TransferCommonException {
+        try {
+            RequestParamAllBodyTypeInner requestParam = new RequestParamAllBodyTypeInner();
+            requestParam.setBody(body);
+            //填充requestParam参数
+            requestParam.setUrl(url);
+            requestParam.setHttpMethod(httpMethod);
+            requestParam.setHeader(header);
+            ResponseEntity<String> exchange = httpClientService.exchangeInner(requestParam, restTemplate, String.class);
+            return exchange.getBody();
+        } catch (HttpClientErrorException e) {
+            logger.error("", e);
+            return e.getResponseBodyAsString();
+        } catch (Exception e) {
+            logger.error("", e);
+            throw new TransferCommonException(e.getMessage(), e);
+        }
+    }
+
 
     /**
      * 下载文件并上传到nos（默认fileUrl是get请求，默认格式xlsx）

threadPause_dellge/pom.xml

@@ -10,7 +10,7 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
-    <groupId>com.thread</groupId>
+    <groupId>com.netease</groupId>
     <artifactId>threadPause</artifactId>
     <version>1.0.11</version>
     <name>线程等待依赖库</name>