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

3731 Commits

Author SHA1 Message Date
Captain.B 4214e63b71 refactor: 增强验证csrftoken 2021-03-26 18:38:16 +08:00
song.tianyang ae3d1adf33 Merge remote-tracking branch 'origin/v1.8' into v1.8 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
 2021-03-26 18:33:52 +08:00
wenyann ca67a3ed56 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 18:13:08 +08:00
Captain.B e6f889b16e Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-26 18:04:41 +08:00
fit2-zhao 8f06031cec fix(测试跟踪): 点击树菜单，列表恢复到列表 2021-03-26 18:03:00 +08:00
song.tianyang 64263c2cdb Merge remote-tracking branch 'origin/v1.8' into v1.8 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
 2021-03-26 18:02:08 +08:00
song.tianyang c1416fe407 fix: 测试用例，选中【选择所有数据】，翻页后发现第2页之后的数据并没有被选中 
测试用例，选中【选择所有数据】，翻页后发现第2页之后的数据并没有被选中
 2021-03-26 17:47:43 +08:00
wenyann d12ec06066 fix: 测试跟踪用例重复显示 2021-03-26 17:16:08 +08:00
chenjianxing cc5ff944d1 refactor: 重构模式搜索框 2021-03-26 17:06:22 +08:00
fit2-zhao 12f1c60a0f Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 16:29:35 +08:00
fit2-zhao dda1217c1a fix(接口自动化): 修复导入场景步骤请求 ip 和端口 是变量的问题 2021-03-26 16:29:18 +08:00
shiziyuan9527 f5796eb602 fix(测试跟踪): 修复首页跳转问题 2021-03-26 14:14:40 +08:00
Captain.B cb4ad5bca4 Merge branch 'master' into compare 
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
 2021-03-26 14:04:21 +08:00
wenyann deaf05dd5f fix:修复编辑用例js报错 2021-03-26 13:14:43 +08:00
Captain.B 5ebe6756df Merge branch 'v1.8' 2021-03-26 09:52:39 +08:00
Captain.B 4cf1dd112b Merge branch 'v1.8' 2021-03-25 19:26:55 +08:00
fit2-zhao 0bbd35a493 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 18:40:17 +08:00
song.tianyang dfc24d96a4 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-25 18:25:33 +08:00
song.tianyang e3e799acf9 fix: 接口定义请求内容为 XML RAW 格式时文档模式报错 
接口定义请求内容为 XML RAW 格式时文档模式报错
 2021-03-25 18:25:21 +08:00
