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

2782 Commits

Author SHA1 Message Date
fit2-zhao c89e439ab5 fix(接口定义): JSON-SCHEMA 数据缺陷修复 2021-01-21 18:39:40 +08:00
song.tianyang 683d538b4b Merge remote-tracking branch 'origin/master' 2021-01-21 18:36:21 +08:00
song.tianyang 2c7a65a5ec fix: 修复测试计划中执行场景案例失败的问题 
修复测试计划中执行场景案例失败的问题
 2021-01-21 18:35:52 +08:00
chenjianxing 5d9cf69916 fix: 场景页面批量编辑用例 2021-01-21 17:43:02 +08:00
fit2-zhao 0d278cf20b fix(接口自动化): 迁移的数据编号处理 2021-01-21 16:58:57 +08:00
fit2-zhao 96caef2f10 fix(接口自动化): 迁移的数据执行报错处理 2021-01-21 16:53:43 +08:00
fit2-zhao 4fd5bce705 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 15:42:27 +08:00
fit2-zhao a64294e86e fix(接口自动化): 迁移的数据执行报错处理 2021-01-21 15:42:07 +08:00
Captain.B 44152ef296 refactor: 用户名或密码错误的时候显示信息修改 2021-01-21 15:15:41 +08:00
Captain.B 8699187673 refactor(接口测试): 测试用例显示tags 2021-01-21 14:54:56 +08:00
shiziyuan9527 244dedc47c feat: 接口用例根据tag搜索 2021-01-21 14:25:41 +08:00
song.tianyang 8c4756b3a1 Merge remote-tracking branch 'origin/master' 2021-01-21 13:37:11 +08:00
song.tianyang 6f8ac5fb46 fix: 修复定时任务结束时通知不正确的问题 
修复定时任务结束时通知不正确的问题
 2021-01-21 13:36:39 +08:00
Captain.B 141a526e1d refactor: 启动测试时检查当前站点配置是否可用 2021-01-21 10:55:37 +08:00
chenjianxing deae6d6053 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 20:27:28 +08:00
chenjianxing 9c310d7678 feat: TCP优化 2021-01-20 20:27:12 +08:00
Captain.B 55039a984b Merge remote-tracking branch 'origin/master' 2021-01-20 17:16:05 +08:00
Captain.B 45c65497ce fix: 用户不存在时候提示修改 
Closes #1091
 2021-01-20 17:15:41 +08:00
shiziyuan9527 9d49124fc7 feat: 列表可以根据tag搜索 2021-01-20 16:53:27 +08:00
song.tianyang 57e971a357 fix: 
修复场景步骤标题未显示的问题、修复测试计划的性能测试任务结束回调时资源占用的问题
 2021-01-20 16:43:32 +08:00
fit2-zhao cdf1b73253 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 14:53:58 +08:00
fit2-zhao 91ded7f5ba feat(接口定义): 另存新用例 TAG问题修复 2021-01-20 14:53:34 +08:00
wenyann dd974949e3 feat: swagger定时同步 2021-01-20 14:07:39 +08:00
wenyann c7500edaa9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
#	backend/src/main/java/io/metersphere/xpack
 2021-01-20 14:04:46 +08:00
wenyann 8512f8f262 feat: swagger定时同步 2021-01-20 13:56:58 +08:00
fit2-zhao 0070123bef feat(接口定义): 增加用例批量编辑功能 2021-01-20 13:12:09 +08:00
fit2-zhao 67635aebbd fix(接口定义): 用例状态统计不准确问题修复 2021-01-20 11:52:37 +08:00
fit2-zhao 0f8cefffb3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 11:16:43 +08:00
fit2-zhao 6d78a2ade9 refactor(接口定义): 重构列表查询sql 加速查询 2021-01-20 11:16:22 +08:00
song.tianyang b58dd49a26 Merge remote-tracking branch 'origin/master' 2021-01-20 11:06:14 +08:00
fit2-zhao 49698e59af refactor(接口定义): 重构用例存储及结果统计 2021-01-20 11:00:11 +08:00
song.tianyang d99fa9b568 refactor: 代码重构-通用代码块提取 
代码重构-通用代码块提取
 2021-01-20 10:55:12 +08:00
