test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-02 03:58:33 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

refactor(接口测试): 资源池执行前校验当前站点

Browse Source 
--bug=1039322 --user=陈建星 【接口测试】系统-资源池-错误的当前站点url-使用该资源池执行接口，一直在加载中状态 https://www.tapd.cn/55049933/s/1501013
This commit is contained in:
AgAngle 2024-04-18 15:37:49 +08:00 committed by 刘瑞斌
parent 008817403b
commit 3051af68e0
6 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
backend/framework/sdk/src/main/java/io/metersphere/sdk/exception/TaskRunnerResultCode.java Normal file
View File

@ -0,0 +1,28 @@
package io.metersphere.sdk.exception;
/**
* @author jianxing
*/
public enum TaskRunnerResultCode implements IResultCode {
MS_URL_NOT_AVAILABLE(200001, "ms_url_not_available");
private final int code;
private final String message;
TaskRunnerResultCode(int code, String message) {
this.code = code;
this.message = message;
}
@Override
public int getCode() {
return code;
}
@Override
public String getMessage() {
return getTranslationMessage(this.message);
}
}

3
backend/framework/sdk/src/main/resources/i18n/commons.properties
View File

@ -527,4 +527,5 @@ relate_source_type_not_blank=关联资源类型不能为空
api_import_schedule=接口定义-定时导入任务
project.description.length_range=项目描述长度必须在{min}和{max}之间
api_test_environment_datasource_connect_failed=数据源连接失败
api_test_environment_datasource_connect_failed=数据源连接失败
ms_url_not_available=资源池无法访问当前站点

3
backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties
View File

@ -565,4 +565,5 @@ project.description.length_range=The description must be between {min} and {max}
api_test_environment_datasource_connect_failed=Data source connection failed
permission.api_definition.delete_and_recover=Delete/Recover
permission.service_integration.reset=Reset
permission.service_integration.reset=Reset
ms_url_not_available=The resource pool cannot access the current site

3
backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties
View File

@ -562,4 +562,5 @@ project.description.length_range=项目描述长度必须在{min}和{max}之间
api_test_environment_datasource_connect_failed=数据源连接失败
permission.api_definition.delete_and_recover=删除/恢复
permission.service_integration.reset=重置
permission.service_integration.reset=重置
ms_url_not_available=资源池无法访问当前站点

3
backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties
View File

@ -562,4 +562,5 @@ api_import_schedule=接口導入定時任務
project.description.length_range=項目描述長度必須在{min}和{max}之間
permission.api_definition.delete_and_recover=刪除/恢復
permission.service_integration.reset=重置
permission.service_integration.reset=重置
ms_url_not_available=資源池無法訪問當前站點

27
backend/services/api-test/src/main/java/io/metersphere/api/service/ApiExecuteService.java
View File

@ -27,11 +27,13 @@ import io.metersphere.sdk.dto.api.task.ApiExecuteFileInfo;
import io.metersphere.sdk.dto.api.task.ApiRunModeConfigDTO;
import io.metersphere.sdk.dto.api.task.TaskRequestDTO;
import io.metersphere.sdk.exception.MSException;
import io.metersphere.sdk.exception.TaskRunnerResultCode;
import io.metersphere.sdk.file.FileCenter;
import io.metersphere.sdk.file.FileRepository;
import io.metersphere.sdk.file.FileRequest;
import io.metersphere.sdk.util.*;
import io.metersphere.system.config.MinioProperties;
import io.metersphere.system.controller.handler.ResultHolder;
import io.metersphere.system.domain.TestResourcePool;
import io.metersphere.system.dto.pool.TestResourceNodeDTO;
import io.metersphere.system.dto.pool.TestResourcePoolReturnDTO;
@ -50,6 +52,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.HttpServerErrorException;
import java.io.File;
import java.io.IOException;
@ -164,19 +167,31 @@ public class ApiExecuteService {
try {
return doExecute(taskRequest);
} catch (HttpServerErrorException e) {
handleDoExecuteException(scriptRedisKey, e);
int errorCode = e.getResponseBodyAs(ResultHolder.class).getCode();
for (TaskRunnerResultCode taskRunnerResultCode : TaskRunnerResultCode.values()) {
// 匹配资源池的错误代码，抛出相应异常
if (taskRunnerResultCode.getCode() == errorCode) {
throw new MSException(taskRunnerResultCode, e.getMessage());
}
}
throw new MSException(RESOURCE_POOL_EXECUTE_ERROR, e.getMessage());
} catch (MSException e) {
LogUtils.error(e);
// 调用失败清理脚本
stringRedisTemplate.delete(scriptRedisKey);
handleDoExecuteException(scriptRedisKey, e);
throw e;
} catch (Exception e) {
LogUtils.error(e);
// 调用失败清理脚本
stringRedisTemplate.delete(scriptRedisKey);
handleDoExecuteException(scriptRedisKey, e);
throw new MSException(RESOURCE_POOL_EXECUTE_ERROR, e.getMessage());
}
}
private void handleDoExecuteException(String scriptRedisKey, Exception e) {
LogUtils.error(e);
// 调用失败清理脚本
stringRedisTemplate.delete(scriptRedisKey);
}
private GlobalParams getGlobalParam(String projectId) {
GlobalParamsDTO globalParamsDTO = globalParamsService.get(projectId);
if (globalParamsDTO != null) {