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

5675 Commits

Author SHA1 Message Date
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
Captain.B 072efeaf86 refactor(性能测试): 使用java作为http-client，设置连接超时60s 2021-02-04 12:56:13 +08:00
chenjianxing 13da850bcb fix: 脚本断言选其他语言不生效 2021-02-04 11:11:20 +08:00
chenjianxing f3fedcdb05 fix: get请求query参数传空报错 2021-02-04 10:19:14 +08:00
Coooder-X 07205c4911 fix: 解决: 测试跟踪-用例评审，删除所有用例再添加时，需要刷新才显示list (#1372) 2021-02-03 19:26:04 +08:00
chenjianxing 29c30607bd Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-03 19:24:51 +08:00
Coooder-X 72c24b41a7
fix: 解决: 测试跟踪-用例评审，删除所有用例再添加时，需要刷新才显示list (#1372) 2021-02-03 19:24:10 +08:00
chenjianxing 32afe89ae8 Merge branch 'v1.7' 2021-02-03 19:23:12 +08:00
chenjianxing 03a8401b1b fix: 修复_fileter和_sort方法引用 2021-02-03 19:22:34 +08:00
chenjianxing 9b66d9c261 Merge branch 'v1.7' 2021-02-03 19:07:03 +08:00
chenjianxing 9ed341da50 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 19:05:12 +08:00
chenjianxing c115ea22e5 refactor: 代码优化 2021-02-03 19:04:50 +08:00
wenyann 167742dfd9 fix: 测试 2021-02-03 18:57:11 +08:00
fit2-zhao 76bcd14500 fix(接口定义): 排序修改 2021-02-03 18:50:02 +08:00
song.tianyang 0fa4facec4 fix: 代码格式优化 
代码格式优化
 2021-02-03 18:28:00 +08:00
chenjianxing 947ec17383 refactor: 抽取表格相关代码 2021-02-03 18:17:29 +08:00
fit2-zhao e69ee40438 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-03 17:48:37 +08:00
chenjianxing 937ce3f3c6 refactor: jar包管理优化 2021-02-03 17:21:20 +08:00
song.tianyang 683c533db0 Merge branch 'v1.7' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	backend/src/main/java/io/metersphere/track/service/TestPlanService.java
#	frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
#	frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
 2021-02-03 17:11:04 +08:00
song.tianyang e3903adcd0 refactor: 添加国际化字段 
添加国际化字段
 2021-02-03 16:57:04 +08:00