fit2-zhao ea7090b3eb refactor(接口定义): 重构用例存储及结果统计 2021-01-20 10:29:17 +08:00
fit2-zhao 66c14eea89 fix(接口定义): 修复参数提取问题 2021-01-20 09:45:51 +08:00
fit2-zhao 260f88a1ee fix(接口自动化): 修复执行没有结果返回时 频繁刷新问题 2021-01-19 18:02:14 +08:00
fit2-zhao 8a47dfa112 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-01-19 18:01:07 +08:00
fit2-zhao 56b5b83b4b fix(接口自动化): 批量报告处理 2021-01-19 16:43:33 +08:00
shiziyuan9527 086a1e50bb feat(测试计划): 性能测试用例按照名称或ID查询 2021-01-19 16:30:47 +08:00
Captain.B 1d2bf1adfe Merge remote-tracking branch 'origin/master' 2021-01-19 16:20:40 +08:00
Captain.B b315e3af97 feat(xPack): CAS 登录 2021-01-19 16:19:54 +08:00
song.tianyang c7dfb4160b fix: 修改图标、修改"一件创建性能测试"时压力配置下方显示的内容 
修改图标、修改"一件创建性能测试"时压力配置下方显示的内容
 2021-01-19 16:16:58 +08:00
Captain.B fcf971285c feat(xPack): CAS 登录 2021-01-19 16:01:55 +08:00
fit2-zhao f6490cb5ed Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 15:54:42 +08:00
fit2-zhao 387c685455 fix(接口自动化): 循环控制器死循环问题修复 2021-01-19 15:54:13 +08:00
Captain.B 9dde59379d Merge remote-tracking branch 'origin/master' 2021-01-19 15:50:20 +08:00
Captain.B 43ae3dd2ce feat(xPack): CAS 登录 2021-01-19 15:49:20 +08:00
song.tianyang 097ab76a70 refactor: 测试计划执行接口案例-将方法迁移到测试计划Service中 
测试计划执行接口案例-将方法迁移到测试计划Service中
 2021-01-19 14:53:44 +08:00
song.tianyang 0f983aae63 fix: 修复测试计划手动保存报告不成功的问题 
修复测试计划手动保存报告不成功的问题
 2021-01-19 14:43:13 +08:00
song.tianyang e4b16c31d4 feat: 测试计划-增加定时任务、修改接口列表、接口自动化的按钮 
测试计划-增加定时任务、修改接口列表、接口自动化的按钮
 2021-01-19 14:26:58 +08:00
fit2-zhao 4c882ffafd feat(接口定义): 测试步骤位置调整 2021-01-19 13:12:35 +08:00
Captain.B 26edcd1e0c chore: Sync 2021-01-19 09:43:23 +08:00
chenjianxing 8589eeb47b refactor: 场景组件点击名称编辑自动获取焦点 2021-01-18 20:35:34 +08:00
fit2-zhao 6e4e42812a fix(接口自动化): 循环控制器处理 2021-01-18 18:26:45 +08:00
fit2-zhao c951c38eab Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
 2021-01-18 18:15:39 +08:00
fit2-zhao 7fdf8b4154 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
 2021-01-18 18:15:31 +08:00
fit2-zhao ba6c5b85a6 fix(接口自动化): 修复执行报告场景名称问题 2021-01-18 18:12:02 +08:00
wenyann 3c36edbb96 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
 2021-01-18 18:07:57 +08:00
wenyann 5b2359ec3c feat: swagger定时自动同步 2021-01-18 18:05:25 +08:00
song.tianyang 3cbca58209 fix: 修复全选统计错误的缺陷、修复测试计划定时任务的缺陷 
修复全选统计错误的缺陷、修复测试计划定时任务的缺陷
 2021-01-18 17:45:01 +08:00
shiziyuan9527 de31246d53 refactor(测试跟踪): 用例评审优化 2021-01-18 17:28:12 +08:00
chenjianxing 51ca545122 fix: 修改接口用例空指针 2021-01-18 17:07:12 +08:00
fit2-zhao ffd86d01d4 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 14:54:14 +08:00
fit2-zhao aeaf6f8018 refactor(接口定义): 代码统一规范 2021-01-18 14:53:49 +08:00
Captain.B c4769dbf22 fix: 去掉没有用到的类 2021-01-18 14:49:12 +08:00
Captain.B 4994ca3780 Merge remote-tracking branch 'origin/master' 2021-01-18 14:35:41 +08:00
Captain.B da3811eb3c fix: 去掉没有用到的字段 2021-01-18 14:35:22 +08:00
fit2-zhao b0d01bebba fix(接口定义): 修复用例执行成功后，结果未更新，响应内容为空 2021-01-18 13:02:23 +08:00
chenjianxing 61d8b0b9c8 refactor: kafka报错无法启动 2021-01-18 11:41:23 +08:00
song.tianyang c9868bfd69 fix: 修改数据库脚本文件 
修改数据库脚本文件
 2021-01-13 17:01:31 +08:00
song.tianyang 477e55e16d fix(删除不存在的文件引用): 
删除不存在的文件引用
 2021-01-13 16:54:03 +08:00
