Commit Graph

5688 Commits

Author SHA1 Message Date
song.tianyang d54e6911db Merge branch 'v1.7'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
#	frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
#	frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
2021-02-17 12:03:59 +08:00
song.tianyang 6f1db9d4eb Merge remote-tracking branch 'origin/master' 2021-02-17 11:50:52 +08:00
song.tianyang 7b671d3620 feat: 接口页面增加文档功能
接口页面增加文档功能
2021-02-17 11:50:25 +08:00
fit2-zhao 660f474924 fix(接口自动化): 修复用例文件上传丢失问题 2021-02-09 17:38:16 +08:00
fit2-zhao e0349f5a5f fix(测试跟踪): 修复上次xmind 格式错误问题 2021-02-09 17:22:15 +08:00
fit2-zhao 39cffd9615 feat(接口自动化): 导入jmx 增加HashTree 有序处理 2021-02-09 16:22:59 +08:00
fit2-zhao b7cc737dd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-09 15:09:46 +08:00
fit2-zhao 16283572c7 feat(接口自动化): 导入jmx 增加HashTree 有序处理 2021-02-09 14:56:14 +08:00
Captain.B 7d6d5bc5d8 fix(性能测试): 手动停止测试时发送停止消息到data-streaming 2021-02-09 14:49:49 +08:00
Captain.B cd7dff5fb7 fix(性能测试): 手动停止测试时发送停止消息到data-streaming 2021-02-09 11:34:00 +08:00
fit2-zhao 298e8df45a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-08 18:27:30 +08:00
fit2-zhao e7df89b1e2 feat(接口自动化): 导入jmx对已经有的请求处理 2021-02-08 18:27:22 +08:00
wenyann 8e4ce8a197 feat: 自定义表头 2021-02-08 18:06:52 +08:00
wenyann 94ead290cc fix: 修改id长度 2021-02-08 17:36:49 +08:00
wenyann 6a948b3091 fix: 修改id长度 2021-02-08 17:27:18 +08:00
wenyann 21b6481b8b feat: 自定义表头 2021-02-08 17:22:27 +08:00
Captain.B 51ca71531e fix(性能测试): 修复请求很多的时候,图标鼠标悬停显示不全 2021-02-08 17:07:30 +08:00
fit2-zhao 6501890d5c Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-08 14:46:55 +08:00
fit2-zhao b42fbeafa2 fix(接口自动化): query参数自动处理 2021-02-08 14:46:09 +08:00
shiziyuan9527 2d791651db Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-08 14:29:36 +08:00
shiziyuan9527 f233d8d5cb fix(测试跟踪): 修复删除计划关联项目,测试计划也被删除的问题 2021-02-08 14:29:02 +08:00
Captain.B 353d047854 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-08 14:28:53 +08:00
Captain.B ad98e6f783 fix(性能测试): 修复请求很多的时候,图标鼠标悬停显示不全 2021-02-08 14:28:24 +08:00
fit2-zhao 69646c0a92 style(接口自动化): 样式调整 2021-02-08 14:26:27 +08:00
fit2-zhao 9f1ca9fbe0 fix(场景自动化): 去除多余按钮 2021-02-08 14:13:21 +08:00
fit2-zhao 5eb34cbae4 feat(场景自动化): 场景变量增加请求头,并历史请求头数据可以支持迁移 2021-02-08 14:12:07 +08:00
fit2-zhao 415900370e fix(接口自动化): 修复引用场景能添加 其他步骤问题 2021-02-08 11:34:32 +08:00
fit2-zhao 726044ee61 feat(接口自动化): 导入jmx 针对已存在协议处理 2021-02-08 11:24:10 +08:00
fit2-zhao f3e0eb5b9d fix(接口定义): 测试中另存新接口缺陷修复 2021-02-07 11:36:57 +08:00
fit2-zhao d25d6f54cf feat(接口自动化): 导入jmx处理 2021-02-07 11:16:22 +08:00
fit2-zhao 4e14835474 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
2021-02-07 09:47:16 +08:00
fit2-zhao dcb0714601 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
2021-02-07 09:42:00 +08:00
chenjianxing b2bd89f986 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-05 18:52:00 +08:00
chenjianxing 64c746a10a feat: 导出接口支持用例一起导出 2021-02-05 18:51:47 +08:00
fit2-zhao 61992c14d5 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-05 16:38:24 +08:00
fit2-zhao 6c188f3f88 feat(接口自动化): 修复当变量未定义时 影响IF为空或非空判断问题 2021-02-05 16:38:03 +08:00
Captain.B f298817c91 refactor: 统一处理sql异常,不在前台显示,提示sql错误,检查日志文件 2021-02-05 15:38:19 +08:00
fit2-zhao fc625a27f3 feat(接口自动化): 导入Jmeter文件初步结构完成 2021-02-05 15:32:39 +08:00
shiziyuan9527 c5b4450997 refactor: 调整目录结构 2021-02-05 15:07:27 +08:00
chenjianxing 0fd72ce96d refactor: 接口列表全选重构 2021-02-05 14:49:48 +08:00
fit2-zhao eb815f9182 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
2021-02-05 10:58:43 +08:00
chenjianxing 21678d4a77 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-05 10:57:05 +08:00
chenjianxing b41edd7c03 Merge branch 'v1.7' 2021-02-05 10:56:42 +08:00
Coooder-X 7e5c334122
fix: 修复新建接口,另存为用例后,修改接口路径,用例没有同步 (#1409) 2021-02-05 10:53:26 +08:00
fit2-zhao 1102ad81ab Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
2021-02-05 10:40:48 +08:00
wenyann 67a420e78e Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/track/case/components/TestCaseList.vue
2021-02-05 10:19:25 +08:00
wenyann 41964c5c58 fix: 自定义表头 2021-02-05 10:16:51 +08:00
fit2-zhao 38ce17b583 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
2021-02-05 10:14:14 +08:00
fit2-zhao d258d7b693 fix(接口自动化): 修复JSR233 刷新问题 2021-02-05 10:00:55 +08:00
fit2-zhao d1a9332188 fix(接口自动化): 修复展开步骤时卡死问题 2021-02-05 09:50:56 +08:00