test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,546 Commits 40 Branches 170 Tags 410 MiB
Commit Graph

2782 Commits

Author SHA1 Message Date
song.tianyang d5e7d57760 fix: 测试计划开启定时任务，接口用例的执行时间没自动更新、报告点不开 
修复测试计划开启定时任务，接口用例的执行时间没自动更新、报告点不开的问题
 2021-01-28 16:38:41 +08:00
fit2-zhao 26a1acec56 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 16:17:56 +08:00
fit2-zhao cd33380763 fix(场景自动化): 修复认证问题 2021-01-28 16:17:14 +08:00
Captain.B 0b3b3f7d72 Merge branch 'v1.7' 2021-01-28 15:04:23 +08:00
fit2-zhao 98f3391c75 refactor(接口自动化): 部分代码优化 2021-01-28 14:50:34 +08:00
fit2-zhao 8c8f2850c2 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 14:39:05 +08:00
fit2-zhao 1777735325 fix(接口自动化): 优化报告显示问题 2021-01-28 14:38:40 +08:00
Captain.B 65446c1bb6 Merge branch 'master' into v1.7 2021-01-28 14:36:53 +08:00
Captain.B 05f543cb51 fix: 修复登录后系统参数配置-显示设置和认证设置不显示 2021-01-28 14:23:47 +08:00
wenyann 4102e2e667 Merge remote-tracking branch 'origin/master' 2021-01-28 14:07:19 +08:00
wenyann b9d4b94435 feat: 测试计划收不到邮件 2021-01-28 14:05:58 +08:00
song.tianyang 2f637979e4 fix: 修复场景删除后没有停到定时任务的问题 
修复场景删除后没有停到定时任务的问题
 2021-01-28 13:22:00 +08:00
wenyann 95ac318ee9 Merge remote-tracking branch 'origin/master' 2021-01-28 11:20:02 +08:00
wenyann 38df4313a9 feat: 添加发送邮件日志，空指针异常 2021-01-28 11:18:40 +08:00
shiziyuan9527 012b5d64a7 fix(测试计划): 场景用例显示标签、ID，修改搜索提示 2021-01-28 10:46:08 +08:00
chenjianxing 7a4f33f743 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 10:25:43 +08:00
chenjianxing 7cba18ec27 fix: 提取错误日志出现在断言里 2021-01-28 10:05:05 +08:00
fit2-zhao 19fe757774 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 19:55:34 +08:00
wenyann 6bdc3a7c21 feat: 修改字符长度 2021-01-27 18:54:23 +08:00
fit2-zhao 5e6aea31ce fix(接口自动化): 数据迁移问题修复 2021-01-27 18:20:03 +08:00
fit2-zhao e0da5d4dc6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 18:04:49 +08:00
fit2-zhao 2cde4124fa fix(接口自动化): 修复遮罩层问题 2021-01-27 18:04:06 +08:00
Captain.B d769c13a8b refactor: CAS登录使用id查询数据库 2021-01-27 17:34:53 +08:00
fit2-zhao ff530b7c8f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 16:56:39 +08:00
fit2-zhao 0b9578ed5c fix(接口自动化): 重新计算报告执行总时间 2021-01-27 16:56:29 +08:00
Captain.B 4284d29ecf Merge remote-tracking branch 'origin/master' 2021-01-27 16:54:48 +08:00
Captain.B 80b3782623 fix: 修复CAS登录报错的问题 2021-01-27 16:54:20 +08:00
song.tianyang 0011112f8b Merge remote-tracking branch 'origin/master' 2021-01-27 16:53:34 +08:00
song.tianyang 8fcaf73890 fix: 测试计划-执行场景案例后更新执行时间 
测试计划-执行场景案例后更新执行时间
 2021-01-27 16:53:03 +08:00