song.tianyang 8d152a077e feat(测试计划增加定时任务、增加测试报告查看页面): 
测试计划增加定时任务、增加测试报告查看页面
 2021-01-13 16:51:02 +08:00
shiziyuan9527 93654862ef refactor(测试计划): 性能测试用例执行 2021-01-13 16:17:18 +08:00
fit2-zhao 41f928aa89 feat(接口定义): 接口用例增加执行结果展示 2021-01-13 15:25:05 +08:00
wenyann 6e5427c54d Merge remote-tracking branch 'origin/master' 2021-01-13 14:43:15 +08:00
wenyann fd651e3b34 Merge remote-tracking branch 'origin/master' 2021-01-13 14:42:57 +08:00
Captain.B 3880b876e3 Merge remote-tracking branch 'origin/master' 2021-01-13 14:42:48 +08:00
Captain.B 473d279817 fix: 修改枚举使用不当的问题 2021-01-13 14:41:47 +08:00
fit2-zhao 193a212e09 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 14:41:07 +08:00
fit2-zhao 57beb94ada fix(接口自动化): 修复数据迁移后无法编辑问题 2021-01-13 14:40:38 +08:00
Captain.B f8785d06ab fix: 通过apikey登陆使用local realm 2021-01-13 14:13:15 +08:00
Captain.B 9921489cc4 Merge remote-tracking branch 'origin/master' 2021-01-13 14:00:39 +08:00
Captain.B 8e70eefe3c refactor: 接收测试结束的通知 2021-01-13 14:00:19 +08:00
fit2-zhao f0acc7c392 fix(接口定义): 修复参数提取 空指针问题 2021-01-13 13:43:44 +08:00
fit2-zhao a0312d1025 refactor(接口定义): 重构接口执行提取参数方法 2021-01-13 13:19:45 +08:00
wenyann a2ff38a10f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 11:37:22 +08:00
chenjianxing 1ec251c65a refactor: 测试用例列表页面优化 2021-01-13 11:20:27 +08:00
wenyann 2639e2a266 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-01-13 10:46:02 +08:00
wenyann 7d33f66a26 fix: 添加测试环境，查询测试计划下性能测试 2021-01-13 10:40:46 +08:00
fit2-zhao d72edc7b33 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 18:52:19 +08:00
fit2-zhao 96900cd1f4 refactor(接口自动化): 执行代码优化 2021-01-12 18:51:55 +08:00
shiziyuan9527 17ecef469b feat(测试计划): 统计报告新增性能测试用例饼图 2021-01-12 18:08:40 +08:00
fit2-zhao 5d96c71d06 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 15:54:38 +08:00
fit2-zhao a46f3cfbba fix(测试跟踪): 测试用例XMIND导入，重复内容更新 2021-01-12 15:53:12 +08:00
shiziyuan9527 9e52669a26 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 15:41:45 +08:00
shiziyuan9527 30b3f83725 feat(测试计划): 性能测试用例展示ID列 2021-01-12 15:41:14 +08:00
Captain.B 4233af67e9 Merge remote-tracking branch 'origin/master' 2021-01-12 15:39:52 +08:00
Captain.B e2048ef969 fix: 修复普通用户查询所有角色列表的bug 
Closes #1090
 2021-01-12 15:39:20 +08:00
shiziyuan9527 4cef65d9f8 feat(性能测试): 测试列表添加ID列 2021-01-12 15:22:08 +08:00
Captain.B 67a9e1588e feat: 配置认证源 2021-01-12 15:12:10 +08:00
Captain.B d7dbcf0860 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/xpack
 2021-01-12 15:09:04 +08:00
Captain.B c3673be342 feat: 配置认证源 2021-01-12 15:08:07 +08:00
fit2-zhao 5b60ac942c fix(接口定义): 修复模块移动缺陷 2021-01-12 14:58:30 +08:00
fit2-zhao a1eac0996f feat(接口自动化): 修复部分缺陷 2021-01-12 14:51:15 +08:00
fit2-zhao 86b19b68fc feat(接口自动化): 报告优化 2021-01-12 11:16:46 +08:00
fit2-zhao e451248e25 fix(接口自动化): 冲突合并 2021-01-12 09:33:44 +08:00
fit2-zhao a023b85f99 fix(接口自动化): 冲突合并 2021-01-11 19:00:47 +08:00
fit2-zhao 93d57b7d1f fix(接口自动化): 修复测试报告，按照场景展示 2021-01-11 18:50:12 +08:00
chenjianxing 5781cc7b1e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 18:14:48 +08:00
chenjianxing 07b500331d feat: 接口定义TCP 2021-01-11 18:14:35 +08:00
fit2-zhao 6b57e3a3e2 fix(接口自动化): 所有高级搜索增加TAGS 2021-01-11 15:54:49 +08:00
fit2-zhao 869b66e551 fix(接口自动化): 修复JSON 格式数据请求问题 2021-01-11 15:11:24 +08:00
Captain.B 2564c81302 Merge remote-tracking branch 'origin/master' 2021-01-11 14:19:25 +08:00
Captain.B d64691fe9a refactor: 性能测试表头优化 2021-01-11 14:08:48 +08:00
fit2-zhao b542049389 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 13:47:29 +08:00
fit2-zhao 489b2b8f10 feat(接口定义): 高级查询 2021-01-11 13:46:56 +08:00
Captain.B a00334acf3 fix: 修复查询个人信息时越权的问题 
Closes #1089
 2021-01-11 11:38:24 +08:00
