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

2350 Commits

Author SHA1 Message Date
Captain.B f1f7472758 Merge remote-tracking branch 'origin/master' into master 2020-12-14 16:15:32 +08:00
Captain.B f10b154a8a fix: 指定注入的 rest template 2020-12-14 16:14:45 +08:00
fit2-zhao 6672c7756e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 16:08:15 +08:00
fit2-zhao 97db3909e8 fix(接口定义): 批量更新完成 2020-12-14 16:07:48 +08:00
Captain.B 6eb0a46edd Merge remote-tracking branch 'origin/master' into master 
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
 2020-12-14 15:39:25 +08:00
Captain.B 723d5aa462 fix: 修复开源版显示图片的问题 2020-12-14 15:38:38 +08:00
fit2-zhao 1efe5b0c2d fix(接口定义): 部分缺陷修复 2020-12-14 14:35:32 +08:00
fit2-zhao cd16ed684b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 12:21:50 +08:00
fit2-zhao 469802030c fix(接口定义): 部分缺陷修复 2020-12-14 12:19:35 +08:00
Captain.B e071f33dbd feat(性能测试-xPack): 增加k8s资源池 2020-12-14 11:42:07 +08:00
fit2-zhao 9ff168a539 feat(接口自动化): 统一报告头 2020-12-11 18:24:25 +08:00
fit2-zhao 2d381a14fb feat(接口自动化): 统一执行方式 2020-12-11 18:10:18 +08:00
fit2-zhao a3cfeaca6c feat(接口自动化): 添加请求参数 2020-12-11 14:24:55 +08:00
chenjianxing df6b6da40f fix: 解决冲突 2020-12-11 12:51:04 +08:00
Captain.B e9d5c8b9d2 fix: 修复邮件配置smtps时的错误 2020-12-11 11:37:38 +08:00
shiziyuan9527 f399ba2885 feat(接口测试): 资源按照项目查询 2020-12-11 10:50:43 +08:00
chenjianxing 54f5e8aad5 refator: 接口用例页面优化 2020-12-11 09:40:00 +08:00
Captain.B 9dff8408de Merge branches 'master', 'master' and 'master' of github.com:metersphere/metersphere into master 2020-12-10 18:48:38 +08:00
Captain.B d20719c9ee refactor: 重构checkowner的逻辑 2020-12-10 18:47:29 +08:00
shiziyuan9527 38cf12fbcb feat(性能测试): 资源按照项目查询 2020-12-10 18:29:23 +08:00
Captain.B 8c26c9b9f3 Merge branches 'master', 'master' and 'master' of github.com:metersphere/metersphere into master 2020-12-10 18:15:48 +08:00
Captain.B 181b5c11cc fix: 修复 check owner project 时出现的问题 2020-12-10 18:11:34 +08:00
fit2-zhao 541a823339 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 17:42:21 +08:00
fit2-zhao 70c22f57e8 feat(接口自动化): 统一样式风格及统一执行处理 2020-12-10 17:42:05 +08:00
wenyann cfa0489e59 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 17:33:30 +08:00
wenyann 5cc9797554 fix:修复jenkins上用例缺失问题 2020-12-10 17:32:31 +08:00
fit2-zhao db0fa8a810 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 16:49:14 +08:00
fit2-zhao d5b777a55a feat(接口自动化): 统一样式风格 2020-12-10 16:48:56 +08:00
shiziyuan9527 094dfc7da3 feat(测试跟踪): 最近列表按照项目查询 2020-12-10 15:38:54 +08:00
shiziyuan9527 239ce6bd5b feat(测试跟踪): 资源按照项目查询 2020-12-10 15:16:50 +08:00
fit2-zhao 7f98702691 feat(接口自动化): 统一项目获取 2020-12-10 13:45:10 +08:00
fit2-zhao bc49f69ede feat(接口自动化): 完成接口引用 2020-12-10 12:46:14 +08:00
fit2-zhao afa7527738 feat(接口定义): 完成查看引用和添加用例到测试计划功能 2020-12-10 11:03:34 +08:00
fit2-zhao 1f59d12f7b feat(接口自动化): 完善回收站功能 2020-12-09 19:02:26 +08:00
fit2-zhao c021bb5647 feat(接口自动化): 完成场景添加到测试计划几查看引用功能 2020-12-09 17:26:52 +08:00
fit2-zhao 9f4adbbbf9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-09 12:26:20 +08:00
fit2-zhao 48c69444c7 fix(接口定义): 部分缺陷修复 2020-12-09 12:25:15 +08:00
shiziyuan9527 1ff77583a4 refactor: flyway 2020-12-09 10:55:33 +08:00
shiziyuan9527 41290ee516 fix(系统设置): 创建项目跳转问题 2020-12-09 10:47:31 +08:00
Captain.B 9349f06c05 chore: Sync submodule 2020-12-09 10:33:35 +08:00
Captain.B 5f350ed32e Merge remote-tracking branch 'origin/master' into master 2020-12-09 10:26:41 +08:00
Captain.B 2fe673af83 fix: 修复jenkins消息通知没有替换变量的问题 2020-12-09 10:26:02 +08:00
fit2-zhao d3040ee9df feat(接口自动化): 去除重合部分功能 2020-12-09 09:56:14 +08:00
fit2-zhao 3e15d419fb feat(接口自动化): 冲突合并 2020-12-08 20:11:48 +08:00
fit2-zhao 2ebfcc2db1 feat(接口自动化): 完成定时任务 2020-12-08 19:41:48 +08:00
fit2-zhao 6a8a718ff2 feat(接口自动化): 完成批量执行等 2020-12-08 17:51:59 +08:00
chenjianxing a11a54c23a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 17:41:41 +08:00
BugKing 7a0004cb5a Merge branch 'v1.5' into master 2020-12-08 17:05:11 +08:00
q4speed eee5bc586a feat(接口自动化): 查看场景引用 2020-12-08 15:55:21 +08:00
Captain.B 48c9af48c4 Merge remote-tracking branch 'origin/master' into master 2020-12-08 15:19:48 +08:00
Captain.B 05141df790 refactor(XPack): 消息通知模版 2020-12-08 15:12:35 +08:00
fit2-zhao 6ce41bdbde Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 13:47:49 +08:00
fit2-zhao ffb2fc8bdc feat(接口自动化): 完成场景公共参数，修复接口定义另存用例问题 2020-12-08 13:47:09 +08:00
chenjianxing d24c9c43b2 fix: 前端报错 2020-12-08 12:02:12 +08:00
chenjianxing 91d37ccafe feat(接口测试): 接口定义插件格式导入 2020-12-08 11:28:23 +08:00
chenjianxing 0d8d12b17b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-07 20:17:32 +08:00
chenjianxing 036d5a5551 feat(接口测试): 接口定义 postman 导入 2020-12-07 20:17:25 +08:00
fit2-zhao d762644d87 feat(接口自动化): 完成场景调试，和基础报告 2020-12-07 19:08:26 +08:00
fit2-zhao b848830976 feat(接口自动化): 完成场景批量执行，基础报告生成 2020-12-07 19:03:51 +08:00
shiziyuan9527 48c82d2852 feat(系统设置): 项目管理迁移至系统设置 2020-12-07 17:28:04 +08:00
chenfanghang 063726b5cc refactor(接口监控):接口列表排序按字母排序 2020-12-07 14:28:38 +08:00
chenjianxing 1aab595ab0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-07 11:04:00 +08:00
chenjianxing 7ba3c09a3d refacotr(接口测试): swagger 导入创建模块 2020-12-07 11:03:37 +08:00
fit2-zhao 8d7ec9b8ed Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-04 18:06:27 +08:00
Captain.B 7bfb226314 Merge remote-tracking branch 'origin/master' into master 2020-12-04 18:04:42 +08:00
chenjianxing 768ed785a9 fix(接口测试): metersphere 文件导入错误 2020-12-04 18:01:32 +08:00
fit2-zhao 7bb3cb7eca Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-04 18:00:57 +08:00
fit2-zhao 57986195e7 feat(接口自动化): 完成场景调试，和基础报告 2020-12-04 18:00:37 +08:00
Captain.B faf8c1f80f Merge branch 'v1.5' into master 
# Conflicts:
#	frontend/src/business/components/api/router.js
#	frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
 2020-12-04 17:57:00 +08:00
