Commit Graph

6678 Commits

Author SHA1 Message Date
Captain.B d556c722ad fix(性能测试): 修复预热时间没有适配单位的bug 2021-03-30 15:28:16 +08:00
fit2-zhao 2a70396bf8 fix: 恢复被覆盖的sql 2021-03-30 15:25:23 +08:00
fit2-zhao a05d1a773a fix(测试用例,接口定义,接口自动化): 默认添加的模块,不能编辑也不能删除。 2021-03-30 15:20:34 +08:00
fit2-zhao 015c665bcf Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 15:03:46 +08:00
fit2-zhao cff32b828c fix(测试用例,接口定义,接口自动化): 增加默认模块,默认创建用例都放到默认模块下 2021-03-30 15:03:31 +08:00
Captain.B 575cc7dbed Merge branch 'v1.8' 2021-03-30 14:53:13 +08:00
Captain.B 0f1676166c fix: 修复文件名过短导致场景无法引入,文件重复弹框提示优化 2021-03-30 14:52:34 +08:00
Captain.B 6bc2601bc7 Merge branch 'v1.8' 2021-03-30 14:11:52 +08:00
Captain.B b54ed5c92e Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 14:11:05 +08:00
Captain.B b9eae5ed70 chore: 添加 Intellij Toolbox 图标 2021-03-30 14:10:46 +08:00
fit2-zhao c84d1e8535 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 13:55:37 +08:00
fit2-zhao 6303bcb42e fix(测试用例,接口定义,接口自动化): 增加默认模块,默认创建用例都放到默认模块下 2021-03-30 13:55:32 +08:00
chenjianxing 6da82053a1 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 13:09:05 +08:00
Coooder-X 3e97f8da6c fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式 (#1751)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式
2021-03-30 13:08:29 +08:00
chenjianxing 0b820ca39d Merge branch 'master' of github.com:metersphere/metersphere 2021-03-30 13:08:20 +08:00
Coooder-X 138f1e3874
fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式 (#1751)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式
2021-03-30 13:07:09 +08:00
chenjianxing b0dbc6e240 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-30 13:06:21 +08:00
chenjianxing c93a4913a7 Merge branch 'v1.8' 2021-03-30 13:06:03 +08:00
Captain.B b67a6fafe2 Merge branch 'v1.8' 2021-03-30 12:59:33 +08:00
Captain.B 2b32f119a0 chore: sync 2021-03-30 12:58:52 +08:00
chenjianxing fc9d040579 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 12:06:18 +08:00
chenjianxing 378c31e3ca fix: swagger2 导入响应体 2021-03-30 12:05:52 +08:00
fit2-zhao cc07843e12 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 11:50:49 +08:00
fit2-zhao 4f4aa6f5d2 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
2021-03-30 11:50:34 +08:00
BugKing 569e86b0ce build: mvn打包前先安装前端依赖 2021-03-30 11:48:44 +08:00
song.tianyang d72a3e049b Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 11:48:19 +08:00
fit2-zhao e0182038b9 fix(接口定义): 修改默认模块 2021-03-30 11:46:22 +08:00
song.tianyang 33e0207d84 fix(推荐断言弹框可以点击空白关闭): 推荐断言弹框可以点击空白关闭 2021-03-30 11:44:35 +08:00
chenjianxing 11bb0cf5a4 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 11:31:38 +08:00
chenjianxing 6240306795 fix: 导入接口用例创建到默认模块 2021-03-30 11:30:52 +08:00
shiziyuan9527 b2f5eab0b6 fix(场景自动化): 修复升级环境问题 2021-03-30 11:30:23 +08:00
Ambitiousliga f8b35a9e72
fix(测试跟踪):Excel导入用例时标签有内容会报错 (#1747)
* fix(测试跟踪):Excel导入用例时标签有内容报错

* fix(测试跟踪):excel导入只有新增用例且和错误用例时,关闭窗口会自动刷新。

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-30 11:02:59 +08:00
chenjianxing e56e2e19b5 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 10:54:04 +08:00
chenjianxing 93b63980ea fix: 接口用例执行报错 2021-03-30 10:52:59 +08:00
Captain.B f18f2f2559 Merge branch 'v1.8' 2021-03-30 10:28:23 +08:00
Captain.B ede1cb0330 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 10:27:22 +08:00
Captain.B f2a6341b4c fix: 修复文件加载时文件名重复没有显示文件名的bug 2021-03-30 10:27:04 +08:00
chenjianxing 9aea32acf6 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 10:10:31 +08:00
chenjianxing e451a47f55 refactor: 修改swagger-parse版本 2021-03-30 10:10:17 +08:00
Captain.B 391a2924c8 chore: sync 2021-03-30 10:04:58 +08:00
Captain.B 0cfd281d07 feat(性能测试): 限制普通线程组的预热时间最大值不能超多压测时长 2021-03-30 10:04:20 +08:00
shiziyuan9527 47120c97cb refactor(场景自动化): 回退运行环境配置 2021-03-29 22:41:29 +08:00
chenjianxing 3f4dda8ccb Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 20:01:08 +08:00
chenjianxing ca3b951e2d fix: 测试计划状态 2021-03-29 20:00:51 +08:00
fit2-zhao 61f7a82371 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 19:34:31 +08:00
fit2-zhao 53212d75e8 fix(场景自动化): 执行日志报错问题修复 2021-03-29 19:34:15 +08:00
chenjianxing 2ba7cd8b1a fix: swgger base-url 导入后路径多了一个'/' 2021-03-29 19:03:17 +08:00
chenjianxing c832bbed3e Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 18:51:58 +08:00
chenjianxing b6faf61f73 fix: 旧版本导出文件接口定义导入失败 2021-03-29 18:50:59 +08:00
fit2-zhao 09c027a79c fix(场景自动化): 修复最大化切换数据展示问题 2021-03-29 18:38:06 +08:00