Commit Graph

1944 Commits

Author SHA1 Message Date
fit2-zhao 511c0ff1a9 feat(接口自动化): 基础增加统计总数 2020-11-30 16:03:23 +08:00
shiziyuan9527 834baeac31 Merge branch 'refector' 2020-11-30 14:59:37 +08:00
chenjianxing 4d52439cfb Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 14:41:47 +08:00
chenjianxing 9ca89babed fix(接口测试): 保存并执行为DEBUG模式 2020-11-30 14:41:29 +08:00
fit2-zhao b9fc0c8195 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 14:30:08 +08:00
fit2-zhao ae11f66b79 feat(接口自动化): 基础结构创建 2020-11-30 14:29:49 +08:00
chenjianxing 0c7ba5cb80 refactor: 认证相关请求返回4xx响应码 2020-11-30 14:27:28 +08:00
fit2-zhao c5380e6934 Merge branch 'v1.5' of https://github.com/metersphere/metersphere into v1.5 2020-11-30 11:03:04 +08:00
fit2-zhao 9bd1935167 feat(接口定义): 历史记录添加 2020-11-30 11:02:51 +08:00
fit2-zhao e02e7c726f fix(测试跟踪): 目录节点添加保护 2020-11-30 11:01:29 +08:00
chenjianxing b74f9e21f5 fix: 解决冲突 2020-11-27 18:10:41 +08:00
chenjianxing 30a1858ffa fix: 解决冲突 2020-11-27 18:09:30 +08:00
chenjianxing 455b231133 Merge branch 'v1.5' of https://github.com/metersphere/metersphere into v1.5 2020-11-27 17:57:36 +08:00
chenjianxing c53fe5ac4a fix(接口测试): 引用的场景支持禁用启用 2020-11-27 17:57:23 +08:00
Captain.B a1d32d79a8 Merge branch 'v1.5' into master 2020-11-27 16:29:41 +08:00
Captain.B b9052ca787 fix(性能测试): 删除测试报告时删除相关的jtl 2020-11-27 16:28:49 +08:00
fit2-zhao c9e2e3e489 fix(接口定义): 执行方法修改 2020-11-27 14:22:07 +08:00
fit2-zhao dd5cdad759 feat(接口定义):删除多余文件 2020-11-27 14:04:40 +08:00
fit2-zhao 73204d7793 feat(接口定义): 合并master 最新代码 2020-11-27 13:59:18 +08:00
fit2-zhao 22108b3048 feat(接口定义): 合并master 最新代码 2020-11-27 13:58:25 +08:00
chenjianxing 8333c3f77d fix(测试跟踪): 首页最近测试跳转错误 2020-11-27 13:39:22 +08:00
fit2-zhao e081448183 feat(接口定义):完成回收站功能 2020-11-27 11:30:47 +08:00
Captain.B d2cf26b16c chore: 同步 submodule
(cherry picked from commit 9e62022ae9)
2020-11-27 10:20:02 +08:00
shiziyuan9527 5d1ecc51d1 refactor(测试跟踪): 优化查询 2020-11-26 18:04:15 +08:00
wenyann 977db2fdb2 fix:修复消息设置testId为空时异常 2020-11-26 15:35:05 +08:00
chenjianxing d3386b748a fix(测试跟踪): 报告导出样式缺失 2020-11-26 15:04:10 +08:00
fit2-zhao 5bfbf01c3d feat(接口定义): 所有协议基本完成 2020-11-26 14:23:33 +08:00
wenyann 5b2b7fd322 fix: 2020-11-26 12:35:52 +08:00
wenyann 51682762e1 Merge remote-tracking branch 'origin/master' 2020-11-26 12:12:17 +08:00
wenyann 0941dc971e fix:定时判断通知人是否重复 2020-11-26 12:11:36 +08:00
Captain.B 9e62022ae9 chore: 同步 submodule 2020-11-26 11:52:43 +08:00
chenjianxing 23a450119e fix(接口测试): 接口编辑页面报告不展示调试的报告 2020-11-26 10:56:04 +08:00
chenjianxing 5de10c5a5c fix(接口测试): python脚本 2020-11-25 21:04:35 +08:00
chenjianxing 8656fa36bf fi(接口测试): python 脚本失效 2020-11-25 20:45:34 +08:00
Captain.B 7184d551f6 Merge branch 'v1.5' into master 2020-11-25 19:25:49 +08:00
Captain.B 3843f0b420 fix: 修复接口测试处理参数转义的问题 2020-11-25 19:21:07 +08:00
fit2-zhao 2ba69e9a32 feat(接口定义): 完成JDBC快捷调试 2020-11-25 18:52:33 +08:00
chenjianxing e56c42dcc4 fix(测试跟踪): 测试用例点击全部用例展示问题 2020-11-25 17:43:08 +08:00
Captain.B 4f93da8907 Merge branch 'v1.5' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-11-25 16:49:52 +08:00
Captain.B 245da1d1ca fix: 修复显示设置加载图片的问题 2020-11-25 16:49:20 +08:00
Captain.B ae1b31bbfc fix: 修复显示设置加载图片的问题 2020-11-25 16:40:39 +08:00
Captain.B 0ffe1cc414 Merge remote-tracking branch 'origin/master' into master 2020-11-25 16:39:27 +08:00
Captain.B 756c8d3fff Merge branch 'v1.5' into master
# Conflicts:
#	frontend/src/business/components/xpack
2020-11-25 16:39:14 +08:00
Captain.B 17142dc4b3 fix: 修复显示设置加载图片的问题 2020-11-25 16:38:31 +08:00
fit2-zhao 948fcdb3b8 feat(接口定义): SQL协议快捷调试 2020-11-25 16:32:16 +08:00
fit2-zhao 9d1350a97b fix(测试跟踪): 修复 xmind 导入备注缺失问题 2020-11-25 15:45:52 +08:00
fit2-zhao 8db0b4349a feat(接口定义): TCP,SQL,DUBBO 协议基本录入完成 2020-11-25 15:31:06 +08:00
BugKing 2543618ace Merge branch 'v1.5' into master 2020-11-25 13:44:57 +08:00
BugKing 7b5dd9c14f refactor: 修改版本号 2020-11-25 11:15:29 +08:00
chenjianxing 754f067cdd refactor: 完善日志打印 2020-11-25 10:36:30 +08:00
wenyann fe7b1abdac Merge remote-tracking branch 'origin/master' 2020-11-25 10:13:28 +08:00
wenyann 18c810178a fix: 修复账号不一致,更新不发送,时间问题 2020-11-25 10:13:05 +08:00
Captain.B 0bd6599d36 Merge branch 'v1.5' into master 2020-11-25 09:39:55 +08:00
fit2-zhao cbc9c42122 feat(接口定义): TCP 协议基础完成 2020-11-24 19:36:45 +08:00
Captain.B 4a0c640aee refactor: 邮件配置匿名改成免密 2020-11-24 18:33:59 +08:00
Captain.B ed45152263 Merge remote-tracking branch 'origin/master' into master 2020-11-24 18:13:55 +08:00
Captain.B 06820c0af1 Merge branch 'v1.5' into master 2020-11-24 18:13:37 +08:00
Captain.B a9ff93841b fix: 修复MailService不支持非SSL的SMTP邮件服务器
Closes #768
2020-11-24 18:04:59 +08:00
shiziyuan9527 66561c5c71 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-24 17:54:43 +08:00
shiziyuan9527 a1aced7435 refactor: 删除无用代码 2020-11-24 17:53:03 +08:00
chenjianxing fa517ea34d fix(接口测试): jsonpath 推荐缺少部分字段 2020-11-24 17:51:21 +08:00
Captain.B dbba491d44 Merge remote-tracking branch 'origin/master' into master 2020-11-24 14:37:10 +08:00
Captain.B b3f321af74 Merge branch 'v1.5' into master 2020-11-24 14:36:54 +08:00
chenjianxing d02f530538 fix(接口测试): 请求体取消自动格式化 2020-11-24 14:36:15 +08:00
Captain.B de786f42f9 fix: 修复创建测试计划时重复提交,成功创建多个相同的计划 2020-11-24 14:35:19 +08:00
chenjianxing 8e4ada8e18 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-24 13:32:21 +08:00
chenjianxing 6bdb76d719 fix(接口测试): 测试报告展示顺序 2020-11-24 13:32:03 +08:00
Captain.B 848a9481f8 fix(性能测试): 线程数不能小于资源池节点数 2020-11-24 13:30:32 +08:00
Captain.B 7be21db324 fix(性能测试): 线程数不能小于资源池节点数 2020-11-24 13:30:12 +08:00
fit2-zhao 84e99e1b68 feat(接口定义): 脚本修改 2020-11-24 11:31:58 +08:00
fit2-zhao c48bb25956 Merge branch 'master' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/APITestService.java
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/business/components/api/report/components/ResponseText.vue
2020-11-24 11:01:29 +08:00
fit2-zhao 9408555bba Merge branch 'master' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/APITestService.java
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/business/components/api/report/components/ResponseText.vue
2020-11-24 10:56:36 +08:00
Captain.B b013b8b790 Merge remote-tracking branch 'origin/master' into master 2020-11-24 10:50:23 +08:00
Captain.B a1b37a3c53 perf: 优化测试用例每页显示速度 2020-11-24 10:50:03 +08:00
Captain.B f92209383b Merge branch 'v1.5' into master
# Conflicts:
#	frontend/src/business/components/track/case/components/TestCaseList.vue
2020-11-24 10:43:09 +08:00
fit2-zhao c6a981e965 feat(接口定义):添加协议处理 2020-11-24 10:42:21 +08:00
Captain.B e6fc2adb58 perf: 优化测试用例每页显示速度 2020-11-24 10:39:25 +08:00
wenyann 8d4df55549 Merge remote-tracking branch 'origin/master' 2020-11-24 10:33:59 +08:00
wenyann 1f107b69ff fix: 消息设置修改 2020-11-24 10:33:28 +08:00
chenjianxing 3225a76c43 fix(系统设置): 删除组织用户 2020-11-23 21:26:44 +08:00
chenjianxing f023b9c602 refactor: 添加xpath测试用例 2020-11-23 20:58:45 +08:00
fit2-zhao 0f0b11fd85 feat(接口定义): 基础参数重构 2020-11-23 19:00:21 +08:00
Captain.B 5058b5e08a Merge remote-tracking branch 'origin/master' into master 2020-11-23 18:37:33 +08:00
Captain.B 6fd3cefa81 Merge branch 'v1.5' into master 2020-11-23 18:37:16 +08:00
Captain.B c0b4b813f3 fix: 修复创建测试计划时重复提交,成功创建多个相同的计划 2020-11-23 18:36:56 +08:00
fit2-zhao 637253f538 Merge branch 'local-api-delimit' of https://github.com/metersphere/metersphere into local-api-delimit 2020-11-23 18:15:27 +08:00
fit2-zhao f8475dca0c feat(接口定义): 按照不同协议处理 2020-11-23 18:15:09 +08:00
shiziyuan9527 ab0f3535f8 fix(系统设置): 修复修改个人信息邮箱时可修改为已存在邮箱的问题 2020-11-23 16:44:02 +08:00
BugKing d4ba08b340 fix: 修改 flyway 文件名称 2020-11-23 16:26:09 +08:00
fit2-zhao 816482d16d feat(接口定义): 数据库脚本 2020-11-23 15:43:44 +08:00
fit2-zhao 3ebc834e1f feat(接口定义): 完成提取参数和断言规则 2020-11-23 15:34:17 +08:00
fit2-zhao 7f2fe8acd1 feat(接口定义): 完成提取参数和断言规则 2020-11-23 15:17:19 +08:00
fit2-zhao 595c9572de feat(接口定义): 提取处理 2020-11-23 13:16:27 +08:00
wenyann 4ba24afeee fix: 添加日志,调整代码格式 2020-11-23 12:36:33 +08:00
fit2-zhao e008baaf2e Merge branch 'master' into local-api-delimit
# Conflicts:
#	backend/src/main/resources/i18n/messages_en_US.properties
#	backend/src/main/resources/i18n/messages_zh_CN.properties
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/business/components/api/test/ApiTestConfig.vue
2020-11-23 12:31:48 +08:00
chenjianxing 744de357c3 fit(接口测试): jsonpath 断言推荐自动转义正则特殊字符 2020-11-23 12:08:30 +08:00
chenjianxing 21ea6bc70a refactor: 升级jyphon 2020-11-23 11:37:01 +08:00
fit2-zhao 06e8d48344 feat(接口定义): 增加断言 2020-11-23 11:36:04 +08:00
chenjianxing 1b1611514c fix(接口测试): 响应时间断言格式校验 2020-11-23 11:28:26 +08:00
Captain.B be8b56a36f chore: sync submodule 2020-11-23 10:00:51 +08:00