Captain.B 7ee9522298 chore: 同步 submodule 
(cherry picked from commit 9e62022ae9)
 2020-12-04 17:35:53 +08:00
BugKing 25631ce05f Revert "chore: 同步 submodule" 
This reverts commit 9e62022a
 2020-12-04 15:53:21 +08:00
chenjianxing 45f791a4b1 refactor(测试跟踪): swagger 获取tag 2020-12-04 15:09:34 +08:00
chenjianxing ec4ff14bf6 refactor: 处理swagger响应体 2020-12-03 21:13:53 +08:00
fit2-zhao 97e3f91008 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 19:37:33 +08:00
fit2-zhao 25238c2b32 feat(接口自动化): 完成场景引用和复制，接口的引用和复制 2020-12-03 19:36:43 +08:00
chenjianxing 5d37c09413 fix: 导入id和请求id一致 2020-12-03 19:36:08 +08:00
chenjianxing 18d2d68486 refactor: 删除多余代码 2020-12-03 16:32:27 +08:00
chenjianxing f581a5626f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 16:28:35 +08:00
chenjianxing 3bd7a1d049 refactor(接口测试): swagger 导入重构造 2020-12-03 16:28:23 +08:00
chenjianxing fde6ae766c refactor(接口测试): swagger 导入重构 2020-12-03 16:27:00 +08:00
Captain.B 3e00db1011 refactor: 重构发送通知的后台 2020-12-03 15:57:38 +08:00
shiziyuan9527 d00d847e88 fix: 去掉sql分号 2020-12-03 14:45:55 +08:00
Captain.B bf13f09322 fix: 修复异步方法启动的问题 2020-12-03 14:08:04 +08:00
fit2-zhao ade3fe2043 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 13:50:53 +08:00
fit2-zhao c967e59511 feat(接口自动化): 完成场景自定义标签 2020-12-03 13:50:11 +08:00
Captain.B f2d0f87724 Merge branch 'master' into notice-refactor 2020-12-03 12:50:41 +08:00
Captain.B 22a0a94613 refactor: 重构发送通知 2020-12-03 12:46:02 +08:00
fit2-zhao b7a472a08c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-02 19:23:05 +08:00
fit2-zhao 77a1724bc7 feat(接口自动化): 场景自动化基本画面完成 2020-12-02 19:22:58 +08:00
shiziyuan9527 46d86b7f08 fix(测试跟踪): TAPD缺陷状态同步为工作流中缺陷状态名称 2020-12-02 16:38:11 +08:00
q4speed 4065663f55 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/i18n/zh-CN.js
 2020-12-02 15:34:04 +08:00