shiziyuan9527 313fb0a244 feat(测试计划): 性能测试用例执行结果 2021-01-08 18:13:47 +08:00
Captain.B e9482b3ecb Merge remote-tracking branch 'origin/master' 2021-01-08 18:05:11 +08:00
Captain.B f84d373020 fix: 修复共享变量导致通知不能发送 2021-01-08 18:04:35 +08:00
fit2-zhao f22a917f12 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 17:54:16 +08:00
fit2-zhao a57e07bba5 feat(接口自动化): 完成场景变量 2021-01-08 17:54:09 +08:00
fit2-zhao fe74a26fd2 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
 2021-01-08 17:53:45 +08:00
Captain.B 3a26a9cfbc fix: 修复个人信息设置功能的bug 
Closes #1087
 2021-01-08 17:46:43 +08:00
Captain.B ddd640c7c1 fix: 修复个人信息设置功能的bug 
Closes #1087
 2021-01-08 17:44:29 +08:00
Captain.B 7cd5d8c661 refactor: 性能测试执行前检查资源池的状态 2021-01-08 16:08:47 +08:00
fit2-zhao 30762dae9f feat(接口自动化): 完成场景变量基础存储功能 2021-01-08 15:54:45 +08:00
Captain.B 1c385a991f Merge remote-tracking branch 'origin/master' 2021-01-08 15:22:56 +08:00
Captain.B e98d1eee56 refactor: 接口测试用例列表表头优化 2021-01-08 15:22:37 +08:00
chenjianxing 46736b254f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 14:52:34 +08:00
chenjianxing 2286f66e0c fix: 解决冲突 2021-01-08 14:50:24 +08:00
Captain.B d37ae32045 refactor: 接口列表表头优化 2021-01-08 14:43:06 +08:00
chenjianxing c62adcfc32 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2021-01-08 14:42:17 +08:00
chenjianxing aa53e696cc fix: swagger2.0 导入失败 2021-01-08 14:40:07 +08:00
shiziyuan9527 2f8d0e9163 feat(测试计划): 批量取消性能测试用例关联 2021-01-08 14:20:04 +08:00
fit2-zhao 7c3b718863 fix(接口定义): 冲突合并 2021-01-08 13:49:58 +08:00
fit2-zhao ff0b258785 fix(接口定义): 修复用例最后结果统计问题 2021-01-08 13:37:57 +08:00
Captain.B ed819b4710 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-01-08 13:37:18 +08:00
Captain.B 67c71ff01a refactor: 统一显示标签 2021-01-08 13:35:43 +08:00
fit2-zhao c291de3292 feat(接口自动化): 场景变量处理 2021-01-08 13:29:00 +08:00
shiziyuan9527 a8a9664070 feat(测试计划): 取消项目关联时取消性能测试用例关联 2021-01-08 11:36:41 +08:00
wenyann 019135b947 fix: 修复测试计划不全问题 2021-01-08 10:42:39 +08:00
shiziyuan9527 a2856898d6 refactor(测试计划): 性能测试用例按照项目查询 2021-01-07 18:57:12 +08:00
Captain.B 73f09844bb Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
 2021-01-07 17:57:20 +08:00
Captain.B 460b4daff6 feat: 显示标签列 2021-01-07 17:53:36 +08:00
shiziyuan9527 0e1b379b67 feat(测试计划): 性能测试用例执行 2021-01-07 17:17:44 +08:00
Captain.B a2c1baece6 feat: 测试用例保存tag 2021-01-07 16:03:02 +08:00
song.tianyang a70b8b31ab refactor: 合并分支 feature_1000439 解决冲突 
合并分支 feature_1000439 解决冲突
 2021-01-07 15:26:20 +08:00
Captain.B 18340d16e5 feat: 接口测试用例保存tag 2021-01-07 15:18:52 +08:00
Captain.B 590e6c9a9c Merge remote-tracking branch 'origin/master' 2021-01-07 14:07:42 +08:00
song.tianyang 1909c4267f Merge branch 'feature_1000439' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/APITestController.java
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/api/definition/components/reference/ApiExtendBtns.vue
 2021-01-07 14:06:26 +08:00
