test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(接口测试): 优化接口执行失败重试

This commit is contained in:
AgAngle 2024-05-21 11:52:54 +08:00 committed by Craftsman
parent b231e27794
commit 49c24e31c2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/services/system-setting/src/main/java/io/metersphere/system/utils/TaskRunnerClient.java
View File

@ -15,6 +15,7 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import java.io.IOException; import java.io.IOException;
@ -85,7 +86,7 @@ public class TaskRunnerClient {
return retry(url, requestBody, action); return retry(url, requestBody, action);
} }
private static ResultHolder retry(String url, Object requestBody, Action action) throws IOException { private static ResultHolder retry(String url, Object requestBody, Action action) throws Exception {
ResultHolder body; ResultHolder body;
try { try {
// 首次调用 // 首次调用
@ -93,13 +94,13 @@ public class TaskRunnerClient {
if (body != null && body.getCode() == MsHttpResultCode.SUCCESS.getCode()) { if (body != null && body.getCode() == MsHttpResultCode.SUCCESS.getCode()) {
return body; return body;
} }
} catch (NoHttpResponseException | ConnectTimeoutException | SocketException e) { } catch (NoHttpResponseException | ConnectTimeoutException | SocketException | ResourceAccessException e) {
return doRetry(url, requestBody, action, e); return doRetry(url, requestBody, action, e);
} }
return body; return body;
} }
private static ResultHolder doRetry(String url, Object requestBody, Action action, IOException e) throws IOException { private static ResultHolder doRetry(String url, Object requestBody, Action action, Exception e) throws Exception {
ResultHolder body; ResultHolder body;
// 增加token失败重试 // 增加token失败重试
for (int i = 1; i <= RETRY_COUNT; i++) { for (int i = 1; i <= RETRY_COUNT; i++) {