q4speed 9e600dab94 feat(接口自动化): 场景列表 2020-12-02 15:32:16 +08:00
fit2-zhao d571c9dc07 fix(接口定义): http 协议headers 收入到请求中 2020-12-02 14:21:17 +08:00
chenjianxing b08775dbb9 feat(接口测试): 接口定义导入 2020-12-01 21:07:32 +08:00
fit2-zhao 4e607cfa7b fix(接口定义): 少文件提交 2020-12-01 19:02:32 +08:00
fit2-zhao 184b7ca3f4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 17:49:17 +08:00
fit2-zhao f62ae2bd59 fix(接口定义): 自动生成代码规范修改 2020-12-01 17:47:39 +08:00
shiziyuan9527 439cf3b89b refactor(测试跟踪): 用例评审查询优化 2020-12-01 15:00:30 +08:00
Captain.B edab268a4c Merge branch 'v1.5' into master 2020-12-01 10:00:11 +08:00
chenfanghang 8dc013927c feat(接口监控):增加响应时间与状态监控功能 2020-11-30 18:52:57 +08:00
Captain.B 04a41e22f8 Merge remote-tracking branch 'origin/master' into master 2020-11-30 17:08:18 +08:00
Captain.B 57b86dd2ef refactor(性能测试): 修复单位错误 2020-11-30 17:07:20 +08:00
shiziyuan9527 6ed65e22d3 refactor(测试跟踪): 优化查询 2020-11-30 16:40:02 +08:00
shiziyuan9527 bee4cfced7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 16:38:29 +08:00
fit2-zhao 1ad6aefc7d fix(性能测试): 还原误修改类 2020-11-30 16:33:01 +08:00
fit2-zhao 9a6f2518fc Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 16:03:54 +08:00
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
chenjianxing ab87a73602 fix(接口测试): 环境host域名长度限制增大 2020-11-23 09:46:09 +08:00
fit2-zhao 58cbe145f7 feat(接口定义): 认证配置 完成 2020-11-20 18:56:21 +08:00
fit2-zhao bdaff53eaf feat(接口定义): 请求数据格式按照jmeter 数据格式重构完成 2020-11-19 19:14:06 +08:00
Captain.B 63c30b737b Merge remote-tracking branch 'origin/master' into master 2020-11-19 16:59:40 +08:00
Captain.B c2bdb6947a fix: 修复显示图片报 Missing URI template variable 2020-11-19 16:59:14 +08:00
shiziyuan9527 54e18656a5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-19 16:41:06 +08:00
shiziyuan9527 cd61fc7963 fix: 修复取消zentao集成未置空关联ID的问题 2020-11-19 16:39:55 +08:00
Captain.B 937963f872 Merge remote-tracking branch 'origin/master' into master 2020-11-19 16:21:41 +08:00
Captain.B bcfb2e0d2d fix: 修复显示图片报 Missing URI template variable 2020-11-19 16:21:14 +08:00
shiziyuan9527 ad685b5a0e fix: 修复提交缺陷时可能出现主键冲突的问题 2020-11-19 16:16:48 +08:00
shiziyuan9527 c9bc42bacc refactor: flyway 2020-11-19 16:03:32 +08:00
shiziyuan9527 2925a45c1a refactor: 添加日志 2020-11-19 14:58:12 +08:00
Captain.B 6e6a98fbd6 fix(性能测试): 修复多个线程组开启了rpslimit时报数组越界 2020-11-19 10:41:11 +08:00
Captain.B 8429add30e refactor(性能测试): 将压测时间单位改为秒 2020-11-19 10:08:54 +08:00
fit2-zhao 8fd084db51 接口定义-基本执行方法完成 2020-11-18 14:31:39 +08:00
shiziyuan9527 55f933aa55 feat(测试跟踪): 集成Zentao 2020-11-17 15:25:00 +08:00
fit2-zhao 940acf3693 接口定义-基本执行方法完成 2020-11-16 20:18:14 +08:00
fit2-zhao 515c92060b 接口定义-基本执行方法完成 2020-11-16 20:14:17 +08:00
shiziyuan9527 4f140bd046 refactor: 修改flyway 2020-11-16 16:13:55 +08:00
shiziyuan9527 0ecb9870a1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-16 16:11:42 +08:00
shiziyuan9527 1858ef5857 refactor: i18n 2020-11-16 16:10:33 +08:00
shiziyuan9527 4598c10864 feat(测试跟踪): 集成zentao 2020-11-16 16:04:11 +08:00
chenjianxing acaddcbe7a feat: 添加组织成员角色 2020-11-16 15:53:03 +08:00
shiziyuan9527 0c7acfebea refactor: 项目表增加zentao关联属性 2020-11-16 15:45:07 +08:00
shiziyuan9527 a94c8473f3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-16 13:57:53 +08:00
chenjianxing 2c47bcc073 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-13 19:33:58 +08:00
zhao.yong ae065ae3ba 改造执行方法，放到后台处理 2020-11-13 18:40:38 +08:00
wenyann 085af5b862 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-13 17:06:51 +08:00
wenyann eba91d88d2 fix: i18n 2020-11-13 17:06:40 +08:00
shiziyuan9527 919f08431d feat: 集成zentao 2020-11-13 17:01:36 +08:00
Captain.B abd12d5d77 refactor: 下载jtl 2020-11-13 16:58:57 +08:00
Captain.B b9e79cec6e refactor(性能测试): 性能测试保存jtl 2020-11-13 16:37:56 +08:00
Captain.B f40f0bbede refactor: 下载jtl 2020-11-13 16:32:59 +08:00
Captain.B e26d3a668e refactor(性能测试): 性能测试保存jtl 2020-11-13 15:55:57 +08:00
Captain.B 28e1fb3a6f Merge remote-tracking branch 'origin/master' into master 2020-11-13 15:54:33 +08:00
Captain.B 7127f9eb3f refactor(性能测试): 性能测试保存jtl 2020-11-13 15:53:24 +08:00
wenyann a94453b518 fix: 登陆密码长度，邮箱设置 2020-11-13 14:15:54 +08:00
q4speed 5da28af6c5 feat(接口测试): 后端转换JMX增加场景断言 2020-11-13 11:25:19 +08:00
fit2-zhao 1a7d70a142 Merge remote-tracking branch 'remotes/origin/jmx-convert' into local-api-delimit 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
#	backend/src/main/java/io/metersphere/api/dto/scenario/request/HttpRequest.java
#	frontend/src/business/components/api/test/ApiTestConfig.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
 2020-11-13 10:44:03 +08:00