wenyann 97a99f8006 Merge remote-tracking branch 'origin/master' 2021-01-27 16:51:12 +08:00
wenyann db1f99dda8 feat: 增量合并重复问题 2021-01-27 16:50:41 +08:00
shiziyuan9527 ae909070a2 refactor: 统一搜索提示文本 2021-01-27 16:00:18 +08:00
song.tianyang 9e5e2edb12 Merge remote-tracking branch 'origin/master' 2021-01-27 15:50:21 +08:00
song.tianyang 65b4ee425d fix: 接口测试-测试报告-删除大量数据报告失败 
接口测试-测试报告-删除大量数据报告失败
 2021-01-27 15:49:48 +08:00
shiziyuan9527 7eec10e634 refactor(测试计划): 功能用例显示标签列 2021-01-27 15:38:12 +08:00
song.tianyang 77fcc6907d fix: 测试计划-接口测试用例-手动单个执行用例后执行时间未更新 
修复测试计划-接口测试用例-手动单个执行用例后执行时间未更新试的问题
 2021-01-27 15:34:15 +08:00
song.tianyang e95632b94a fix: 测试计划-开启定时执行任务疑似未执行 
修复测试计划-开启定时执行任务未执行的问题 ： 性能测试在定时任务执行完成后进行报告ID的更新、修复了没有情景案例的情况下不执行性能测试的问题
 2021-01-27 15:16:33 +08:00
BugKing 3941e2170a refactor: 修改版本号 2021-01-27 14:55:06 +08:00
fit2-zhao a22456b038 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 14:43:18 +08:00
fit2-zhao 1d50e1a910 fix(场景自动化): 自定义请求修复 2021-01-27 14:41:36 +08:00
song.tianyang 99ec66a255 Merge remote-tracking branch 'origin/master' 2021-01-27 14:34:37 +08:00
song.tianyang 1f011e7ccc fix: 接口用例创建的性能测试，Label显示uuid 
修复接口用例创建的性能测试，Label显示uuid的问题
 2021-01-27 14:33:16 +08:00
Captain.B 866db48255 refactor: 修改配置oidc认证源的参数 2021-01-27 13:40:40 +08:00
Captain.B 15f4489cf2 fix: 修复 Missing URI template variable 'a' for method parameter of type String 2021-01-27 13:10:57 +08:00
Captain.B 77a1235ff6 Merge remote-tracking branch 'origin/master' 2021-01-27 12:51:02 +08:00
Captain.B af69dfe7ba fix: 修复改变认证源状态报错的问题 2021-01-27 12:49:48 +08:00
song.tianyang 33e05223e9 Merge remote-tracking branch 'origin/master' 2021-01-27 12:49:26 +08:00
song.tianyang 5fe21e9a71 fix: 测试计划定时任务关闭异常 
解决测试计划定时任务关闭异常的问题
 2021-01-27 12:48:55 +08:00
fit2-zhao d6b2336d35 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 11:35:10 +08:00
fit2-zhao c820538f9f fix(场景自动化): 场景变量设置 2021-01-27 11:34:49 +08:00
chenjianxing 7f207e72b6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 11:33:47 +08:00
song.tianyang f9eae8c6dd Merge remote-tracking branch 'origin/master' 2021-01-27 11:21:17 +08:00
song.tianyang 1a57e651eb fix: 测试计划-性能测试，运行时更新表格中的报告ID 
测试计划-性能测试，运行时更新表格中的报告ID
 2021-01-27 11:20:57 +08:00
chenjianxing 4367ef3291 fix: 不同项目下测试计划名称冲突问题 2021-01-27 10:56:10 +08:00
Captain.B 8c7f60b88d Merge remote-tracking branch 'origin/master' 2021-01-27 09:40:18 +08:00
Captain.B 25abe21823 refactor: 修改下载zip的接口，去掉threadnum 2021-01-27 09:39:41 +08:00
song.tianyang b536fff9bf fix: 接口定义全选操作跨协议 
解决接口定义全选操作跨协议的问题
 2021-01-26 23:54:15 +08:00
song.tianyang f21574c2e7 fix: 测试跟踪-报告-查看报告详情，导出报告卡死 
解决测试跟踪-报告-查看报告详情，导出报告卡死的问题
 2021-01-26 23:09:40 +08:00
