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 |
chenjianxing
|
3aa0d05d66
|
fix: 另存为新用例报id重复
|
2021-02-04 19:24:35 +08:00 |
|
fit2-zhao
|
039898c635
|
fix(接口自动化): 循环结果放到各自请求中
|
2021-02-04 19:12:36 +08:00 |
|
chenjianxing
|
fe2f4e90a2
|
fix: sql请求更新接口报错
|
2021-02-04 18:13:07 +08:00 |
|
fit2-zhao
|
bd12a36af5
|
Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7
|
2021-02-04 17:54:14 +08:00 |
Captain.B
|
264ec0e412
|
Merge remote-tracking branch 'origin/master'
|
2021-02-04 17:54:11 +08:00 |
|
fit2-zhao
|
291164f15c
|
fix(接口自动化): 场景步骤中自定义接口时隐藏另存用例按钮
|
2021-02-04 17:54:05 +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 |
|
Captain.B
|
4f6cf0e505
|
refactor(性能测试): 每天定时清理已经执行完成的测试中间数据
(cherry picked from commit bbbdb63b21)
|
2021-02-04 15:24:35 +08:00 |
|
Captain.B
|
b96c602842
|
refactor(性能测试): 每天定时清理已经执行完成的测试中间数据
|
2021-02-04 15:23:34 +08:00 |
|
Captain.B
|
bbbdb63b21
|
refactor(性能测试): 每天定时清理已经执行完成的测试中间数据
|
2021-02-04 15:21:25 +08:00 |
|
fit2-zhao
|
bb6986a74a
|
fix(接口自动化): 场景变量搜索问题处理
|
2021-02-04 15:19:40 +08:00 |
|
fit2-zhao
|
935bcbfafe
|
fix(接口定义): 导入Jmeter
|
2021-02-04 14:48:04 +08:00 |
|
chenjianxing
|
7955dc6205
|
Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7
|
2021-02-04 13:36:03 +08:00 |
|
Captain.B
|
2052fe9600
|
Merge branch 'v1.7'
|
2021-02-04 13:35:55 +08:00 |
|
Captain.B
|
124c3e4aa0
|
revert(性能测试): 回退使用java作为http-client，jmeter默认是httpclient4
|
2021-02-04 13:35:38 +08:00 |
|
Captain.B
|
dae7ad93a7
|
Merge branch 'v1.7'
|
2021-02-04 12:56:43 +08:00 |