Captain.B c609ce254f feat: 接口定义保存tag 2021-01-07 14:04:21 +08:00
song.tianyang 2ebdaf6832 Merge remote-tracking branch 'origin/master' 2021-01-07 13:42:23 +08:00
song.tianyang d208d358be feat: 测试计划增加定时任务,执行接口案例和场景案例 
测试计划增加定时任务,执行接口案例和场景案例
 2021-01-07 13:41:54 +08:00
shiziyuan9527 555d60fb07 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 11:10:53 +08:00
shiziyuan9527 657d800536 feat(测试计划): 测试计划增加性能测试用例 2021-01-07 11:10:19 +08:00
fit2-zhao cfa70bb622 fix(接口自动化): 修复http 协议输入参数无名称 校验 2021-01-07 10:47:28 +08:00
fit2-zhao 3bb9d4c8f1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 10:42:33 +08:00
fit2-zhao c0fb16571a fix(接口自动化): 解决sql类型数据源 无法回显问题，并对历史数据进行兼容 2021-01-07 10:41:57 +08:00
shiziyuan9527 87a074310f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 10:22:59 +08:00
chenjianxing edf8eaed08 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 19:22:29 +08:00
chenjianxing 5f0a802114 Merge branch 'v1.6' 2021-01-06 19:20:31 +08:00
fit2-zhao 540aba788c fix(接口自动化): 修复数据迁移缺陷 2021-01-06 18:55:25 +08:00
fit2-zhao 4dfaa1c463 fix(接口自动化): 修复数据迁移，sql类型数据源丢失问题 2021-01-06 18:34:17 +08:00
fit2-zhao d1c179fc5c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 18:27:10 +08:00
fit2-zhao f096e1e52b feat(接口自动化): 循环控制器 2021-01-06 18:26:52 +08:00
chenjianxing e012d43889 fix: 断言正确空指针 2021-01-06 18:21:25 +08:00
shiziyuan9527 42217eb1c6 feat(测试计划): 增加性能测试用例 2021-01-06 18:14:47 +08:00
chenjianxing 32b8f17ba0 fix: 断言正确时获取不到请求结果 2021-01-06 18:10:48 +08:00
chenjianxing 625085c0a6 fix: swagger3 空指针 2021-01-06 17:10:42 +08:00
chenjianxing 5770f91e92 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 17:04:39 +08:00
chenjianxing 7788f4d53d Merge branch 'v1.6' 2021-01-06 17:04:17 +08:00
chenjianxing 1566f8c79b fix: 修改模块名称报错 2021-01-06 16:31:27 +08:00
chenjianxing 9cb5c64925 refactor: v1.6 2021-01-06 16:21:26 +08:00
Captain.B c6ceea74ab refactor: 设置rps时长 2021-01-06 16:14:11 +08:00
Captain.B 9bd8a55f2e chore: Sync 2021-01-06 15:26:47 +08:00
chenjianxing d41560b705 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2021-01-06 15:13:40 +08:00
chenjianxing f9f5ff86bd refactor: postman导入优化 2021-01-06 15:13:21 +08:00
Captain.B f02477ce05 Merge remote-tracking branch 'origin/master' 2021-01-06 15:11:32 +08:00
Captain.B a71f4a6610 Merge branch 'tmp' 2021-01-06 15:10:42 +08:00
Captain.B 5952b01646 refactor: 按照迭代次数和执行时间区分性能测试 2021-01-06 14:59:35 +08:00
fit2-zhao b2e619e355 fix(接口定义): DUBBO执行缺陷修复 2021-01-06 14:52:32 +08:00
fit2-zhao 3789365746 feat(接口自动化): 循环控制器 2021-01-06 14:49:33 +08:00
fit2-zhao 5ec2e11ca5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 14:19:11 +08:00
fit2-zhao 59de447719 feat(接口自动化): 数据迁移 2021-01-06 14:18:51 +08:00
chenjianxing baea09fcae Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 14:05:47 +08:00
chenjianxing d2fd83389c fix: 解决冲突 2021-01-06 14:01:21 +08:00
chenjianxing cc3006b9a1 refactor: 增加测试用例名称长度 2021-01-06 13:54:02 +08:00
fit2-zhao 643db9c863 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/APITestController.java
 2021-01-06 13:49:43 +08:00
fit2-zhao 624970c16d Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 
# Conflicts:
#	frontend/src/business/components/settings/project/MsProject.vue
 2021-01-06 13:43:30 +08:00