fit2-zhao fccabe6311 Merge remote-tracking branch 'remotes/origin/jmx-convert' into local-api-delimit 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
#	backend/src/main/java/io/metersphere/api/dto/scenario/request/HttpRequest.java
#	frontend/src/business/components/api/test/ApiTestConfig.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
 2020-11-13 10:43:37 +08:00
fit2-zhao 5005cbdd85 Merge branch 'master' into local-api-delimit 
# Conflicts:
#	frontend/package.json
 2020-11-13 09:43:20 +08:00
fit2-zhao a887840214 feat(接口定制): 基础保存功能完善 2020-11-13 09:38:37 +08:00
Captain.B 28aebdd2f0 fix(测试跟踪): 修复测试用例选择自动且关联用例为其他时，在测试计划中查看该用例出现问题 2020-11-12 15:26:06 +08:00
q4speed 759e6e7f0d fix(接口测试): 修复空指针bug 2020-11-12 10:21:42 +08:00
Captain.B ecfc1d2596 feat(性能测试): 设置reportId参数 2020-11-11 17:59:05 +08:00
q4speed b9126f282b fix(接口测试): 修复testclass和guiclass不正确的bug 2020-11-11 17:08:09 +08:00
q4speed fbfb606ef2 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into jmx-convert 
 Conflicts:
	frontend/src/business/components/api/test/model/ScenarioModel.js
 2020-11-11 13:49:09 +08:00
