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

fix(项目设置): 执行带有文件库的接口时增加控制台显示 

https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001016881
This commit is contained in:
song-tianyang 2022-09-20 11:30:56 +08:00 committed by 建国
parent 85849f2108
commit 522374a9d2
8 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/jmeter/MsApiBackendListener.java
View File

@ -20,6 +20,7 @@ import org.apache.jmeter.services.FileServer;
import org.apache.jmeter.visualizers.backend.AbstractBackendListenerClient;
import org.apache.jmeter.visualizers.backend.BackendListenerContext;
import java.io.File;
import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
@ -60,7 +61,12 @@ public class MsApiBackendListener extends AbstractBackendListenerClient implemen
LoggerUtil.info("重试结果处理【" + dto.getReportId() + " 】结束");
}
dto.setConsole(FixedCapacityUtils.getJmeterLogger(dto.getReportId(), !StringUtils.equals(dto.getReportType(), RunModeConstants.SET_REPORT.toString())));
String console = FixedCapacityUtils.getJmeterLogger(dto.getReportId(), !StringUtils.equals(dto.getReportType(), RunModeConstants.SET_REPORT.toString()));
if (FileUtils.isFolderExists(dto.getReportId())) {
console += "\r\n" + "tmp folder " + FileUtils.BODY_FILE_DIR + File.separator + dto.getReportId() + " has deleted.";
}
dto.setConsole(console);
// 入库存储
CommonBeanFactory.getBean(TestResultService.class).saveResults(dto);
LoggerUtil.info("进入TEST-END处理报告【" + dto.getReportId() + " 】" + dto.getRunMode() + " 整体执行完成");

14
backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
View File

@ -41,6 +41,7 @@ import org.apache.jmeter.testelement.TestStateListener;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.threads.JMeterVariables;
import java.io.File;
import java.io.Serializable;
import java.util.Map;
@ -110,7 +111,6 @@ public class MsDebugListener extends AbstractListenerElement implements SampleLi
WebSocketUtils.sendMessageSingle(dto);
WebSocketUtils.onClose(this.getName());
PoolExecBlockingQueueUtil.offer(this.getName());
FileUtils.deleteBodyFiles(this.getName());
}
@Override
@ -164,16 +164,24 @@ public class MsDebugListener extends AbstractListenerElement implements SampleLi
transactionResult.getResponseResult().setConsole(console);
//解析误报内容
RequestResultExpandDTO expandDTO = ResponseUtil.parseByRequestResult(transactionResult);
if (FileUtils.isFolderExists(dto.getToReport())) {
expandDTO.getResponseResult().setConsole(expandDTO.getResponseResult().getConsole() + "\r\n" + "tmp folder " + FileUtils.BODY_FILE_DIR + File.separator + dto.getToReport() + " has deleted.");
}
JSONObject requestResultObject = JSONObject.parseObject(JSON.toJSONString(expandDTO));
dto.setContent("result_" + JSON.toJSONString(requestResultObject));
String consoleStr = JSON.toJSONString(requestResultObject);
dto.setContent("result_" + consoleStr);
WebSocketUtils.sendMessageSingle(dto);
});
} else {
requestResult.getResponseResult().setConsole(console);
//解析误报内容
RequestResultExpandDTO expandDTO = ResponseUtil.parseByRequestResult(requestResult);
if (FileUtils.isFolderExists(dto.getToReport())) {
expandDTO.getResponseResult().setConsole(expandDTO.getResponseResult().getConsole() + "\r\n" + "tmp folder " + FileUtils.BODY_FILE_DIR + File.separator + dto.getToReport() + " has deleted.");
}
JSONObject requestResultObject = JSONObject.parseObject(JSON.toJSONString(expandDTO));
dto.setContent("result_" + JSON.toJSONString(requestResultObject));
String consoleStr = JSON.toJSONString(requestResultObject);
dto.setContent("result_" + consoleStr);
WebSocketUtils.sendMessageSingle(dto);
}
LoggerUtil.debug("send. " + this.getName());

5
backend/src/main/java/io/metersphere/commons/utils/FileUtils.java
View File

@ -515,6 +515,11 @@ public class FileUtils {
return list;
}
public static boolean isFolderExists(String requestId) {
File file = new File(BODY_FILE_DIR + File.separator + requestId);
return file.isDirectory();
}
public List<Object> getZipJar() {
List<Object> jarFiles = new LinkedList<>();
// jar 包

2
backend/src/main/java/io/metersphere/metadata/service/FileManagerService.java
View File

@ -94,7 +94,7 @@ public class FileManagerService {
try {
list.addAll(FileCenter.getRepository(requestByStorageEntry.getKey()).getFileBatch(requestByStorageEntry.getValue()));
} catch (Exception e) {
LogUtil.error(e);
LogUtil.error("下载GIT文件失败!", e);
return null;
}
}

4
backend/src/main/java/io/metersphere/metadata/service/FileMetadataService.java
View File

@ -91,7 +91,7 @@ public class FileMetadataService {
fileMetadata.setName(MetadataUtils.getFileNameByRemotePath(fileMetadata.getRepositoryPath()));
fileMetadata.setType(MetadataUtils.getFileType(fileMetadata.getRepositoryPath()));
fileMetadata.setPath(fileMetadata.getRepositoryPath());
fileMetadata.setSize(Long.valueOf(0));
fileMetadata.setSize(gitFileInfo.getSize());
fileMetadata.setAttachInfo(JSONObject.toJSONString(gitFileInfo));
result.add(this.save(fileMetadata));
} else {
@ -590,7 +590,7 @@ public class FileMetadataService {
newMetadata.setAttachInfo(JSONObject.toJSONString(gitFileAttachInfo));
newMetadata.setName(baseMetadata.getName());
newMetadata.setType(baseMetadata.getType());
newMetadata.setSize(baseMetadata.getSize());
newMetadata.setSize(gitFileAttachInfo.getSize());
newMetadata.setCreateTime(operationTime);
newMetadata.setUpdateTime(operationTime);
newMetadata.setStorage(baseMetadata.getStorage());

4
backend/src/main/java/io/metersphere/metadata/utils/GitRepositoryUtils.java
View File

@ -128,7 +128,9 @@ public class GitRepositoryUtils {
if (!treeWalk.next()) {
return null;
} else {
attachInfo = new GitFileAttachInfo(repositoryUrl, userName, token, branch, fileCommitId.getName(), filePath, commit.getFullMessage());
ObjectId objectId = treeWalk.getObjectId(0);
ObjectLoader loader = repo.open(objectId);
attachInfo = new GitFileAttachInfo(repositoryUrl, userName, token, branch, fileCommitId.getName(), filePath, commit.getFullMessage(), loader.getSize());
return attachInfo;
}
} catch (Exception e) {

1
backend/src/main/java/io/metersphere/metadata/vo/repository/GitFileAttachInfo.java
View File

@ -13,6 +13,7 @@ public class GitFileAttachInfo extends FileAttachInfo {
private String commitId;
private String filePath;
private String commitMessage;
private long size;
public String getRepositoryInfo() {
return repositoryPath + "-" + userName + "-" + token;

2
frontend/src/business/components/project/menu/file/edit/EditFileMetadata.vue
View File

@ -61,7 +61,7 @@
<span>{{ data.type }}</span>
</el-form-item>
<el-form-item v-if="!isRepositoryFile()" :label="$t('load_test.file_size')" prop="size">
<el-form-item :label="$t('load_test.file_size')" prop="size">
<span>{{ formatFileSize(data.size) }}</span>
</el-form-item>