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

3334 Commits

Author SHA1 Message Date
chenjianxing 254aa4e63d Merge branch 'master' of github.com:metersphere/metersphere 2021-03-22 14:28:12 +08:00
chenjianxing c41a2950fa fix: 接口定义导入带用例 2021-03-22 14:28:02 +08:00
fit2-zhao 02558f6d66 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-22 14:11:59 +08:00
fit2-zhao ec6a019b62 fix(接口自动化): 修复历史数据升级条件控制器丢失问题 2021-03-22 14:11:40 +08:00
Captain.B 58d7ddbdd5 chore: sync 2021-03-22 14:11:16 +08:00
song.tianyang bdb3a62e05 fix: 导入har文件优化 
使用url进行接口名称命名时，进行转码
 2021-03-22 13:49:49 +08:00
song.tianyang 75798db693 fix: 导入用户模版优化 
导入用户模版优化-修改组织成员所属组织的表达名称
 2021-03-22 12:50:58 +08:00
song.tianyang 1867666978 fix: 导入用户模版优化 
导入用户模版优化
 2021-03-22 12:47:01 +08:00
Captain.B 3a14671dc2 Merge branch 'master' into compare 2021-03-22 09:36:38 +08:00
wenyann 0ab466293c fix:测试计划关联测试报错 2021-03-22 09:03:42 +08:00
wenyann 8f12d2786a Merge remote-tracking branch 'origin/master' 2021-03-22 09:02:13 +08:00
wenyann f0ad527813 fix: 修复邮件提示测试报告不存在 2021-03-21 23:02:51 +08:00
song.tianyang bccc68b841 Merge remote-tracking branch 'origin/master' 2021-03-21 20:44:39 +08:00
song.tianyang 362e0b3720 refactor: 文档页面性能优化 
文档页面性能优化
 2021-03-21 20:44:24 +08:00
wenyann 1d0ea00553 feat: 测试用例关联多个测试 2021-03-21 19:43:27 +08:00
wenyann c96928384e feat: 测试用例关联多个测试 2021-03-21 19:43:15 +08:00
wenyann 4ce09675b3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-21 12:27:04 +08:00
shiziyuan9527 6c0780e1cb fix(测试跟踪): 首页失败用例列表未统计性能失败用例 2021-03-21 12:03:36 +08:00
wenyann 63c23e7188 fix: 修复jenkins插件中测试人员无法调用 2021-03-21 00:04:53 +08:00
shiziyuan9527 f3eb82c839 feat(测试跟踪): 测试用例可关联JIRA需求 2021-03-20 20:32:14 +08:00
song.tianyang 787909a415 Merge remote-tracking branch 'origin/master' 2021-03-20 16:48:15 +08:00
Captain.B 6f618c2cdf Merge remote-tracking branch 'origin/master' into master 2021-03-20 13:21:59 +08:00
Captain.B dd636e9522 refactor: /login 不用经过csrf拦截器 2021-03-20 13:21:38 +08:00
shiziyuan9527 b92364ff6f fix(测试跟踪): 修复测试计划用例数错误的问题 2021-03-20 12:06:51 +08:00
shiziyuan9527 e740d55ac8 fix(测试计划): 修复关联接口用例列表展示错误的问题 2021-03-20 11:02:15 +08:00
shiziyuan9527 78506f814f fix(测试跟踪): 修复测试用例导出时某些字段未导出的问题 2021-03-20 10:44:30 +08:00
song.tianyang 72f9e143c5 feat: 接口定义针对 TCP 请求增加 ESB 子类型（X-Pack） 
接口定义针对 TCP 请求增加 ESB 子类型（X-Pack）
 2021-03-19 19:29:14 +08:00
fit2-zhao a1d4e965d0 fix(场景自动化): 修复CVS附件缺失执行报错问题 2021-03-19 19:07:18 +08:00
chenjianxing b46e33a71c fix: 解决冲突 2021-03-19 18:07:39 +08:00
chenjianxing 2b5483dc23 fix: 用例导入tag表头为空导入失败 2021-03-19 18:04:35 +08:00
Captain.B 772454df43 Merge branch 'master' into compare 2021-03-19 17:44:49 +08:00
Captain.B 5f7d6b5370 feat: 增加报告对比功能 2021-03-19 17:39:34 +08:00
shiziyuan9527 bc9a8ccc21 fix(测试跟踪): 修复执行步骤中含有回车的用例未原样导入的问题 
Closes #1573
 2021-03-19 17:21:41 +08:00