q4speed 5a3310a837 refactor(接口测试): 后台转换JMX 2020-11-11 13:40:24 +08:00
Captain.B 6b443008cd feat(接口测试): 增加场景级别断言配置 2020-11-11 12:09:56 +08:00
Captain.B d772fac5e3 chore: 同步submodule 2020-11-10 17:35:26 +08:00
shiziyuan9527 5b7dda9825 refactor: 规范组件名 2020-11-10 16:57:40 +08:00
Captain.B e1b5c32f3c refactor(接口测试): 接口的报告列表增加分页 2020-11-09 18:56:12 +08:00
fit2-zhao 9bdb4f9625 feat(接口定制): 基础保存功能完善 2020-11-09 18:44:56 +08:00
Captain.B ac8d1da7d4 feat(性能测试): 支持配置不同的线程组参数 2020-11-09 17:37:11 +08:00
Captain.B 3e57e9359d Merge branch 'master' of github.com:metersphere/metersphere into master 2020-11-09 16:49:41 +08:00
Captain.B 2d1a5a1995 feat(性能测试): 支持配置不同的线程组参数 2020-11-09 16:45:39 +08:00
chenjianxing f087d3cbb4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-09 13:55:47 +08:00
shiziyuan9527 e6231fc07e fix(测试跟踪): 修复测试计划左侧模块树展开异常的问题 2020-11-09 10:53:13 +08:00
fit2-zhao 8404272115 Merge branch 'master' into local-api-delimit 2020-11-06 18:24:59 +08:00
fit2-zhao b8b5d7d1d3 初版本保存完成 2020-11-06 18:24:11 +08:00
chenjianxing fcf879d06f fix(测试跟踪): 用例导出报错 2020-11-06 09:39:46 +08:00
Captain.B 8ccca7dc03 feat(系统设置): 显示设置 sql 2020-11-05 18:04:27 +08:00
chenjianxing 63e234b74b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-05 17:16:48 +08:00
Captain.B 0b08a3d06d Merge remote-tracking branch 'origin/master' into master 2020-11-05 16:53:53 +08:00
Captain.B 4f7768a8e0 feat(性能测试): 性能测试支持jar 2020-11-05 16:45:45 +08:00
chenjianxing ae83c6aecd Merge branch 'v1.4' 2020-11-05 15:42:54 +08:00
shiziyuan9527 6e287d6188 feat: 删除资源池时提示哪些测试正在使用 2020-11-05 15:30:38 +08:00
Captain.B ff6015754a Merge remote-tracking branch 'origin/master' into master 
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
 2020-11-05 15:18:12 +08:00
