Commit Graph

3792 Commits

Author SHA1 Message Date
chenjianxing 1e2e80d507 refactor: 重构场景全选 2021-02-19 14:37:25 +08:00
Captain.B 2b27f03ddf Merge remote-tracking branch 'origin/master' 2021-02-19 13:12:26 +08:00
Captain.B cecdcebc49 feat: K8S 资源池支持nodeSelector 2021-02-19 13:11:19 +08:00
chenjianxing 5e8cbfe931 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-19 11:30:28 +08:00
chenjianxing c24ca8e562 场景支持导入postman 2021-02-19 11:30:08 +08:00
shiziyuan9527 340a685393 refactor: 删除无用log 2021-02-19 10:40:28 +08:00
shiziyuan9527 e2efd5c55b refactor: 模块节点可回车保存
Closes #1413
2021-02-18 17:08:22 +08:00
shiziyuan9527 9f74130dc8 fix(系统设置): 修复缺陷管理平台页面保存数据后密码显示明文的问题
Closes #347
2021-02-18 15:52:31 +08:00
fit2-zhao 09b39ca249 fix(xpack): 修复license数量显示为0 问题 2021-02-18 14:54:44 +08:00
fit2-zhao 72351396ae fix(xpack): 修复license数量显示为0 问题 2021-02-18 14:23:31 +08:00
chenjianxing bdf11d09aa 修改定时任务 #1167 2021-02-18 14:11:05 +08:00
chenjianxing b7e12652dd fix: 解决冲突 2021-02-18 14:10:57 +08:00
chenjianxing c7046993e5 fix: 删除无用代码 2021-02-18 14:05:26 +08:00
fit2-zhao a45fce4d41 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-18 12:56:09 +08:00
chenjianxing c60db63f2a fix: 修复退出登入后重新登入页面无数据问题 2021-02-18 11:42:31 +08:00
chenjianxing ccdf41894d 修改定时任务 #1167 2021-02-18 10:35:08 +08:00
fit2-zhao 329d95fe64 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-18 09:35:18 +08:00
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 7b671d3620 feat: 接口页面增加文档功能
接口页面增加文档功能
2021-02-17 11:50:25 +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 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
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 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 64c746a10a feat: 导出接口支持用例一起导出 2021-02-05 18:51:47 +08:00
fit2-zhao fc625a27f3 feat(接口自动化): 导入Jmeter文件初步结构完成 2021-02-05 15:32:39 +08:00
chenjianxing 0fd72ce96d refactor: 接口列表全选重构 2021-02-05 14:49:48 +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
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
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 78d843157b fix(性能测试): 修复切换报告的时候压力配置没有变化的问题 2021-02-04 17:42:32 +08:00
Captain.B af5a970412 Merge branch 'v1.7' 2021-02-04 16:14:03 +08:00
Coooder-X ad1c9d3ffe fix: 测试计划 编辑错误 (#1393) 2021-02-04 16:01:33 +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
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
fit2-zhao bb6986a74a fix(接口自动化): 场景变量搜索问题处理 2021-02-04 15:19:40 +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 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
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
fit2-zhao 76bcd14500 fix(接口定义): 排序修改 2021-02-03 18:50:02 +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
shiziyuan9527 117571cd94 feat: 组织、工作空间下拉列表增加滚动条 2021-02-03 16:43:59 +08:00
fit2-zhao a803225644 fix(接口定义): 历史JDBC数据兼容处理 2021-02-03 15:25:51 +08:00
fit2-zhao 54d88a077f fix(场景自动化): 历史数据兼容处理 2021-02-03 14:22:28 +08:00
Coooder-X 21f8e54069 fit: 解决冲突 2021-02-03 11:54:44 +08:00
Coooder-X 9a9f8f628b fear: (系统设置) 项目-jar包管理,支持查找 (#1350) 2021-02-03 11:23:17 +08:00
chenjianxing 171c7bc3b9 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 11:22:37 +08:00
Coooder-X 893485d592
fear: (系统设置) 项目-jar包管理,支持查找 (#1350) 2021-02-03 11:20:15 +08:00
chenjianxing b6f59bb15c fix: 滚动条宽度变化导致关联页面页面变形 2021-02-03 11:18:54 +08:00
fit2-zhao 3ba281e53c Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 10:47:22 +08:00
fit2-zhao f41beb6147 style(接口自动化): 整体展示样式优化 2021-02-03 10:46:56 +08:00
song.tianyang a09b8afb52 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-03 10:38:35 +08:00
song.tianyang 8e0d57a6d2 fix: 测试计划-关联功能测试用例-查看报告统计-切回到功能测试用例页后左侧模块列消失
解决测试计划-关联功能测试用例-查看报告统计-切回到功能测试用例页后左侧模块列消失的缺陷
2021-02-03 10:37:22 +08:00
chenjianxing f26b96a38b fix: 国际化 2021-02-02 19:42:14 +08:00
chenjianxing 80f34e4056 fix: 删除无用代码 2021-02-02 19:22:59 +08:00
chenjianxing ee1e55ac29 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-02 18:54:19 +08:00
chenjianxing 3e4e1272e6 fix: 测试计划场景列表tag显示问题 2021-02-02 18:53:57 +08:00
fit2-zhao 0217f0e0ed Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-02 17:46:13 +08:00
fit2-zhao c74e88c3f3 refactor(接口自动化): 场景导入 ms,postman 基本完成 2021-02-02 17:46:00 +08:00