fit2-zhao 6ac294702d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-19 16:45:02 +08:00
fit2-zhao 5a70af65f4 fix(场景自动化): 修复部分缺陷 2021-03-19 16:44:42 +08:00
shiziyuan9527 9b16d71bae fix: 修复空指针异常 2021-03-19 16:36:10 +08:00
Captain.B 6251fa18c7 refactor: 修改类名 2021-03-19 13:58:21 +08:00
shiziyuan9527 17453e9268 fix(用例评审): 修复评审结果筛选无效的问题 2021-03-19 11:31:01 +08:00
Captain.B b81808b2d8 Merge remote-tracking branch 'origin/master' 2021-03-19 11:04:03 +08:00
Captain.B 8812a17cdb chore: sync 2021-03-19 11:03:43 +08:00
shiziyuan9527 04bf8111f5 fix(测试计划): 修复报告统计所属项目显示错乱 2021-03-19 10:47:44 +08:00
Captain.B fadc554707 refactor(性能测试): k8s job设置反亲和性 2021-03-19 10:30:30 +08:00
Captain.B db3d08efbd chore: sync 2021-03-19 09:47:41 +08:00
fit2-zhao 376d7a08c8 fix(场景自动化): 修复新建场景问题 2021-03-18 19:10:52 +08:00
chenjianxing 3b10ebcdbd Merge branch 'master' of github.com:metersphere/metersphere into Ambitiousliga-confirm-pwd 2021-03-18 17:34:10 +08:00
fit2-zhao 46a47552ea style(XPack): 优化报表提示内容 2021-03-18 17:33:32 +08:00
chenjianxing a9d5c70e04 Merge branch 'master' of github.com:metersphere/metersphere into Ambitiousliga-confirm-pwd 2021-03-18 17:33:18 +08:00
chenjianxing 1952d50b45 fix: swagger2.0导入没有请求体 2021-03-18 17:33:08 +08:00
fit2-zhao bc804ec9db Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-18 17:27:38 +08:00
fit2-zhao 3f1da24143 fix(接口定义): 修复加载外部js问题，增加 Nashorn JavaScript引擎切换到GraalVM 选择 2021-03-18 17:27:23 +08:00
Captain.B 4a93952020 chore: sync 2021-03-18 17:19:14 +08:00
Captain.B 749e43341b Merge branch 'master' of github.com:metersphere/metersphere 2021-03-18 17:15:26 +08:00
shiziyuan9527 ecc33663ec fix: 修复登陆信息加密问题 2021-03-18 17:04:13 +08:00
shiziyuan9527 613555101e fix(LDAP): 修复LDAP登陆失败的问题 2021-03-18 16:55:54 +08:00
wenyann a4ddf766be Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-18 16:12:36 +08:00
wenyann dd8de4e277 Merge remote-tracking branch 'origin/master' 2021-03-18 16:11:01 +08:00
shiziyuan9527 095424a809 fix(场景自动化): 修复创建场景报错的问题 2021-03-18 16:11:00 +08:00
wenyann e8fd3f1847 fix:国际化 2021-03-18 16:10:38 +08:00
Captain.B 0109e0a848 fix: 修复SQL异常详情没有输出到控制台的bug 2021-03-18 15:22:17 +08:00
fit2-zhao e8f56b1787 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-18 15:04:05 +08:00
fit2-zhao 1961c8fec3 feat(接口自动化): 增加jmx导入内容的编辑 2021-03-18 15:03:46 +08:00
Captain.B 9d5d60c99a Merge remote-tracking branch 'origin/master' 2021-03-18 15:02:41 +08:00
Captain.B d2466c364e fix: 修复SQL异常详情没有输出到控制台的bug 2021-03-18 15:02:24 +08:00
Coooder-X 3fd2139607
fix: 修复定时任务点击跳转错误 (#1643) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

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

* fix: 修复定时任务点击跳转错误

* fix: 测试计划首页的定时任务只显示测试计划任务

Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
 2021-03-18 14:53:15 +08:00
Coooder-X eb163bbb65
fix(接口定义): 修复导入接口个数不对，以及api和case判断错误 (#1659) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

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

* fix(接口定义): 修复导入接口个数不对，以及api和case判断错误
 2021-03-18 14:49:39 +08:00
Ambitiousliga f5ec3169ea
fix (#1646) 
* fix(接口测试):修复只读用户权限过高能对数据进行操作

* fix(测试计划):修复关联用例时样式不统一的问题

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-18 14:48:19 +08:00
Captain.B fec05d2ed0 fix: 修复session过期之后不能登出的问题 2021-03-18 14:31:27 +08:00
Captain.B 21709ff323 fix: ui.theme 为空的时候设置默认值 2021-03-18 14:11:41 +08:00
Captain.B adb843fa49 Merge remote-tracking branch 'origin/master' 2021-03-18 14:01:18 +08:00
Captain.B 8ef938dac1 fix: ui.theme 为空的时候设置默认值 2021-03-18 14:01:02 +08:00
wenyann cf5688fc4e Merge remote-tracking branch 'origin/master' 2021-03-18 13:54:36 +08:00
Captain.B 850af874ee chore: sync 2021-03-18 13:34:18 +08:00
shiziyuan9527 ab9a4f3514 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-18 10:14:53 +08:00
fit2-zhao 17ebeda90b style(接口自动化): 终止事件调整 2021-03-17 19:02:28 +08:00
shiziyuan9527 94b7cd3e4c fix(测试跟踪): 用例关联Zentao需求 2021-03-17 18:32:15 +08:00
Captain.B 41f81dff5e fix: 错误处理时参数类型不匹配 2021-03-17 18:19:34 +08:00
Captain.B cbe3b6bc0d Merge remote-tracking branch 'origin/master' 2021-03-17 17:22:51 +08:00
Captain.B 72bb3b8368 refactor(性能测试): k8s job设置反亲和性 2021-03-17 17:22:26 +08:00
chenjianxing ca26657e91 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-17 16:59:42 +08:00
chenjianxing 03818c53ee fix: 脑图用例编辑 2021-03-17 16:59:33 +08:00
wenyann be2699f1dc Merge remote-tracking branch 'origin/master' 2021-03-17 15:03:17 +08:00
wenyann 806957ba79 feat: 测试计划列表 2021-03-17 15:02:44 +08:00
shiziyuan9527 e58dcf4d88 fix: 批量修改执行环境 2021-03-17 14:05:44 +08:00
chenjianxing 492dbb42bd feat: 测试计划脑图编辑 2021-03-17 11:45:49 +08:00
chenjianxing caf3f3652c fix: 用例评审脑图编辑 2021-03-17 10:54:31 +08:00
Captain.B ae08bd2e42 fix(性能测试): 修复创建人排序的bug 2021-03-16 19:29:03 +08:00
wenyann 8730b4be89 feat: 创建测试计划 2021-03-16 18:10:15 +08:00
wenyann aa0e194e4c Merge remote-tracking branch 'origin/master' 2021-03-16 17:48:45 +08:00
wenyann f74bf38052 feat: 测试评审测试计划功能测试同步添加关联的接口和性能测试 2021-03-16 17:48:26 +08:00
Captain.B 15feda52f6 fix(性能测试): 修复缺少sql的问题 2021-03-16 16:41:38 +08:00
Captain.B d35d135478 fix(性能测试): 修复编辑测试时删除不相关的文件报错 2021-03-16 13:53:48 +08:00
Captain.B 15dc136df7 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-16 13:42:36 +08:00
Captain.B 475440ccd4 refactor(性能测试): 测试文件关联项目 2021-03-16 13:40:14 +08:00
chenjianxing c3f53287bc Merge branch 'master' of github.com:metersphere/metersphere 2021-03-16 12:56:10 +08:00
chenjianxing 0edc4d136f feat: 测试计划添加脑图 2021-03-16 12:55:56 +08:00
wenyann 30d39b4338 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-16 11:40:19 +08:00
wenyann cf64497b70 fix: 测试评审关联用例修改 2021-03-16 11:39:07 +08:00
wenyann 9bd26fa22c fix: 测试评审关联用例修改 2021-03-16 11:38:58 +08:00
wenyann 916dc27989 fix: 测试评审关联用例修改 2021-03-16 11:38:46 +08:00
shiziyuan9527 25e2cdc2c9 fix(测试跟踪): 删除缺陷未删除关联关系 2021-03-16 11:01:48 +08:00
chenjianxing 8b71a911b8 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-15 21:25:58 +08:00
Coooder-X a2da6ad175
schedule表对旧数据name字段兼容的补充 (#1638) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* fix: schedule表对旧数据name字段兼容的补充
 2021-03-15 21:24:28 +08:00
shiziyuan9527 c2af5f6635 feat(测试跟踪): 首页跳转 2021-03-15 21:22:49 +08:00
chenjianxing 5cd45c9a1e Merge branch 'master' of github.com:metersphere/metersphere 2021-03-15 21:09:49 +08:00
chenjianxing 17e9c9dd93 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-15 20:46:53 +08:00
Coooder-X 0a19204418
feat(定时任务): 修改schedule表和查询，swagger定时任务也显示在首页 (#1627) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* feat(定时任务): 修改schedule表和查询，swagger定时任务也显示在首页

增加了schedule表的project ID、name字段，重写了首页定时任务列表的查询语句
 2021-03-15 20:42:38 +08:00
chenjianxing c3d1c454b5 refactor: 用例评审添加脑图 2021-03-15 20:39:09 +08:00
fit2-zhao 90adde0933 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-15 19:08:59 +08:00
fit2-zhao 0255bcb598 feat(接口自动化): 全屏设置 2021-03-15 19:08:50 +08:00
BugKing a279d1b463
Merge pull request #1633 from EasilyTest/patch-2 
fix: 修复登录csrf token不为空的问题
 2021-03-15 17:51:36 +08:00
shiziyuan9527 19d284a399 fix(测试跟踪): 首页重构 2021-03-15 17:24:14 +08:00
Tester_Z 45c98ebf5d
fix: 修复登录csrf token不为空的问题 2021-03-15 17:18:53 +08:00
Captain.B 84a989db63 Merge remote-tracking branch 'origin/master' 2021-03-15 17:03:41 +08:00
Captain.B c426bb2064 feat(性能测试): 配置压测时长支持单位 2021-03-15 16:55:33 +08:00
chenjianxing bbacb89b02 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-15 16:21:14 +08:00
chenjianxing b5709cc998 feat: 脑图用例编辑 2021-03-15 16:20:51 +08:00
shiziyuan9527 82d7be618c fix: 主题色修改 2021-03-15 15:26:56 +08:00
shiziyuan9527 41cfc77a3e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-13 13:04:56 +08:00
shiziyuan9527 551f34fee7 feat(测试跟踪): 首页重构 2021-03-13 13:01:28 +08:00
fit2-zhao 170d811c14 fix(接口定义): 空指针问题修复 2021-03-12 18:12:29 +08:00
fit2-zhao 7093a8a921 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 17:14:36 +08:00
fit2-zhao 759da73dd5 fix(接口自动化): 规范 提取脚本和 断言脚本名称 2021-03-12 17:14:29 +08:00
shiziyuan9527 7d26ee82c5 feat(测试跟踪): 用例数量统计 2021-03-12 16:57:16 +08:00
Captain.B e9e3dce76c Merge remote-tracking branch 'origin/master' 2021-03-12 15:56:26 +08:00
Captain.B 03151eaa3e fix(性能测试): 修复由于node-controller返回不正确的错误提示 2021-03-12 15:56:09 +08:00
chenjianxing f4ed49fde5 fix: 删除相关用户，接口测试用例列表报错 2021-03-12 15:30:54 +08:00
Captain.B 56110bfa5b Merge remote-tracking branch 'origin/master' 2021-03-12 15:07:58 +08:00
Captain.B 306600c73a refactor: 用户登录时用户名和密码使用密文传输 
Closes #1094
 2021-03-12 15:07:12 +08:00
song.tianyang 2b47f47d40 Merge remote-tracking branch 'origin/master' 2021-03-12 15:03:05 +08:00
song.tianyang a0d7b33323 fix: 修改定时任务创建时的参数-测试计划等入口参数修改 
修改定时任务创建时的参数-测试计划等入口参数修改
 2021-03-12 14:55:59 +08:00
wenyann ca838a36d6 Merge remote-tracking branch 'origin/master' 2021-03-12 14:55:52 +08:00
wenyann d3d35568bb fix:flayway 2021-03-12 14:55:33 +08:00
song.tianyang 7e9cf5b292 fix: 修改定时任务创建时的参数 
修改定时任务创建时的参数类
 2021-03-12 14:23:46 +08:00
wenyann 637739459e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 11:15:31 +08:00
fit2-zhao 7a9bb603e8 fix(接口自动化): 修复引用场景不能移除问题 2021-03-12 10:56:59 +08:00
shiziyuan9527 846345cdd2 fix: SQL报错 2021-03-12 10:37:50 +08:00
wenyann 9d6cec56e1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 10:23:38 +08:00
Coooder-X de06a5e770
fix: 国际化补充 (#1615) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* fix: 国际化补充
 2021-03-11 20:44:49 +08:00
Coooder-X c25f10050b
feat(接口定义): 支持接口定义导出为 swagger 格式 (#1606) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* feat(接口定义): 支持接口定义导出为 swagger 格式
 2021-03-11 20:44:29 +08:00
wenyann 3aae293f22 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 18:54:04 +08:00
fit2-zhao 5870c64653 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 18:49:41 +08:00
shiziyuan9527 4c6760df8b fix(测试用例): 字符串限制长度不一致 
Closes #1574
 2021-03-11 18:40:23 +08:00
wenyann 4edddd5e39 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-11 18:33:38 +08:00
wenyann c3627e5f29 fix:测试评审接口列表修改 2021-03-11 18:32:34 +08:00
fit2-zhao 257d031b8a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 17:59:27 +08:00
fit2-zhao 7dfa50d348 fix(接口定义): 保存用例最后执行环境 2021-03-11 17:03:29 +08:00
shiziyuan9527 6500e0cf4a Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/xpack
 2021-03-11 16:46:58 +08:00
shiziyuan9527 56e9399595 feat(系统设置): 修改配色 2021-03-11 16:38:40 +08:00
song.tianyang 9f33d88d3a Merge remote-tracking branch 'origin/master' 2021-03-11 16:36:42 +08:00
song.tianyang 2a29e611b5 feat: 接口自动化模块Har文件导入 
接口自动化模块Har文件导入
 2021-03-11 16:34:14 +08:00
wenyann 0d1d1acd3d fix:修复测试报告不存在 2021-03-11 16:32:47 +08:00
fit2-zhao be133b3cc6 fix(接口自动化，接口定义): 修复列表数据放到回收站再恢复时状态错误问题 2021-03-11 15:56:54 +08:00
wenyann 6b46f3120b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 14:14:29 +08:00
Captain.B b9be1ddd0e refactor(性能测试): 增加上传资源文件的类型, 合并 csv 和 jar 的保存方式统一使用 resourceFiles 2021-03-11 14:12:49 +08:00
wenyann 8fd1ddbf2b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 14:10:33 +08:00
Captain.B b93fac0ee5 Merge remote-tracking branch 'origin/master' 2021-03-11 14:08:40 +08:00
Captain.B 353e6bed77 refactor(性能测试): 增加上传资源文件的类型, 合并 csv 和 jar 的保存方式统一使用 resourceFiles 2021-03-11 14:05:52 +08:00
wenyann 0e3a26cbb5 fix:创建测试用例修改 2021-03-11 14:05:32 +08:00
fit2-zhao 448c14138b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 13:51:07 +08:00
fit2-zhao 6b76d62bdb fix(接口自动化): 每个请求显示执行结果 2021-03-11 13:30:37 +08:00
Captain.B 3392ae6cb3 fix: socket 链接不用经过csrf 2021-03-11 11:47:20 +08:00
song.tianyang 0380567fe4 feat: Har文件导入 
Har文件导入
 2021-03-11 11:40:15 +08:00
Captain.B 061966ce36 fix: socket 链接不用经过csrf 2021-03-11 11:28:01 +08:00
Captain.B e11e59a256 fix: 不设置csrfToken提示错误 2021-03-10 17:48:38 +08:00
Captain.B 808f9de68b fix: 跳转到 / 不用校验csrf 2021-03-10 17:30:13 +08:00
Captain.B 7c40fa3377 fix: 没有登录不需要校验csrf 2021-03-10 16:56:19 +08:00
Captain.B 5a632c7141 Merge remote-tracking branch 'origin/master' 2021-03-10 15:48:33 +08:00
Captain.B 076baff321 refactor: 使用csrf拦截器过滤请求, 如果配置了 referer.urls 则同时校验 referer 
Closes #1088
 2021-03-10 15:27:17 +08:00
Captain.B 7e6a08bef2 refactor: 使用csrf拦截器过滤请求 
Closes #1088
 2021-03-10 15:02:30 +08:00
shiziyuan9527 e1d18909e2 fix(接口自动化): 添加场景到测试计划时未选择环境 2021-03-10 14:15:01 +08:00
fit2-zhao b9d43558bc Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-10 11:15:29 +08:00
fit2-zhao c5d58d40c3 feat(接口定义): JSONpath 断言增加操作符 2021-03-10 11:14:31 +08:00
song.tianyang 7e7433f801 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-03-09 19:21:19 +08:00
song.tianyang 3d822ac0bb fix: 有附件的案例或场景转JMX时，附件也要加过去 
有附件的案例或场景转JMX时，附件也要加过去
 2021-03-09 19:10:27 +08:00
shiziyuan9527 abe640cba5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-09 18:09:58 +08:00
shiziyuan9527 c90c061738 fix(接口自动化): 环境配置问题 2021-03-09 18:08:02 +08:00
wenyann 3e64e39631 Merge remote-tracking branch 'origin/master' 2021-03-09 17:44:08 +08:00
fit2-zhao b80da9b9ae refactor(接口自动化): 执行代码规范调整 2021-03-09 17:41:15 +08:00
wenyann 5475bb4adb feat: 测试评审详情改造，关联测试用例 2021-03-09 17:32:49 +08:00
fit2-zhao 974ad20206 fix(接口自动化): 断言JSONPath 恢复支持正则表达式方式 2021-03-09 17:22:24 +08:00
fit2-zhao 8fe8ff48ad Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-09 17:07:13 +08:00
fit2-zhao cc5175ef6c refactor(接口自动化): 重构执行方法，按照一个场景一个jmx 执行 2021-03-09 17:01:53 +08:00
Captain.B cc46f93fe5 Merge remote-tracking branch 'origin/master' 2021-03-09 14:05:52 +08:00
Captain.B 5f59602ddd fix: 去掉登录页面滚动条 2021-03-09 14:05:35 +08:00
wenyann 66977ce60d fix: 场景字段缺失 2021-03-09 13:13:25 +08:00
Captain.B 9ba7639437 refactor: 增加一个restTemplateIgnoreSSL 2021-03-09 10:37:37 +08:00
fit2-zhao add62bacaa Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 17:55:44 +08:00
fit2-zhao e532cdb634 refactor(接口自动化): 统一文件路径 2021-03-08 17:38:32 +08:00
shiziyuan9527 3258c90527 fix(接口自动化): 空指针问题 2021-03-08 17:27:22 +08:00
Captain.B 17867c5684 fix(性能测试): 修复上传附件没有修改路径的bug 2021-03-08 17:14:51 +08:00
fit2-zhao 44422224ca Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 17:00:39 +08:00
fit2-zhao bace68bd85 feat(测试跟踪): xmind 导入用例增加标签处理 2021-03-08 17:00:32 +08:00
shiziyuan9527 64fd20803b refactor(接口自动化): 兼容历史数据 2021-03-08 15:43:54 +08:00
fit2-zhao 3e985afc4b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 15:38:54 +08:00
fit2-zhao 9cdadf67ee fix(接口自动化): JSON断言特殊符号处理 2021-03-08 15:34:38 +08:00
shiziyuan9527 b22f2a5ed7 feat(接口自动化): 批量修改场景执行环境 2021-03-08 14:21:55 +08:00
fit2-zhao 9b6281d4cc Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 13:30:18 +08:00
fit2-zhao 019fa6709a fix(接口自动化): 修复headers和请求同名问题 2021-03-08 13:30:12 +08:00
shiziyuan9527 5e98f32617 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 11:24:53 +08:00
BugKing 4e393c2660 refactor: 去掉重复的SQL语句 2021-03-08 11:23:37 +08:00