Captain.B 31ee098a9c feat(系统设置): 显示设置拦截器过滤修改 2020-11-05 15:15:46 +08:00
wenyann 5def220676 Merge remote-tracking branch 'origin/master' 2020-11-05 14:55:17 +08:00
wenyann e54bd0dc14 fix: 性能测试消息发送失败 2020-11-05 14:54:39 +08:00
shiziyuan9527 1625bff625 fix: 删除项目时强制删除项目下的资源 2020-11-05 14:41:13 +08:00
Captain.B b3682de7a4 feat(系统设置): 显示设置 2020-11-05 12:32:24 +08:00
Captain.B da97ae04fd Merge remote-tracking branch 'origin/master' into master 2020-11-05 09:36:08 +08:00
Captain.B e0c0b05ace feat(系统设置): 显示设置 2020-11-05 09:35:36 +08:00
wenyann c1f4c8cba3 fix: 修复用例评审评论链接 2020-11-04 18:09:11 +08:00
chenjianxing 5303b19d08 fit: 定时任务邮件通知页面权限问题 2020-11-04 15:13:23 +08:00
Captain.B 2183154d4d Merge remote-tracking branch 'origin/master' into master 2020-11-04 14:03:58 +08:00
Captain.B 24bae7736d refactor(性能测试): 性能测试生成错误之后转到日志详情 2020-11-04 14:03:28 +08:00
chenjianxing 66fb90d8fb fix(测试跟踪): 测试用例导出报错 2020-11-04 12:35:38 +08:00
chenjianxing 26ba9a93ea Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-04 11:17:07 +08:00
chenjianxing b5fe5fad10 fix(接口测试): xpath断言保存不生效 2020-11-04 11:16:58 +08:00
shiziyuan9527 7e395a4209 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-04 10:49:00 +08:00
shiziyuan9527 12e86889f7 feat(测试跟踪): 测试计划列表增加进度列 2020-11-04 10:48:50 +08:00
chenjianxing aea60b4827 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-03 21:19:12 +08:00
wenyann c0d933b94b fix: 推送消息显示用户名称 2020-11-03 18:30:24 +08:00
chenjianxing 4dc7d457f3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-03 17:34:26 +08:00
chenjianxing db65773cb0 Merge branch 'v1.4' 2020-11-03 17:34:13 +08:00
shiziyuan9527 ce0a688130 refactor(测试跟踪): 优化测试跟踪首页查询 2020-11-03 14:33:20 +08:00
wenyann 4576b38f80 Merge remote-tracking branch 'origin/master' 2020-11-03 11:21:32 +08:00
wenyann 65872f1659 fix: 删除无用代码 2020-11-03 11:20:38 +08:00
chenjianxing b97cf5aeaf feat(接口测试): xpath断言 2020-11-03 09:36:11 +08:00
Captain.B 587f41b962 Merge remote-tracking branch 'origin/master' into master 2020-11-02 17:12:08 +08:00
Captain.B b44e3d623e Merge branch 'v1.4' into master 2020-11-02 17:11:44 +08:00
Captain.B 891b6b8efa fix: 修复flyway 2020-11-02 17:11:36 +08:00
Captain.B e983319e9a fix: 修复flyway 2020-11-02 17:11:09 +08:00
wenyann 352d464ca6 fix: 修复测试计划，钉钉提示语为空，修改日志 2020-11-02 16:51:06 +08:00
fit2-zhao 519338e508 Merge branch 'master' into local-api-delimit 
# Conflicts:
#	frontend/src/i18n/zh-TW.js
 2020-11-02 16:24:55 +08:00
fit2-zhao 0c89fd3c14 feat(接口定义): 初步页面完成 2020-11-02 16:21:30 +08:00
shiziyuan9527 b749f6277b refactor: 添加方法注释 2020-11-02 15:21:08 +08:00
chenjianxing 870f9f9388 Merge branch 'v1.4' 2020-11-02 14:37:36 +08:00
Captain.B d5f231bf32 fix(性能测试): 修复性能测试定时任务报告不发送通知 
(cherry picked from commit 4534463216)
 2020-11-02 13:21:37 +08:00