fit2-zhao 09fd2c2ab6 feat(接口自动化): 增加URL唯一性校验开关，控制URL校验规则 2021-01-06 13:38:17 +08:00
fit2-zhao fc8c997716 feat(接口自动化): 数据迁移初版 2021-01-06 12:24:13 +08:00
chenjianxing e975dcbc18 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2021-01-06 12:04:40 +08:00
chenjianxing 55e8d9fec6 refactor: 导入接口到指定目录下 2021-01-06 12:04:21 +08:00
Captain.B e937b3d949 Merge remote-tracking branch 'origin/master' 2021-01-06 10:04:52 +08:00
Captain.B f3dc01d3a9 Merge branch 'v1.6' 2021-01-06 10:04:27 +08:00
Captain.B d89de179b3 fix: 修复下载文件时文件名没有解析的bug 2021-01-06 10:03:07 +08:00
song.tianyang b402acfeda fix: 场景跳转数据查询功能失效 
修复场景跳转数据查询功能失效的问题
 2021-01-05 18:20:51 +08:00
song.tianyang 252f5f3c10 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-01-05 18:05:46 +08:00
song.tianyang 7f8478d904 fix: 添加dto用于生成jmx 
添加dto用于生成jmx
 2021-01-05 17:50:56 +08:00
song.tianyang 9a32e83a01 feat: 接口测试首页优化 
接口测试首页优化
 2021-01-05 17:43:55 +08:00