chenjianxing 55ed001b16 fix: tcp脚本为空，不传脚本 2021-01-26 20:50:47 +08:00
song.tianyang 0e2ee19237 Merge remote-tracking branch 'origin/master' 2021-01-26 20:22:04 +08:00
song.tianyang 2b5857886e fix: 解决手动保存日志时保存数据缺失的问题，同时针对报告页面增加跳转功能 
解决手动保存日志时保存数据缺失的问题，同时针对报告页面增加跳转功能
 2021-01-26 20:21:19 +08:00
fit2-zhao 0e7f91acd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 19:49:38 +08:00
fit2-zhao 421c4263b7 fix(场景自动化): 修复sql 执行结果类型错误 2021-01-26 19:49:14 +08:00
Captain.B 2ff8b766e5 fix: 修复删除job的代码 2021-01-26 19:42:39 +08:00
Captain.B 12ba2b0594 Merge remote-tracking branch 'origin/master' 2021-01-26 18:54:24 +08:00
Captain.B ffbd3a3ec8 fix: 修复多线程组设置线程数不正确的bug 2021-01-26 18:53:00 +08:00
fit2-zhao dcd30a1fb7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 18:30:02 +08:00
fit2-zhao 1c5249485d fix(场景自动化): 引用请求只允许查看，不能编辑 2021-01-26 18:29:38 +08:00
chenjianxing b5b5d3aa54 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 18:03:17 +08:00
chenjianxing 33a397b65e fix: 替换Pair 2021-01-26 18:02:48 +08:00
wenyann ff0d8665f6 Merge remote-tracking branch 'origin/master' 2021-01-26 17:39:43 +08:00
wenyann 2ed98cb3fe feat: 测试计划查询接口修改 2021-01-26 17:39:09 +08:00
chenjianxing 16a2450953 fix: 修复pr冲突 2021-01-26 17:34:54 +08:00
Coooder-X 49a5053b38
fix: (测试资源池) 仅当IP和端口同时重复时，提示添加失败 (#1264) 
* fix: （测试资源池）增加资源池中端口重复判断

* fix: (测试资源池) 仅当IP和端口同时重复时，提示添加失败

Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
 2021-01-26 17:28:12 +08:00
Coooder-X 6f93e09f47
feat: (接口定义、接口自动化) 删除模块时，模块下的所有接口或场景被放入回收站 (#1268) 2021-01-26 17:21:21 +08:00
fit2-zhao 27f5264a88 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 17:20:21 +08:00
fit2-zhao e967cb0539 fix(场景自动化): 数据迁移后附件丢失问题修复 2021-01-26 17:19:57 +08:00
chenjianxing 3426a49c8c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 17:18:20 +08:00
Captain.B 2b6c627e14 Merge remote-tracking branch 'origin/master' 2021-01-26 17:17:54 +08:00
chenjianxing 8961ba6c98 fix: 切换协议，添加相同节点报错 2021-01-26 17:17:52 +08:00
Captain.B 8793acd0b6 fix: 性能测试jmx默认参数去掉 concurrentDwn 和 image_parser 2021-01-26 17:17:08 +08:00
Captain.B e00e07fb30 fix: sso logout 和 sso placeholder 提示 2021-01-26 16:44:00 +08:00
wenyann 1b92d96de7 feat: 添加模版示例，增加接口测试报告路径 2021-01-26 16:06:04 +08:00
wenyann 48b0adc065 Merge remote-tracking branch 'origin/master' 2021-01-26 16:05:42 +08:00
wenyann 2ec320b519 feat: 添加模版示例，增加接口测试报告路径 2021-01-26 16:05:08 +08:00
fit2-zhao 614acd2ed3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 15:02:11 +08:00
fit2-zhao c4aa6da474 fix(场景自动化): 修复迁移数据场景禁用问题 2021-01-26 15:01:48 +08:00
song.tianyang eb74637d82 refactor: 测试计划日志表增加字段 
测试计划日志表增加字段
 2021-01-26 14:17:28 +08:00
Captain.B ab08bb0a6f fix: sso 登录失败报错提示 2021-01-26 13:46:57 +08:00
fit2-zhao 431de613b2 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 13:35:19 +08:00
fit2-zhao 6fd4be7e68 fix(接口自动化): 修复旧数据迁移问题 2021-01-26 13:34:54 +08:00
Captain.B 4e63e0ebe4 fix: sso 登录失败报错提示 2021-01-26 13:29:07 +08:00
Coooder-X 827dac097a
fix: （测试资源池）增加资源池中端口重复判断 (#1260) 2021-01-26 13:07:26 +08:00
chenjianxing cffe0f8b3a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 13:03:06 +08:00
chenjianxing 74124839aa feat: 用例列表支持全选 2021-01-26 13:02:42 +08:00
fit2-zhao 96431f0899 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 11:41:07 +08:00
fit2-zhao 46737136d9 fix(接口自动化): 修复DELETE参数丢失问题 2021-01-26 11:40:44 +08:00
wenyann 80369f0758 feat: swagger定时同步 2021-01-26 10:31:00 +08:00
wenyann b3808d8c90 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
 2021-01-26 10:27:57 +08:00
wenyann 88280b61aa feat: swagger定时同步 2021-01-26 10:17:19 +08:00
wenyann 00ef6a7c76 feat: swagger定时修改 2021-01-26 10:16:35 +08:00
fit2-zhao cf013c1e84 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 18:45:54 +08:00
fit2-zhao b0ee42f9e4 fix(接口自动化): 修复部分缺陷 2021-01-25 18:44:18 +08:00
shiziyuan9527 9990aa90b9 fix(测试跟踪): 修复最近测试计划查询问题 2021-01-25 18:37:56 +08:00
fit2-zhao 7737ee160a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 18:05:11 +08:00
fit2-zhao fb0af088c5 fix(接口自动化): 场景数据迁移问题修改 2021-01-25 18:04:08 +08:00
shiziyuan9527 75552fd896 fix(测试计划): 执行性能测试用例状态更新 2021-01-25 18:02:47 +08:00
Captain.B baeab081a6 Merge remote-tracking branch 'origin/master' 2021-01-25 17:50:03 +08:00
Captain.B 75030f1695 refactor: 场景页面表头优化 2021-01-25 17:49:20 +08:00
shiziyuan9527 b0ff13917c fix(测试计划): 修复测试计划进度条不准确 2021-01-25 17:09:32 +08:00
shiziyuan9527 dc96a9affa fix(测试计划): 修复测试计划状态不准确 2021-01-25 16:50:36 +08:00
chenjianxing 28fa069390 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 16:39:56 +08:00
chenjianxing e11b1314bf fix: 接口导入添加body请求头 2021-01-25 16:39:48 +08:00
shiziyuan9527 4c2002f8ff fix(测试计划): 修复测试计划状态不准确 2021-01-25 16:36:08 +08:00
fit2-zhao 57967ab6b0 fix(接口自动化): 列表参数问题修复 2021-01-25 15:55:37 +08:00
song.tianyang a71f75967d Merge remote-tracking branch 'origin/master' 2021-01-25 13:58:39 +08:00
song.tianyang a0bce7cda3 fix: 测试计划报告菜单批量删除功能的缺失 
解决测试计划报告菜单批量删除功能的缺失的问题
 2021-01-25 13:58:15 +08:00
fit2-zhao 3ac8b83d54 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 13:50:21 +08:00
fit2-zhao 33cd6b37e8 feat(接口自动化): 循环控制器 结果处理 2021-01-25 13:49:59 +08:00
Captain.B 829f912d8f fix(xPack): 修改substring的使用 2021-01-25 12:51:03 +08:00
shiziyuan9527 e005e39326 fix(测试计划): 修复性能测试按照状态筛选不生效的问题 2021-01-25 10:59:26 +08:00
chenjianxing 058c3b3dd4 refactor: pr代码优化 2021-01-25 10:10:21 +08:00
Captain.B 493e766719 refactor: 单点登录cas提取hidden变量 2021-01-23 13:48:41 +08:00
Captain.B e60f71387b refactor: 修改配置cas的地址 2021-01-23 12:12:12 +08:00
BugKing ed3ca35749
Merge pull request #142 from metersphere/dependabot/maven/backend/org.apache.zookeeper-zookeeper-3.4.14 
chore(deps): bump zookeeper from 3.4.13 to 3.4.14 in /backend
 2021-01-22 22:20:58 +08:00
fit2-zhao e69791a15a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 20:15:33 +08:00
fit2-zhao d6c5d56d55 feat(接口自动化): 循环控制器 结果处理 2021-01-22 20:14:15 +08:00
Captain.B 2013e784f9 Merge remote-tracking branch 'origin/master' 2021-01-22 19:40:00 +08:00
Captain.B c71b1d49f3 refactor(xPack): 接入oidc单点登录 2021-01-22 19:28:34 +08:00
song.tianyang e6d2e1bf4d feat: 测试计划定时任务报告增加状态字段 
测试计划定时任务报告增加状态字段
 2021-01-22 19:06:30 +08:00
fit2-zhao 66473ae258 fix(接口自动化): 修复数据迁移问题 2021-01-22 19:00:36 +08:00
Joker bb952bd430
fix swagger2.0 NullPointException (#1196) 
* fix swagger2.0同步时存在$ref参数而dto不存在的情况

* 删除多余代码

* 修复编辑HTTP配置域名为空是，数据库config拼接的json串中domain没有更新为空的情况

* 语法调整

Co-authored-by: fengkaijun <fengkaijun@yingzi.com>
 2021-01-22 18:17:19 +08:00
fit2-zhao 5340a37cb1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:12:25 +08:00
fit2-zhao 4e38c73ac5 fix(接口自动化): 修复部分缺陷 2021-01-22 18:12:05 +08:00
Dream95 fed842e442
bugfix 修复'[]'格式json解析错误问题 (#1242) 
https://github.com/metersphere/metersphere/issues/1144

Co-authored-by: zhouyx <zhouyx1@guahao.com>
 2021-01-22 18:11:38 +08:00
chenjianxing 764ee6507e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:06:50 +08:00
chenjianxing 5f8ecf76cf fix: swagger2.0导入body为空 2021-01-22 18:06:18 +08:00
wenyann 2cdf1e6730 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
 2021-01-22 17:07:43 +08:00
wenyann 3048d8b52d feat: swagger定时同步 2021-01-22 17:06:03 +08:00
wenyann 8e1f189ce9 feat: swagger定时修改 2021-01-22 17:01:41 +08:00
chenjianxing 4144a35a26 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 16:32:24 +08:00
chenjianxing 6243e3a410 feat: 用例编辑支持上一条下一条 2021-01-22 16:30:49 +08:00
song.tianyang 14b21ca544 feat: 接口测试首页-运行中的定时任务增加字段 
接口测试首页-运行中的定时任务增加字段
 2021-01-22 15:21:37 +08:00
fit2-zhao 38169542e2 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 12:57:27 +08:00
fit2-zhao 1157a1c422 fix(场景自动化): 修复场景描述不能编辑问题，修复CSV 预览问题 2021-01-22 12:55:07 +08:00
Captain.B 649872c634 refactor(xPack): 验证k8s账号修改 2021-01-22 11:41:59 +08:00
chenjianxing ccd7d08ef5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 19:45:25 +08:00
chenjianxing 27603bbf90 feat: 场景列表批量移动 2021-01-21 19:45:12 +08:00
fit2-zhao c8d0470ed1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 19:02:18 +08:00
fit2-zhao cf9b64f16d fix(接口定义): 高级搜索问题修复 2021-01-21 19:01:59 +08:00