Captain.B 4534463216 fix(性能测试): 修复性能测试定时任务报告不发送通知 2020-11-02 13:20:44 +08:00
Captain.B fc27054a1f Merge remote-tracking branch 'origin/master' into master 2020-10-30 18:16:37 +08:00
Captain.B d4160967d7 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-30 15:59:15 +08:00
Captain.B 8fc99f8514 refactor: 判断是否是ldaps不区分大小写 2020-10-30 15:58:49 +08:00
Captain.B f1f4cc334c refactor: 判断是否是ldaps不区分大小写 2020-10-30 15:58:29 +08:00
shiziyuan9527 4e911ebb92 fix(测试跟踪): 修复测试用例模块未拖拽成功时也会发送请求的问题 2020-10-30 15:43:30 +08:00
Captain.B 2ea919a056 Merge remote-tracking branch 'origin/master' into master 2020-10-30 15:23:02 +08:00
Captain.B e17c64b0b8 feat(性能测试): 上传的csv文件自动转成相对路径 2020-10-30 15:22:43 +08:00
shiziyuan9527 021d3caf4f feat(测试跟踪): 测试用例同级模块排序 2020-10-30 15:20:27 +08:00
chenjianxing 713257c4d5 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-30 14:07:57 +08:00
chenjianxing 5cf7018490 fix(接口测试): 插件录制导入put请求报错 2020-10-30 14:07:47 +08:00
wenyann ed211e2e5d fix: 去除警告⚠️ 2020-10-30 14:01:01 +08:00
q4speed b7ce2f8025 fix(接口测试): pom去掉重复依赖 2020-10-30 13:50:49 +08:00
wenyann b2469cb1c4 fix: 排序空指针异常 2020-10-30 13:20:57 +08:00
q4speed 2063612252 fix(接口测试): 修复dubbo客户端v2.7.7以上版本在进行泛化调用server端为v2.6.x以前版本时出现No Provider错误 2020-10-30 12:07:41 +08:00
wenyann e9d13d89d9 feat:flyway修改 2020-10-30 10:45:38 +08:00
wenyann fcfc7a2615 feat: 设置默认值 2020-10-30 10:35:09 +08:00
chenjianxing b2c03a4bde fix: flyway 文件版本冲突 2020-10-30 09:42:42 +08:00
chenjianxing 36bcea6ca6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-29 20:54:42 +08:00
chenjianxing aa4ba14780 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-29 20:53:19 +08:00
chenjianxing 3927da1d02 refactor(接口测试): 测试报告格式化优化 2020-10-29 20:52:16 +08:00
shiziyuan9527 af295a9fd8 refactor: flyway 2020-10-29 18:43:29 +08:00
wenyann 12387c9253 feat: 消息设置内容修改 2020-10-29 18:35:07 +08:00
shiziyuan9527 08183e425e Merge branch 'tree-sort' 2020-10-29 18:30:46 +08:00
shiziyuan9527 25d62b6397 feat(测试跟踪): 测试用例同级模块排序 2020-10-29 18:16:35 +08:00
wenyann 9b07c26e05 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-29 17:40:04 +08:00
wenyann 2fd79fdd5c feat: 消息设置内容修改，排序 2020-10-29 17:39:38 +08:00
Captain.B 4a855be014 refactor: 启动失败清理任务 2020-10-29 15:04:48 +08:00
Captain.B 8300285c8b refactor: 去掉不用的import 2020-10-29 14:21:39 +08:00
Captain.B 32fff6a239 refactor: 修改字段长度 2020-10-29 09:35:30 +08:00
chenjianxing aa0a7bfa20 fix: 修复消息通知sql脚本版本 2020-10-28 19:34:12 +08:00
wenyann 753b9da5c1 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-28 18:54:37 +08:00
wenyann 55d41d50a2 feat: 消息设置性能测试 2020-10-28 18:54:02 +08:00
q4speed 9be3a0370c Merge remote-tracking branch 'origin/v1.4' into v1.4 
# Conflicts:
#	frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
 2020-10-28 17:30:19 +08:00