wenyann 2d609fded2 Merge remote-tracking branch 'origin/master' 2021-01-05 17:37:13 +08:00
wenyann 1a43a1605a fix: 更换jenkins查询测试计划接口 2021-01-05 17:32:28 +08:00
chenjianxing 2c2f8b8476 fix: 删除测试计划报错 2021-01-05 16:29:07 +08:00
ronghuaxiang 730f7452cd Update JMeterVars.java (#981) 
解决使用JSONPath的$..xx的语法匹配多个值时，提取出来的值不应该只有一个，
解决多值匹配时候变量无法传递问题

Co-authored-by: xiangronghua <xiangronghua@163.com>
 2021-01-05 16:00:54 +08:00
chenjianxing e927b1e6ac fix: swagger 名称为空报错 2021-01-05 15:59:27 +08:00
chenjianxing a259db45bc fix: swagger 名称为空报错 2021-01-05 15:58:01 +08:00
fit2-zhao b65c79424b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-05 15:34:31 +08:00
fit2-zhao 7e4ad2384a fix(接口自动化): 场景批量执行，无步骤的场景跳过，正常的继续执行 2021-01-05 15:33:47 +08:00
chenjianxing 6e7560cf6a Merge branch 'v1.6' 2021-01-05 15:11:53 +08:00
ronghuaxiang 62a82dbf04
Update JMeterVars.java (#981) 
解决使用JSONPath的$..xx的语法匹配多个值时，提取出来的值不应该只有一个，
解决多值匹配时候变量无法传递问题

Co-authored-by: xiangronghua <xiangronghua@163.com>
 2021-01-05 14:50:55 +08:00
shiziyuan9527 b824302acf feat(测试计划): 接口测试用例页面添加ID列 2021-01-05 14:27:47 +08:00
fit2-zhao 1e6b252d12 feat(接口定义): 增加批量修改用例信息功能 2021-01-05 14:23:13 +08:00
wenyann d984b2f08a Merge remote-tracking branch 'origin/master' 2021-01-05 14:21:01 +08:00
wenyann 5aa46f6656 feat: 添加邮件测试 2021-01-05 14:20:32 +08:00
Captain.B 9fc151f6e2 chore: Sync 2021-01-05 12:59:03 +08:00
fit2-zhao 554af29606 refactor(接口定义): 增加JSON-SCHEMA开关 2021-01-05 12:46:07 +08:00
chenjianxing 83da070040 fix: xpath提取出错会添加断言错误 2021-01-05 11:35:39 +08:00
fit2-zhao 4fb1a6319a Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
 2021-01-05 09:34:02 +08:00
fit2-zhao cd44e90808 feat(接口定义): 完成json编辑器 2021-01-04 19:05:31 +08:00
chenjianxing 45d0a6515e fix: 取消关联项目同取消关联的接口用例 2021-01-04 18:01:56 +08:00
chenjianxing c507e86f52 fix: 关联接口用例列表重复显示问题 2021-01-04 14:19:59 +08:00
song.tianyang b0f9723dd4 refactor: 接口用例、用例列表、场景用例列表增加创建性能测试的功能 
接口用例、用例列表、场景用例列表增加创建性能测试的功能  原来是跳转之后后台直接创建，现在跳转到创建页面
 2021-01-04 12:39:19 +08:00
chenjianxing aa81f08341 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-04 11:40:29 +08:00
chenjianxing 7270c24eb2 fix: swagger 导入栈溢出 2021-01-04 11:40:12 +08:00
song.tianyang 8e5105d579 feat: 接口用例、用例列表、场景用例列表增加创建性能测试的功能 
接口用例、用例列表、场景用例列表增加创建性能测试的功能
 2021-01-04 11:28:17 +08:00
Captain.B c3f0b8d96f chore: Sync 2020-12-31 16:35:37 +08:00
Captain.B ec8265b4be chore: Sync 2020-12-31 16:35:07 +08:00
fit2-zhao d29c8bf2a2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 16:22:09 +08:00
fit2-zhao 0c6468946f fix(接口定义): 修复接口参数类型 2020-12-31 16:15:16 +08:00
fit2-zhao 429cd31531 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-31 16:12:39 +08:00
fit2-zhao 6dd2f72c05 fix(接口自动化): 接口用例执行修改 2020-12-31 16:12:22 +08:00
BugKing f2b439905e Merge branch 'master' into v1.6 2020-12-31 16:02:55 +08:00
fit2-zhao a2e2994dbc fix(接口自动化): 预览 2020-12-31 16:00:23 +08:00
Captain.B 3801ab6bb5 Merge branch 'v1.6' 2020-12-31 15:49:38 +08:00
chenjianxing b9848e452c fix: 导入接口重复替换，删除测试计划删除关联的接口用例 2020-12-31 15:40:00 +08:00
fit2-zhao 8cf56af2b9 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-31 15:24:03 +08:00
fit2-zhao 515f524f3e feat(接口测试): 增加Jenkins 调用 执行用例方法 2020-12-31 15:23:45 +08:00
wenyann b190b77788 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-31 15:11:36 +08:00
wenyann 3155af90f5 fix: jenkins接口修改 2020-12-31 15:11:08 +08:00
fit2-zhao 199327be75 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 15:02:37 +08:00
BugKing a19e3521e2 Merge branch 'master' into v1.6 2020-12-31 14:32:32 +08:00
chenjianxing d4fd50b274 refactor: 测试用例名称长度增大 2020-12-31 14:06:20 +08:00
fit2-zhao a9a6c52122 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 14:04:15 +08:00
chenjianxing 53943f4176 refactor: 代码优化 2020-12-31 13:58:42 +08:00
fit2-zhao 75bb894228 fix(接口自动化): 存储JSON-SCHEMA 2020-12-31 13:48:47 +08:00
BugKing d191dd36bd Merge branch 'master' into v1.6 2020-12-31 13:39:02 +08:00
chenjianxing 69414cae58 fix：导出json路径为空是，模块显示id 2020-12-31 11:22:51 +08:00
chenjianxing ab495f21f4 fix: swagger 3 堆栈溢出 2020-12-31 10:48:01 +08:00
fit2-zhao b84abd3713 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 10:45:14 +08:00
fit2-zhao d3cd2f4843 fix(接口自动化): 修复执行类型为空时错误 2020-12-31 10:44:20 +08:00
fit2-zhao f9746619f2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 09:57:49 +08:00
chenjianxing f40726a74a fix: 解决冲突 2020-12-31 09:46:03 +08:00
zwp201301 9279deb3e9
Bug修复：swagger接口的入参必填与非必填。目前是没有判断swagger的必填与否，全部固定为必填。 (#1025) 
1、KeyValue中的required属性不能写死，需要在对象构造的时候初始化；
2、HeaderParameter和CookieParameter类型参数，增加required属性；
3、FormParameter、QueryParameter、HeaderParameter和CookieParameter均增加required属性动态传递给KeyValue
 2020-12-31 09:30:29 +08:00
chenjianxing 3f80c98d76 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-30 22:00:23 +08:00
chenjianxing aed55a9709 refactor: 支持swagger 3.0 2020-12-30 22:00:00 +08:00
shiziyuan9527 e9454d273b fix(测试计划): 修复编辑测试计划缺陷 2020-12-30 20:31:49 +08:00
shiziyuan9527 987ab3b395 fix(测试跟踪): 修复测试跟踪首页数据查询问题 2020-12-30 18:50:06 +08:00
shiziyuan9527 6ba32fbda9 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-30 18:16:18 +08:00
shiziyuan9527 1631803bbd refactor(测试计划): 测试计划优化 2020-12-30 18:15:07 +08:00
fit2-zhao d8d572fb14 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-30 16:55:27 +08:00
fit2-zhao 56d0a24fd8 fix(接口自动化): 修复通用请求头问题 2020-12-30 16:55:12 +08:00
song.tianyang a1c1a023a6 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-30 14:43:43 +08:00
song.tianyang d32000e0bd feat: 接口定义-案例表格增加全部数据批量操作支持 
接口定义-案例表格增加全部数据批量操作支持
 2020-12-30 14:42:48 +08:00
fit2-zhao 4b975918e1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-30 11:27:22 +08:00
fit2-zhao a683bb27ff fix(接口自动化): 修复http环境请求头公共参数无效问题 2020-12-30 11:25:26 +08:00
fit2-zhao 22fee64092 fix(接口自动化): 增加json 列表编辑器 2020-12-30 11:03:59 +08:00
Captain.B 22e8bf6def refactor: k8s 环境指定namespace 2020-12-30 10:40:37 +08:00
Captain.B 4cf7c06f07 refactor: k8s 环境指定namespace 2020-12-30 10:34:17 +08:00
song.tianyang 9be10ec291 refactor: 处理上次提交合并冲突时未删除的代码块 
处理上次提交合并冲突时未删除的代码块
 2020-12-29 18:00:03 +08:00
song.tianyang 7cc9f8c01d Merge remote-tracking branch 'origin/v1.6' into v1.6 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2020-12-29 17:46:22 +08:00
song.tianyang f2908ac330 feat: 接口定义页面增加"选择所有数据"操作 
接口定义页增加"选择所有数据"功能，用于批量修改、批量删除
 2020-12-29 17:41:35 +08:00
chenjianxing 62ac695a0b refactor: 测试计划关联列表只列出有未关联用例的接口 2020-12-29 16:43:29 +08:00
chenjianxing 2ff0726965 fix: 解决冲突 2020-12-29 15:39:51 +08:00
chenjianxing 9ce507d201 refactor: 测试计划获取关联接口列表 2020-12-29 15:32:57 +08:00
song.tianyang f1564b5751 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-29 15:19:47 +08:00
song.tianyang fbc19a6f32 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-29 15:18:05 +08:00
fit2-zhao fb8abc6c18 fix(接口自动化): 执行场景没有步骤时保护 2020-12-29 15:17:55 +08:00
song.tianyang 669cfd168b feat: 增加"选择所有数据"功能 
接口自动化页面、测试报告页面，增加"选择所有数据"功能，用于批量操作
 2020-12-29 15:17:43 +08:00
chenjianxing 8d8292227f refactor: 代码优化 2020-12-29 14:15:58 +08:00
Captain.B 1f611e3f5c Merge branch 'v1.6' 2020-12-29 11:03:58 +08:00
Captain.B 1154b3ce80 fix: 修改k8s资源池节点验证信息 2020-12-29 11:03:24 +08:00
Captain.B c52fddbe19 refactor: 国际化 not support key 显示具体的key 2020-12-29 10:54:08 +08:00
fit2-zhao 16163203d9 Merge branch 'v1.6' 2020-12-29 10:18:31 +08:00
fit2-zhao 711c787f8d fix(接口自动化): 添加执行时 mock 处理 2020-12-29 09:56:26 +08:00
fit2-zhao f5ea7d25b9 fix(接口自动化): 执行场景非变量的参数不做处理 2020-12-28 19:36:58 +08:00
Captain.B 5d9da617be Merge branch 'v1.6' 2020-12-28 16:52:50 +08:00
chenjianxing 8e1d3a3da7 fix: 更新提交 2020-12-28 14:44:46 +08:00
shiziyuan9527 06706736db refactor: sql 2020-12-28 14:29:03 +08:00
Captain.B 271275f4bd chore: Sync 2020-12-28 14:25:07 +08:00
chenjianxing 85b90f3226 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 14:20:51 +08:00
chenjianxing f323e737e1 fix: 性能测试列表为空 2020-12-28 14:20:26 +08:00
chenjianxing 5f1adb6d34 fix: 性能测试列表为空 2020-12-28 14:19:49 +08:00
luoylove 24e89c2c57
swaggerParser RefProperty bug fix (#994) 
Co-authored-by: luoyoujun <luoyoujun3712@dingtalk.com>
 2020-12-28 13:47:25 +08:00
Captain.B 79d34a1825 fix(接口测试): 接口测试 url encoder 
Closes #872
 2020-12-28 13:04:18 +08:00
Captain.B 758677beb5 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-28 12:55:13 +08:00
Captain.B 4cc0fd0e24 fix(接口测试): 接口测试 url encoder 
Closes #872
 2020-12-28 12:54:48 +08:00
chenjianxing 965f43d9fc Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 12:50:58 +08:00
chenjianxing 8696347f4a fix: 测试计划进度没有统计到接口测试用例 2020-12-28 12:49:40 +08:00
Captain.B ad982b5e09 fix: 修复火狐icon不能显示的问题 2020-12-28 11:08:17 +08:00
Captain.B dd5b0d9cab chore: Sync 2020-12-28 10:50:01 +08:00