test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,552 Commits 40 Branches 170 Tags 410 MiB
Commit Graph

5552 Commits

Author SHA1 Message Date
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
Captain.B 51ca71531e fix(性能测试): 修复请求很多的时候，图标鼠标悬停显示不全 2021-02-08 17:07:30 +08:00
fit2-zhao 726044ee61 feat(接口自动化): 导入jmx 针对已存在协议处理 2021-02-08 11:24:10 +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 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
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
chenjianxing 3aa0d05d66 fix: 另存为新用例报id重复 2021-02-04 19:24:35 +08:00
chenjianxing fe2f4e90a2 fix: sql请求更新接口报错 2021-02-04 18:13:07 +08:00
Captain.B 264ec0e412 Merge remote-tracking branch 'origin/master' 2021-02-04 17:54:11 +08:00
Captain.B 7b3612f84d Merge branch 'v1.7' 2021-02-04 17:53:16 +08:00
chenjianxing 91e1215d65 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 17:44:32 +08:00
chenjianxing 6bad2e75df fix: 拖拽节点到根节点报错 2021-02-04 17:43:41 +08:00
Captain.B 9cb779244f Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-04 17:43:32 +08:00
Captain.B 78d843157b fix(性能测试): 修复切换报告的时候压力配置没有变化的问题 2021-02-04 17:42:32 +08:00
shiziyuan9527 37f451408a Merge branch 'refactor-pool' 2021-02-04 17:11:10 +08:00
shiziyuan9527 7cb592955c refactor(系统设置): 优化测试资源池删除 2021-02-04 17:09:38 +08:00
fit2-zhao bc5f317f15 fix(接口自动化): SQL历史数据升级数据源处理 2021-02-04 17:07:01 +08:00
fit2-zhao 24b172af9f fix(接口自动化): SQL历史数据升级变量处理 2021-02-04 17:00:02 +08:00
fit2-zhao f9d731365b Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 16:26:08 +08:00
fit2-zhao 5071bc16fa fix(接口自动化): 设置csv，默认允许循环获取内容 2021-02-04 16:25:48 +08:00
Captain.B 2052ea4cd7 refactor(性能测试): 清理数据的功能放在data-streaming中 2021-02-04 16:22:46 +08:00
Captain.B 75b5978373 Merge remote-tracking branch 'origin/master' 2021-02-04 16:20:39 +08:00
Captain.B af5a970412 Merge branch 'v1.7' 2021-02-04 16:14:03 +08:00
Captain.B 5ac56fe720 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-04 16:13:07 +08:00
Captain.B 72851dc3ce refactor(性能测试): 清理数据的功能放在data-streaming中 2021-02-04 16:11:40 +08:00
fit2-zhao aa73812c74 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 16:07:32 +08:00
fit2-zhao be1722f7b7 fix(接口自动化): 去除场景级别csv，保留循环内。 2021-02-04 16:07:09 +08:00
Coooder-X ad1c9d3ffe fix: 测试计划 编辑错误 (#1393) 2021-02-04 16:01:33 +08:00
Coooder-X c3941b0c8d
fix: 测试计划 编辑错误 (#1393) 2021-02-04 16:01:07 +08:00
chenjianxing 391cbf06d7 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 15:58:24 +08:00
chenjianxing ef3ddf4a8a fix: jsonpath 推荐名字中带有'.'，推荐失败 2021-02-04 15:50:28 +08:00
fit2-zhao 68256ca9fa Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 15:50:04 +08:00
Captain.B 592b2a7cd0 refactor(性能测试): 每天定时清理已经执行完成的测试中间数据 2021-02-04 15:49:38 +08:00
fit2-zhao 1e9d320ddf fix(接口自动化): 修改包含场景ID字段长度，修复因历史数据升级ID长度过长问题。 2021-02-04 15:49:26 +08:00
song.tianyang aadf243399 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-04 15:26:25 +08:00
song.tianyang 3e8efc608f fix: 接口定义->接口案例->批量编辑，请求方式中，修改TCP/SQL/DUBBO接口的下拉框数据 
接口定义->接口案例->批量编辑，请求方式中，修改TCP/SQL/DUBBO接口的下拉框数据
 2021-02-04 15:25:57 +08:00
Captain.B a33610f5cc Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-04 15:24:59 +08:00
Captain.B 3dbb5a2e5a refactor(性能测试): 每天定时清理已经执行完成的测试中间数据 
(cherry picked from commit b96c602842)
 2021-02-04 15:24:36 +08:00