q4speed b7af640080 feat(接口测试): 增加脚本断言 2020-10-28 17:25:41 +08:00
shiziyuan9527 5b305a288a fix(用例评审): 用例评审列表用户ID修改为用户名 2020-10-28 17:05:23 +08:00
Captain.B baa5b09b0d feat(性能测试): 性能测试error统计 2020-10-28 16:42:19 +08:00
Captain.B 20e7b04d5b fix: 修复改了资源池之后资源池ID变了的问题 2020-10-28 12:33:57 +08:00
Captain.B 9a34a5f27f fix: 修复改了资源池之后资源池ID变了的问题 2020-10-28 12:19:19 +08:00
Captain.B d26c05a306 feat: 测试计划用例列表高级搜索中增加按执行人搜索 2020-10-28 10:37:01 +08:00
chenjianxing 319b54ca7e fix(测试跟踪): 测试用例导出报错 2020-10-28 09:58:48 +08:00
chenjianxing 4dfc963c40 Merge branch 'v1.4' 2020-10-27 23:47:44 +08:00
chenjianxing c63327397a Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-27 23:47:00 +08:00
chenjianxing 72006d16f0 fix(测试跟踪): 解决旧版本保存用例导出报错 2020-10-27 23:45:53 +08:00
Captain.B f119fe08d1 Merge branch 'v1.4' into master 2020-10-27 17:55:05 +08:00
Captain.B c16bc0ca8e feat(LDAP): 支持LDAPS, 区分ldap和ldaps 2020-10-27 17:53:48 +08:00
Captain.B d55a2605cf Merge branch 'v1.4' into master 2020-10-27 17:45:06 +08:00
Captain.B 8988059e54 feat(LDAP): 支持LDAPS 2020-10-27 17:43:50 +08:00
Captain.B 32f130c05e Merge branch 'v1.4' into master 2020-10-27 13:26:00 +08:00
fit2-zhao f239183989 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-27 11:44:32 +08:00
fit2-zhao 200c397950 feat(测试跟踪): 添加索引 2020-10-27 11:29:05 +08:00
shiziyuan9527 7add174a32 feat(测试跟踪): 用例评审评论支持编辑和删除 2020-10-27 11:26:34 +08:00
chenjianxing 32771d7c6e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 19:12:58 +08:00
chenjianxing 8efda5ef5e refactor(接口测试): 优化jsonpath推荐 2020-10-26 19:12:46 +08:00
Captain.B 04d10717de Merge branch 'v1.4' into master 2020-10-26 17:49:42 +08:00
wenyann d9db503bb3 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-26 17:13:11 +08:00
wenyann 6b5361f8b2 fix(消息设置):性能测试通知 2020-10-26 17:12:50 +08:00
chenjianxing acdca004f5 merge origin 2020-10-26 14:36:49 +08:00
chenjianxing fd962b2c1d fix(接口测试): TCP请求导入报错 2020-10-26 14:32:39 +08:00
Captain.B da55ae6ca3 Merge branch 'v1.4' into master 2020-10-26 14:22:24 +08:00
Captain.B d5e635d872 fix: 修复logback中的sql日志无法配置的问题 2020-10-26 14:21:29 +08:00
Captain.B a186fda880 Merge branch 'v1.4' into master 2020-10-26 13:51:40 +08:00
chenjianxing 42ef1bcc89 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 11:34:46 +08:00
pencui 712de81915
新增http请求，jsonpath断言批量功能 (#599) 
* 新增jsonpath断言批量推荐功能

* 修复xpack下错误的代码结构

* 补正改版后的jsonpath解析功能

Co-authored-by: root <root@localhost.localdomain>
 2020-10-26 11:33:36 +08:00
chenjianxing 76455e54a5 refactor(接口测试): swagger 导入请求名称使用Summary 2020-10-26 10:57:04 +08:00
wenyann bc07ab7a98 feat: 消息设置测试计划时间处理 2020-10-23 18:30:37 +08:00
Captain.B e095691cdb fix: 测试计划任务通知接收人列表会变成英文 2020-10-23 16:46:30 +08:00
Captain.B 9b3b8739eb Merge branch 'v1.4' into master 2020-10-23 15:24:11 +08:00
Captain.B 868ab546ef refactor: 禁用用户之后剔除用户 2020-10-23 15:23:41 +08:00
wenyann 10b258a9b0 fix(消息设置):消息设置修改 2020-10-23 14:52:53 +08:00
Captain.B 54c198ab8e Merge branch 'master' into v1.4 2020-10-23 14:26:46 +08:00
Captain.B fb2c45f1e4 refactor: 本地开发控制台打印sql日志 
修改 /opt/metersphere/conf/metershpere.properties 添加
logging.sql.level=debug
 2020-10-23 14:00:32 +08:00
wenyann f64d7a21b0 Merge remote-tracking branch 'origin/master' 2020-10-23 14:00:03 +08:00
wenyann 056ea0aea1 fix(消息设置):消息设置人员范围 2020-10-23 13:48:24 +08:00
Captain.B 1485bb069d Merge branch 'v1.4' into master 2020-10-23 13:35:38 +08:00
Captain.B 70602c9d95 fix: 去掉sql上的分号 2020-10-23 13:35:00 +08:00
chenjianxing 4b7a42d2e8 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-23 12:47:24 +08:00
chenjianxing 196bcec3bf fix(接口测试): 引用复制场景保存测试报错 2020-10-23 12:47:06 +08:00
wenyann 2c839b0d61 feat: 消息设置 2020-10-23 11:25:18 +08:00
wenyann e59926abee Merge branch 'v1.4' 2020-10-23 11:23:01 +08:00
wenyann 25e9bff303 feat: 消息设置 2020-10-23 11:20:51 +08:00
fit2-zhao 6f1f3c8901 fix(XPack): 恢复误提交内容 2020-10-23 11:13:45 +08:00
wenyann e367075c58 fix(消息设置): 消息设置 2020-10-23 09:55:22 +08:00
wenyann 0a3e0574da fix(消息设置): 消息设置 2020-10-23 09:55:04 +08:00
chenjianxing 709a18697d Merge branch 'master' of https://github.com/metersphere/server 2020-10-22 18:19:33 +08:00
chenjianxing b4fd4dc910 refactor(接口测试): 修改请求参数、请求内容名称 2020-10-22 18:19:23 +08:00
Captain.B 633bfd3e12 refactor: 检查 userIds 是否为空 2020-10-22 17:59:56 +08:00
Captain.B dd8d52a32d Merge remote-tracking branch 'origin/master' into master 2020-10-22 17:53:49 +08:00
Captain.B ba0bc4dded refactor: 发送消息通知使用非事务方式, 声明写在类上面 2020-10-22 17:53:02 +08:00
shiziyuan9527 6e4a8f1ab4 fix: 修复评审的发起人不能关联用例的问题 2020-10-22 17:21:52 +08:00
Captain.B badbe8eda0 refactor: 发送消息通知使用非事务方式 2020-10-22 15:23:52 +08:00
shiziyuan9527 318383afea Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-22 15:02:18 +08:00