fit2-zhao 150cb57836 fix(接口自动化): 修复 csv 路径校验问题 2021-03-25 18:19:42 +08:00
fit2-zhao c5ab6d6395 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 18:14:23 +08:00
Captain.B 6c89cc6296 Merge remote-tracking branch 'origin/master' 2021-03-25 18:14:00 +08:00
fit2-zhao d6a0feb4fa fix(接口自动化): 修复jmx导入其他选项不能编辑问题 2021-03-25 18:13:53 +08:00
Captain.B 1879984912 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-25 18:12:14 +08:00
Captain.B 683430ec8d refactor: jmeter 版本升级 2021-03-25 18:11:58 +08:00
fit2-zhao c43a258780 fix(接口自动化): 修复jmx导出消息体数据类型设置错误问题 2021-03-25 17:53:26 +08:00
fit2-zhao f0492e1346 fix(接口自动化): 修改场景报告名称长度 2021-03-25 17:23:30 +08:00
wenyann 8f4870dd84 Merge remote-tracking branch 'origin/master' 2021-03-25 17:02:55 +08:00
wenyann 01799cd937 fix: 修复测试计划无法执行测试用例 2021-03-25 17:02:36 +08:00
Coooder-X b515322331
fix(测试计划): 修复点击测试计划详情时自动发送通知 (#1703) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

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

* fix(测试计划): 修复点击测试计划详情时自动发送通知
 2021-03-25 15:30:25 +08:00
song.tianyang bd351f1c3e Merge remote-tracking branch 'origin/master' 2021-03-25 15:25:03 +08:00
song.tianyang 38f994c3df refactor: 解决性能测试定时任务状态不改变的问题 
解决性能测试定时任务状态不改变的问题
 2021-03-25 15:21:53 +08:00
fit2-zhao 4eac6ed970 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-25 15:13:49 +08:00
fit2-zhao 9f6e19928b fix(接口自动化): 修复测试报告触发方式不展示问题 2021-03-25 15:13:36 +08:00
song.tianyang f721b21924 Merge remote-tracking branch 'origin/master' 2021-03-25 14:45:33 +08:00
song.tianyang 51a172385a refactor: 解决性能测试定时任务状态不改变的问题 
解决性能测试定时任务状态不改变的问题
 2021-03-25 14:45:22 +08:00
fit2-zhao e2d225117e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-25 14:40:51 +08:00
fit2-zhao c538c8366b fix(接口自动化): 修复if条件不起作用问题 2021-03-25 14:40:39 +08:00
chenjianxing ba17d9f93d fix: 执行接口用例，日志报空指针 2021-03-25 14:19:47 +08:00
BugKing 69bbe54d39 fix(测试跟踪): 修改测试用例列表默认字段顺序 2021-03-25 13:57:48 +08:00
wenyann 049a006e97 fix: 接口定义执行结果修改 2021-03-25 12:14:12 +08:00
wenyann 2d6dce1c35 Merge remote-tracking branch 'origin/master' 2021-03-25 11:56:44 +08:00
wenyann f8f04aac5b fix: 邮件内容 2021-03-25 11:55:37 +08:00
Captain.B 4aadacdf98 Merge remote-tracking branch 'origin/master' 2021-03-25 11:20:46 +08:00
Captain.B 21de1ba11f fix(性能测试): 提供文件更新的功能 2021-03-25 11:20:32 +08:00
fit2-zhao 0a0bd2bec2 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-25 10:38:19 +08:00
fit2-zhao c2fab2e142 fix(接口自动化): http请求历史数据名字为空转新版本问题修复 2021-03-25 10:38:06 +08:00
wenyann de857e713a fix: 添加主键 2021-03-25 10:32:02 +08:00
fit2-zhao b1e48675c1 refactor(接口自动化): 优化部分代码 2021-03-25 10:02:57 +08:00
chenjianxing 6a45fe5f57 fix: 页面刷新projectId为空 2021-03-25 09:49:34 +08:00
wenyann 52ef34c78b fix:jenkins通知 2021-03-25 08:41:01 +08:00
wenyann 51948d79a0 Merge remote-tracking branch 'origin/master' 2021-03-25 01:46:29 +08:00
wenyann 6c1daf4620 fix: 初始化自定义表头 2021-03-25 01:45:56 +08:00
Captain.B 0664c5a569 fix(性能测试): 修复从接口自动化创建性能测试没有场景的bug 2021-03-25 00:19:39 +08:00
chenjianxing d03976d8e1 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 21:30:17 +08:00
chenjianxing 519c868418 refactor: 测试用例模块名称长度改为100 2021-03-24 21:30:07 +08:00
song.tianyang 9d134f85a4 Merge remote-tracking branch 'origin/master' 2021-03-24 20:20:49 +08:00
song.tianyang c90ab047bb fix: 修复接口定义-接口列表-文档-仅选中get请求接口-按更新时间从前到后显示，选中某个接口后，焦点不是选中的接口的问题 
修复接口定义-接口列表-文档-仅选中get请求接口-按更新时间从前到后显示，选中某个接口后，焦点不是选中的接口的问题
 2021-03-24 20:18:36 +08:00
fit2-zhao 0948132bae Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 20:11:32 +08:00
fit2-zhao 11a69bd2b0 fix(接口自动化): 去掉脚本成功后缓存 2021-03-24 20:11:18 +08:00
chenjianxing 0fa16caf5a Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 19:57:18 +08:00
Coooder-X 42b894ee97
fix(接口定义: 修复导出metersphere格式的文件再导入，用例重复问题 (#1699) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

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

* fix(接口定义: 修复导出metersphere格式的文件再导入，用例重复问题
 2021-03-24 19:55:14 +08:00
Coooder-X f115f25f87
fix: 测试计划的通过率前端值类型转换 (#1700) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

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

* feat(测试计划): 执行用例或定时任务结束后，自动更新测试计划的状态

* fix: 测试计划的通过率前端值类型转换

Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
 2021-03-24 19:54:14 +08:00
chenjianxing 8cb054df86 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 19:53:19 +08:00
shiziyuan9527 137f727655 refactor(测试跟踪): 补全测试用例历史数据 2021-03-24 19:26:08 +08:00
BugKing 77a550dd3a refactor: 修改版本号 2021-03-24 19:14:54 +08:00
chenjianxing 3e52d67914 fix: 新增编辑用例更新脑图 2021-03-24 17:51:51 +08:00
Coooder-X 5818505b9c
fix(接口定义): 修复接口定义导出swagger错误 (#1697) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

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

* fix(接口定义): 修复接口定义导出swagger错误
 2021-03-24 17:50:35 +08:00
fit2-zhao 5b4740f838 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 17:25:07 +08:00
fit2-zhao 8cf3e3f9ce fix(接口自动化): 修复导出jmx校验问题 2021-03-24 17:25:00 +08:00
song.tianyang 524259dc5e fix: 场景定时任务报告一直running，定时任务不能执行， 定时任务不能发送通知的问题 
场景定时任务报告一直running，定时任务不能执行， 定时任务不能发送通知的问题
 2021-03-24 16:44:11 +08:00
song.tianyang a5672c9ba9 Merge remote-tracking branch 'origin/master' 2021-03-24 16:33:29 +08:00
song.tianyang bec225ff5e fix: 修复打开场景找不到案例时报错的bug 
修复打开场景找不到案例时报错的bug
 2021-03-24 16:30:02 +08:00
shiziyuan9527 bc96579638 fix(测试计划): 修复从列表查看报告只显示了功能测试结果的问题 2021-03-24 16:24:51 +08:00
song.tianyang 2a021c99d1 fix: 定时任务执行测试计划时服务端报错 
定时任务执行测试计划时服务端报错
 2021-03-24 16:04:23 +08:00
song.tianyang bf73aa5e30 fix: 解决文档不现实回收站内的接口信息问题 
解决文档不现实回收站内的接口信息问题
 2021-03-24 15:53:07 +08:00
song.tianyang 1d1fb1bc96 Merge remote-tracking branch 'origin/master' 2021-03-24 15:28:26 +08:00
song.tianyang fc80304168 fix: 创建tcp快捷调试，报500 
创建tcp快捷调试，报500
 2021-03-24 15:28:09 +08:00
Captain.B fadd85334c fix: 修复静态js没有直接访问的bug 2021-03-24 15:13:18 +08:00
song.tianyang 56d4c88fbd fix: 解决编辑场景会报错的问题 
解决编辑场景会报错的问题
 2021-03-24 14:28:57 +08:00
song.tianyang 9ff5446b68 fix: 系统设置-导入用户-模板优化 
系统设置-导入用户-模板优化
 2021-03-24 14:27:32 +08:00
song.tianyang 4067968132 Merge remote-tracking branch 'origin/master' 2021-03-24 13:38:40 +08:00
song.tianyang 1c8afc7f55 fix: 场景性能优化：针对案例进行请求方式查询，如果是ESB的案例，便加载tree结构数据 
场景性能优化：针对案例进行请求方式查询，如果是ESB的案例，便加载tree结构数据
 2021-03-24 13:38:27 +08:00
Captain.B a72fcd71ea Merge remote-tracking branch 'origin/master' 2021-03-24 13:20:47 +08:00
Captain.B b6ec991ce7 refactor(性能测试): 新建和编辑性能测试上传文件逻辑修改 2021-03-24 13:20:32 +08:00
song.tianyang faafaba718 fix: 解决Har文件导入后不能编辑的问题 
解决Har文件导入后不能编辑的问题
 2021-03-24 12:48:46 +08:00
chenjianxing 85320ec7ee Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 10:30:21 +08:00
chenjianxing 0d297aada9 fix: 批量执行接口用例报错 2021-03-24 10:30:11 +08:00
Coooder-X 36e3e001d4
feat(测试计划): 执行用例或定时任务结束后，自动更新测试计划的状态 (#1694) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

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

* feat(测试计划): 执行用例或定时任务结束后，自动更新测试计划的状态
 2021-03-24 10:06:01 +08:00
song.tianyang 47ec0a77da fix: API文档分享链接失效的问题 
API文档分享链接失效的问题
 2021-03-23 21:27:19 +08:00
shiziyuan9527 266fbd008f fix(测试跟踪): 修复首页图表数据错误的问题 2021-03-23 19:44:50 +08:00
shiziyuan9527 cc541f8859 fix(测试跟踪): 首页失败用例未展示接口用例 2021-03-23 18:33:07 +08:00
song.tianyang b2daeb76c2 Merge remote-tracking branch 'origin/master' 2021-03-23 18:26:34 +08:00
song.tianyang 3ae60653ab fix: 更改导入模板解析方式-以tapd为主 
更改导入模板解析方式-以tapd为主 (tapd的报文头sheet和其他sheet相比没有是否必输这一列)
 2021-03-23 18:21:58 +08:00
shiziyuan9527 e0ffb4ad65 fix(测试跟踪): 首页测试计划用例数统计错误 2021-03-23 17:34:04 +08:00
fit2-zhao 774fd1f425 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 17:31:47 +08:00
song.tianyang dc1ef10180 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
 2021-03-23 17:28:07 +08:00
song.tianyang d83df6e1cc feat: ESB接口导入和模板下载 
ESB接口导入和模板下载
 2021-03-23 17:25:20 +08:00
shiziyuan9527 79e11e651a fix(场景自动化): 查看场景时报空指针异常 2021-03-23 17:03:00 +08:00
fit2-zhao c4ae15256b fix(接口自动化): 条件控制器 报告中名字为空问题修复 2021-03-23 17:00:39 +08:00
Captain.B 8c965b2486 refactor: 使用shiro的session过期方式 2021-03-23 15:56:33 +08:00
Captain.B ed39f30328 fix: 修复编辑测试计划没有更新tags的bug 2021-03-23 15:53:05 +08:00
fit2-zhao 00af593531 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 15:07:12 +08:00
fit2-zhao 27f9f34be3 fix(接口定义): 批量执行记录最后执行环境 2021-03-23 15:06:57 +08:00
shiziyuan9527 a072f3992d fix(测试计划): 失败用例统计未包含阻塞用例 2021-03-23 14:39:31 +08:00
fit2-zhao 6761a96f15 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 13:54:22 +08:00
fit2-zhao 1be8ab1cac fix(接口自动化,接口定义): 回收站增加批量恢复功能 2021-03-23 13:54:04 +08:00
shiziyuan9527 39f48e3583 fix(测试跟踪): 修复首页跳转 2021-03-23 11:40:52 +08:00
fit2-zhao 4978b9381f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 11:11:24 +08:00
fit2-zhao 5b87b34071 fix(接口自动化): 解决while循环 超时时间影响后一个请求不执行问题修复 2021-03-23 11:11:08 +08:00
shiziyuan9527 6351bd9f26 fix(测试跟踪): 修复首页数据展示 2021-03-23 10:56:25 +08:00
shiziyuan9527 d8dd87f356 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 10:25:38 +08:00
wenyann 9a7f3cca3b fix:表格错位问题，添加逐条评审 2021-03-23 10:24:46 +08:00
shiziyuan9527 41bf5c6b15 fix(测试跟踪): 修复附件预览失败的问题 2021-03-23 10:24:29 +08:00
wenyann 8bc9bdc6bc Merge remote-tracking branch 'origin/master' 2021-03-23 10:23:53 +08:00
wenyann 56b58ce9cd fix:表格错位问题，添加逐条评审 2021-03-23 10:23:31 +08:00
Captain.B e740efadf2 Merge remote-tracking branch 'origin/master' 2021-03-23 10:13:56 +08:00
chenjianxing f1bcddd0ce Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 10:12:20 +08:00
Captain.B 3c05d1c486 fix: 修复CSRF-TOKEN过期时没有跳转到登录页的问题 2021-03-23 10:12:19 +08:00
chenjianxing 42023ee85a refactor: swagger2.0 增加base-url 2021-03-23 10:12:08 +08:00
Ambitiousliga 9b87e41ec6
fix(测试跟踪):关联用例后增加“责任人”字段，便于识别用例原本的责任人。 (#1684) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-22 21:59:05 +08:00
chenjianxing 352c74d090 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-22 21:57:24 +08:00
chenjianxing b3c6e17cf7 fix: 脑图bug 2021-03-22 21:57:12 +08:00
shiziyuan9527 b2eb55d03f fix(系统设置): 修复测试资源池重名检查 2021-03-22 20:36:47 +08:00
song.tianyang a106b22faf Merge remote-tracking branch 'origin/master' 2021-03-22 19:37:51 +08:00
song.tianyang 55488bed12 fix: 更改后台document路径的处理方法值 
更改后台document路径的处理方法值
 2021-03-22 19:37:40 +08:00
wenyann f2e36b64b8 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-22 19:13:15 +08:00
wenyann 954b58161e fix: 修复jenkins调用测试计划报告不更新问题 2021-03-22 19:10:12 +08:00
song.tianyang 730f52c5e7 Merge remote-tracking branch 'origin/master' 2021-03-22 18:41:16 +08:00
song.tianyang fdc5fcdcb6 Merge remote-tracking branch 'origin/master' 2021-03-22 18:31:58 +08:00
shiziyuan9527 02a8c2a2e5 fix(测试跟踪): 首页跳转 2021-03-22 18:31:47 +08:00
song.tianyang 8e49e466a5 fix: 场景导入esb案例 报文格式问题处理 
场景导入esb案例 报文格式问题处理
 2021-03-22 18:31:37 +08:00
Captain.B 6ee30d97bf fix: 修复XStream安全漏洞 
Closes #1671
 2021-03-22 18:28:20 +08:00
Captain.B a1fd1af3f5 Merge remote-tracking branch 'origin/master' 2021-03-22 18:24:01 +08:00
Captain.B d5a0772237 fix: 修复CSRF-TOKEN过期时没有跳转到登录页的问题 2021-03-22 18:23:45 +08:00
shiziyuan9527 a0d6e056a2 fix(测试跟踪): 修复首页数据不正确 2021-03-22 17:58:52 +08:00
fit2-zhao a2bf684ade Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-22 17:23:47 +08:00
fit2-zhao 1619cf2956 fix(xPack): 报表筛选条件优化 2021-03-22 17:23:42 +08:00
Captain.B de139c134a chore: sync 2021-03-22 17:07:56 +08:00
Captain.B c3368ecc82 Merge remote-tracking branch 'origin/master' 2021-03-22 16:48:14 +08:00
Captain.B 8fe70457a5 refactor(性能测试): 加载已有的文件支持查询 2021-03-22 16:47:53 +08:00
fit2-zhao 0fa3c27123 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-22 16:18:39 +08:00
fit2-zhao 2d8423556c fix(场景自动化): 修复添加自定义请求问题，场景变量查看问题 2021-03-22 16:18:29 +08:00
shiziyuan9527 fa0a57a6af feat(测试计划): 执行用例时显示关联测试 2021-03-22 15:44:00 +08:00
Captain.B bb4f30a9a1 fix(性能测试): 修复计算总线程数没有排除禁用的线程组的bug 2021-03-22 15:32:00 +08:00
Captain.B 2e16938c31 Merge remote-tracking branch 'origin/master' 2021-03-22 15:13:50 +08:00
Captain.B 5ca42da5ce refactor(性能测试): k8s job设置反亲和性 2021-03-22 15:13:26 +08:00
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
shiziyuan9527 d976a739e6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 11:22:32 +08:00
shiziyuan9527 691364a527 feat(测试计划): 场景用例使用独立的执行环境 2021-03-08 11:21:00 +08:00
song.tianyang 9fe06d379a refactor: 去掉workspaceService用不到的引用 
去掉workspaceService用不到的引用
 2021-03-08 10:41:59 +08:00
song.tianyang 3e616a5ebb Merge remote-tracking branch 'origin/master' 2021-03-05 20:40:26 +08:00
song.tianyang aeb3af81fa fix: 登陆验证失效，改过的代码暂时回退 
登陆验证失效，改过的代码暂时回退
 2021-03-05 18:58:26 +08:00
fit2-zhao 60bb8bdf18 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-05 18:30:12 +08:00
fit2-zhao fdc57a84e6 feat(XPack): 完成报表列表功能及筛选功能 2021-03-05 18:14:36 +08:00
song.tianyang 5d6f846420 fix: ApiKeyFilter日志部分增加异常处理 
ApiKeyFilter日志部分增加异常处理
 2021-03-05 18:11:06 +08:00
song.tianyang 2c522657e5 Merge remote-tracking branch 'origin/master' 2021-03-05 17:43:45 +08:00
song.tianyang d5a17f447c fix: 文档分享功能问题-增加过滤路径、日志，修改文档路径生成方式 
文档分享功能问题-增加过滤路径、日志，修改文档路径生成方式
 2021-03-05 17:41:31 +08:00
Coooder-X df906148c2
refactor(性能测试): 保存执行时，运行失败提示完善 (#1572) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* refactor(性能测试): 保存执行时，运行失败提示完善
 2021-03-05 17:32:41 +08:00
Coooder-X 595a594d50
feat(场景步骤、环境配置): 场景变量、环境配置 支持mock参数 (#1566) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* feat(场景步骤、环境配置): 场景变量、环境配置支持mock参数
 2021-03-05 17:31:05 +08:00
Coooder-X dc6240c964
feat(测试跟踪): 测试用例下载模版增加标签列 (#1548) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度
 2021-03-05 17:29:17 +08:00
Coooder-X a5b03d1e12
fix:(测试计划) 测试计划空指针、计划开始时间更新 (#1543) 2021-03-05 17:28:49 +08:00
shiziyuan9527 7a251e2afb Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-05 17:08:00 +08:00
shiziyuan9527 313c6d4eaf feat(测试计划): 批量修改场景用例执行环境 2021-03-05 17:03:12 +08:00
Captain.B d6b73f1305 Merge remote-tracking branch 'origin/master' 2021-03-05 16:43:43 +08:00
Captain.B a281f08422 feat(性能测试): 支持选择线程组 2021-03-05 16:43:21 +08:00
wenyann 63578e4391 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-05 16:25:51 +08:00
wenyann d1fa34c7fc feat: 测试用例改造 2021-03-05 16:24:34 +08:00
Captain.B 53f173305c feat(性能测试): 支持选择线程组 2021-03-05 16:20:15 +08:00
shiziyuan9527 eed41fab06 feat(测试计划): 关联场景用例时保存执行环境 2021-03-05 16:17:18 +08:00
Captain.B 7599c4c5fc feat(性能测试): 支持选择线程组 2021-03-05 15:57:25 +08:00
Captain.B 3a7a37bc19 feat(性能测试): 上传的文件保证顺序 2021-03-05 14:32:52 +08:00
shiziyuan9527 e228a8eb43 refactor(测试计划): 修改场景用例下环境字段类型 2021-03-05 14:21:16 +08:00
Captain.B 540183f5b8 feat(性能测试): request 包名修改 2021-03-05 13:32:53 +08:00
Captain.B 2dd0d94276 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-05 13:29:47 +08:00
Captain.B 4ac88bbdbd feat(性能测试): request 包名修改 2021-03-05 13:29:18 +08:00
Captain.B 329ed8dd77 feat(性能测试): 支持自由组合场景 2021-03-05 13:13:29 +08:00
shiziyuan9527 b49505328f fix(测试用例): 测试用例导出再导入的用例可以重名的问题 2021-03-05 11:03:15 +08:00
song.tianyang 0c6704b742 Merge remote-tracking branch 'origin/master' 2021-03-04 19:21:32 +08:00
song.tianyang 41cb3e0283 feat: 设置模块，系统->用户、组织->成员 新增批量处理功能【添加工作空间】【添加角色】；工作空间->成员 新增批量处理功能【添加角色】 
设置模块，系统->用户、组织->成员 新增批量处理功能【添加工作空间】【添加角色】；工作空间->成员 新增批量处理功能【添加角色】
 2021-03-04 19:21:18 +08:00
shiziyuan9527 aa54248673 feat(测试计划): 批量修改接口用例执行环境 2021-03-04 17:41:30 +08:00
fit2-zhao eb416c3ef1 fix(接口定义): 修复Basic Auth 认证问题 2021-03-04 16:52:09 +08:00
fit2-zhao c8c96d8919 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-03 18:47:42 +08:00
fit2-zhao 032b9e16e1 fix(接口自动化): 修复jmx导入 断言规则处理问题 2021-03-03 17:48:21 +08:00
Captain.B f4dbf03580 Merge branch 'scenario' 2021-03-03 17:35:02 +08:00
Captain.B 4a9ccc2ea5 feat(性能测试): 支持组合场景场景 2021-03-03 17:33:55 +08:00
fit2-zhao ce9d9c8c43 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-03 17:33:27 +08:00
fit2-zhao a30c790a41 fix(接口自动化): 修复导入jmx JSON 提取参数问题 2021-03-03 17:28:05 +08:00
song.tianyang 1df8b0c38a Merge remote-tracking branch 'origin/master' 2021-03-02 18:27:11 +08:00
song.tianyang 1c4d0c9012 feat: 用户excel批量导入功能 
用户excel批量导入功能
 2021-03-02 18:22:22 +08:00
shiziyuan9527 140ce7c211 fix(测试计划): 定时任务触发的接口用例执行失败的问题 2021-03-02 14:06:10 +08:00
fit2-zhao eae9359892 fix(接口自动化): 修复导入jmx数据源问题 2021-03-02 11:26:30 +08:00
wenyann dd96caedd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-01 15:21:32 +08:00
wenyann 1a633fe2ca feat: 改造评审用例，创建评审，评审详情 
fix：修改接口定义更新错误
 2021-03-01 15:21:10 +08:00
fit2-zhao cbd3f6a9b4 fix(接口定义): 重写认证方法 2021-03-01 13:58:18 +08:00
fit2-zhao 4dde080952 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-01 13:13:15 +08:00
fit2-zhao a49eb5a416 fix(接口定义): 新版本auth 完善 2021-03-01 12:11:21 +08:00
shiziyuan9527 532007f25d feat(接口自动化): 场景步骤跨项目添加接口 2021-02-26 18:24:59 +08:00
shiziyuan9527 e15b1624a8 fix(接口自动化): 场景步骤下接口执行问题 2021-02-26 13:38:34 +08:00
shiziyuan9527 2bed7959bb Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
	backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
 2021-02-26 13:30:00 +08:00
shiziyuan9527 025fa9cde0 fix(接口自动化): 场景步骤中接口无法执行的问题 2021-02-26 13:14:56 +08:00
fit2-zhao a3d3fc8366 refactor(接口测试): 重构基本数据格式 2021-02-26 11:32:49 +08:00
fit2-zhao 9b2b7e7f63 fix(接口定义): 修复新功能导致执行问题 2021-02-25 18:25:38 +08:00
song.tianyang 46bff0e294 refactor: 合并 flyway的SQL 
合并 flyway的SQL， v76 v78 v79 文件合并
 2021-02-25 16:49:58 +08:00
song.tianyang 812ea19285 fix: 修改sql 
修改sql
 2021-02-25 15:51:04 +08:00
song.tianyang e385d3b84c Merge remote-tracking branch 'origin/master' 2021-02-25 15:29:48 +08:00
song.tianyang a84edf8cc9 Merge remote-tracking branch 'origin/master' 2021-02-25 15:29:04 +08:00
song.tianyang 56a369b6a6 fix: 修改请求方式显示样式、提升文档页面数据加载的性能 
修改请求方式显示样式、提升文档页面数据加载的性能
 2021-02-25 15:28:41 +08:00
fit2-zhao 35887dff24 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 15:27:26 +08:00
fit2-zhao be78ab5b29 fix(接口自动化，测试跟踪，接口定义): 修复所有高级搜索-标签搜索问题 2021-02-25 15:24:34 +08:00
shiziyuan9527 e4f8018065 Merge branch 'scenario-projects' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/definition/request/ParameterConfig.java
#	backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
#	frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
 2021-02-25 14:48:54 +08:00
shiziyuan9527 c9e4e32fca fix(接口自动化): 跨项目添加场景兼容历史数据 2021-02-25 14:37:08 +08:00
song.tianyang 19508c3254 Merge remote-tracking branch 'origin/master' 2021-02-25 14:00:52 +08:00
chenjianxing 16b146b2a4 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 13:56:21 +08:00
song.tianyang f2644a0afa refactor: 接口定义增加api文档功能-增加创建表sql 
接口定义增加api文档功能-增加创建表sql
 2021-02-25 13:55:23 +08:00
chenjianxing 089a994b01 fix: 测试用例导出全选 2021-02-25 13:47:47 +08:00
song.tianyang 8412735cec Merge remote-tracking branch 'origin/master' 2021-02-25 13:46:42 +08:00
song.tianyang 33468c66cd feat: 接口定义增加api文档功能 
接口定义增加api文档功能
 2021-02-25 13:46:01 +08:00
Captain.B c91cf585fa refactor(性能测试): 手动停止测试发送通知修改 2021-02-25 13:32:41 +08:00
Captain.B 198bb154c4 refactor(性能测试): 手动停止测试发送通知修改 2021-02-25 13:27:47 +08:00
Captain.B 26d67b166b Merge remote-tracking branch 'origin/master' 2021-02-25 11:34:02 +08:00
Captain.B 9cd635dcb2 refactor(性能测试): 资源池增加配置gc和heap的选项 2021-02-25 11:33:30 +08:00
Captain.B 072792eb8b refactor(性能测试): 资源池增加配置gc和heap的选项 2021-02-25 11:32:58 +08:00
chenjianxing 13f5488e9c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 11:27:45 +08:00
chenjianxing 3c8815f400 fix: 测试计划页面空指针 2021-02-25 11:27:36 +08:00
shiziyuan9527 6417a131b0 fix(接口自动化): 跨项目添加场景 2021-02-25 11:22:01 +08:00
Captain.B e2c0bedb8d Merge remote-tracking branch 'origin/master' 2021-02-25 10:12:35 +08:00
Captain.B 05261720d3 refactor(性能测试): 增加gc配置 2021-02-25 10:12:08 +08:00
Captain.B 7b17664d92 refactor(性能测试): 增加gc配置 2021-02-25 10:11:49 +08:00
wenyann fc43d9967f Merge remote-tracking branch 'origin/master' 2021-02-24 18:38:39 +08:00
wenyann 3fc69227ff fix: 设置接口URL不可重复，重复导入时接口用例重复生成,部分提取 2021-02-24 18:37:59 +08:00
fit2-zhao 10417ce699 refactor(接口自动化): 规范化代码 2021-02-24 18:29:42 +08:00
fit2-zhao 79780c8bac fix(场景自动化): 修复引用场景请求头未生效问题 2021-02-24 18:12:20 +08:00
fit2-zhao 2b9a239d6c fix(接口自动化): 导出jmx 部分问题修复 2021-02-24 17:16:01 +08:00
shiziyuan9527 ef08532187 feat(接口自动化): 跨项目添加场景 2021-02-24 16:29:22 +08:00
Captain.B 80234b3b91 refactor(性能测试): 去掉setupThreadGroup 2021-02-24 16:08:57 +08:00
chenjianxing 5562999f07 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 20:41:06 +08:00
chenjianxing b312f8d333 fix: 请求json转换异常 2021-02-23 20:40:41 +08:00
Captain.B ec426fcc1e refactor(性能测试): 变量名修改 2021-02-23 19:04:09 +08:00
Captain.B dc0adf3d8b refactor(性能测试): 去掉teardown线程组，使用日志信息判断结束 2021-02-23 19:02:09 +08:00
shiziyuan9527 0a997065dd feat(接口自动化): 跨项目添加场景步骤 2021-02-23 18:06:12 +08:00
Captain.B 396be1dd6b Merge remote-tracking branch 'origin/master' 2021-02-23 17:28:11 +08:00
Captain.B 6f7edddb03 fix(性能测试): 启动jmeter之前检查站点配置是否可用 2021-02-23 17:27:36 +08:00
chenjianxing ebfcc56a3d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 17:10:39 +08:00
chenjianxing 1edc8f1644 refactor: 自定义表头支持拖拽 2021-02-23 17:10:24 +08:00
fit2-zhao 236781a575 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 17:02:58 +08:00
fit2-zhao 80e5b4935d feat(接口自动化): 导入jmx 添加HTTP 请求头处理 2021-02-23 17:02:49 +08:00
Captain.B 9e5ca27be0 chore: sync 2021-02-23 14:51:14 +08:00
fit2-zhao 22855ba8cb fix(接口定义):规范jmx导入方法 2021-02-23 14:27:23 +08:00
Captain.B abc533eac3 chore: sync 2021-02-23 13:03:17 +08:00
fit2-zhao 4d810c3d5d fix(接口定义): 修复执行报错问题 2021-02-23 11:29:15 +08:00