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

4094 Commits

Author SHA1 Message Date
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 d250f6c49d fix(接口自动化): 加载环境配置 2021-03-08 16:27:23 +08:00
song.tianyang d591bca29c Merge remote-tracking branch 'origin/master' 2021-03-08 14:49:28 +08:00
song.tianyang 9ac38f6035 fix: 修复无xpack版源码运行，文档模块会报错的问题 
修复无xpack版源码运行，文档模块会报错的问题
 2021-03-08 14:46:32 +08:00
shiziyuan9527 b22f2a5ed7 feat(接口自动化): 批量修改场景执行环境 2021-03-08 14:21:55 +08:00
fit2-zhao 78b30352af fix(接口自动化): 修复添加断言规则，会多出一个响应时间断言栏 2021-03-08 14:20:29 +08:00
Captain.B d634f9d540 fix(性能测试): 修复导入资源文件没有上传的bug 2021-03-08 13:14:13 +08:00
Captain.B 9aed5a57a9 fix(性能测试): 修复创建测试时方法名字修改的bug 2021-03-08 10:10:39 +08:00
fit2-zhao 60bb8bdf18 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-05 18:30:12 +08:00
fit2-zhao fc610db2ca feat(XPack): 完成报表列表功能及筛选功能 2021-03-05 17:47:49 +08:00
Captain.B 6940a2eb02 Merge remote-tracking branch 'origin/master' 2021-03-05 17:44:16 +08:00
Captain.B 0bd3d0355b Merge remote-tracking branch 'origin/master' 2021-03-05 17:43:48 +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 fef08d19aa
fix(定时任务): 修复 开启-关闭定时任务提示窗错误 (#1578) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* fix(定时任务): 修复 开启-关闭定时任务提示窗错误
 2021-03-05 17:33:10 +08:00
Ambitiousliga a687ccce8e
fix(接口定义)：修复删除CASE时没有“确认删除”弹窗 (#1571) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-05 17:32:11 +08:00
Coooder-X 2cb7aa6256
fix: 场景用例步骤复制时候插入在当前步骤下面 (#1570) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* feat(场景步骤、环境配置): 场景变量、环境配置支持mock参数

* fix: 场景用例步骤复制时候插入在当前步骤下面
 2021-03-05 17:31:52 +08:00
Coooder-X 595a594d50
feat(场景步骤、环境配置): 场景变量、环境配置 支持mock参数 (#1566) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

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

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

* fix(环境配置): 解决 通用配置-变量名在屏幕缩小时无法显示
 2021-03-05 17:30:01 +08:00
Coooder-X dc6240c964
feat(测试跟踪): 测试用例下载模版增加标签列 (#1548) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度
 2021-03-05 17:29:17 +08:00
Coooder-X 58d4c226b8
feat: (场景步骤) 请求参数增加复选框实现一键全选和反选 (#1529) 2021-03-05 17:28:14 +08:00
Captain.B 5595110c1c feat(性能测试): 修复报告显示线程组重复的bug 2021-03-05 17:24:12 +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
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
Captain.B 2dd0d94276 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-05 13:29:47 +08:00
Captain.B 329ed8dd77 feat(性能测试): 支持自由组合场景 2021-03-05 13:13:29 +08:00
fit2-zhao 2076159918 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-04 19:59:15 +08:00
fit2-zhao 5c5fc5546b feat(XPack): 完成报表的charts 加载 2021-03-04 19:55:56 +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 be55b34bfd fix(接口自动化): If控制器可增加导入场景权限 2021-03-04 17:29:28 +08:00
shiziyuan9527 c8ef224935 fix(接口自动化): 初始化时未加载环境配置 2021-03-04 10:40:04 +08:00
fit2-zhao 18d6322636 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-04 10:29:55 +08:00
fit2-zhao 70f71b2e70 feat(XPack): i18n 统一提交 2021-03-04 10:29:41 +08:00
shiziyuan9527 d18c1aa9ed fix(接口自动化): 环境配置列表显示不准确的问题 2021-03-03 21:19:17 +08:00
fit2-zhao c8c96d8919 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-03 18:47:42 +08:00
fit2-zhao d40fe759a9 feat(XPack): 路由配置 2021-03-03 18:47:09 +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 4aac690fc8 feat(XPack): 报表分析，前端页面完成 2021-03-03 17:33:22 +08:00
fit2-zhao 445df3a281 fix(接口自动化): i18n合并 2021-03-03 17:28:57 +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 bab80c4ef2 refactor(场景自动化): 调整环境配置样式 2021-03-02 18:01:09 +08:00
shiziyuan9527 739d194854 fix(测试计划): 拼写导致的控制台报错 2021-03-02 14:10:29 +08:00
wenyann 8690b9afd8 feat: 创建评审加执行按钮 2021-03-02 12:52:21 +08:00
wenyann 5114672358 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-02 11:01:39 +08:00
wenyann e06d5bfaf6 fix: 保存上次选中字段，平级拖动 2021-03-02 10:58:25 +08:00
shiziyuan9527 957c186b32 fix(接口自动化): 关闭环境编辑页面环境列表未刷新的问题 2021-03-01 16:45:15 +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
shiziyuan9527 3b2fe5ddb3 fix(接口自动化): 环境配置渲染顺序不固定的问题 2021-03-01 14:59:50 +08:00
shiziyuan9527 b7ddf4194a Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/api/definition/components/Run.vue
 2021-03-01 10:27:46 +08:00
shiziyuan9527 532007f25d feat(接口自动化): 场景步骤跨项目添加接口 2021-02-26 18:24:59 +08:00
fit2-zhao d961a96081 fix(接口自动化): 修复循环下添加自定义请求问题 2021-02-26 18:15:04 +08:00
fit2-zhao 5735efc372 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-26 17:16:28 +08:00
fit2-zhao ab56e2f7be fix(接口定义): 断言脚本规则 增加 python 推荐脚本 2021-02-26 17:15:08 +08:00
shiziyuan9527 b5d7140aa8 refactor: 去掉冗余代码 2021-02-26 14:38:54 +08:00
fit2-zhao 10861c56df fix(接口定义): 模块树，检索大小写问题优化 2021-02-26 14:19:23 +08:00
shiziyuan9527 df73916d7d fix(接口自动化): 场景步骤循环控制器无法执行的问题 2021-02-26 14:18:07 +08:00
fit2-zhao 7e4c7303c4 fix(接口定义): 修复调试缺陷 2021-02-26 14:06:13 +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 c3466d5ca7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-26 11:34:27 +08:00
fit2-zhao a3d3fc8366 refactor(接口测试): 重构基本数据格式 2021-02-26 11:32:49 +08:00
shiziyuan9527 34fc7e8cf6 fix(接口自动化): 场景步骤所属项目显示慢的问题 2021-02-26 10:40:08 +08:00
fit2-zhao 8ae4743d42 fix(测试跟踪，接口测试): 添加了非被动事件侦听器解决控制台一堆警告问题 2021-02-26 10:22:05 +08:00
fit2-zhao 6b47ed7470 fix(接口自动化): 修复新功能导致执行问题 2021-02-25 18:44:33 +08:00
fit2-zhao 9b2b7e7f63 fix(接口定义): 修复新功能导致执行问题 2021-02-25 18:25:38 +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 dc8a850db8 fix(接口自动化): 修复调试时环境判断 2021-02-25 15:04:20 +08:00
shiziyuan9527 d2b183256f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 14:49:35 +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
Captain.B 8db2582f21 chore: sync 2021-02-25 14:48:36 +08:00
shiziyuan9527 c9e4e32fca fix(接口自动化): 跨项目添加场景兼容历史数据 2021-02-25 14:37:08 +08:00
chenjianxing 16b146b2a4 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 13:56:21 +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 072792eb8b refactor(性能测试): 资源池增加配置gc和heap的选项 2021-02-25 11:32:58 +08:00
shiziyuan9527 6417a131b0 fix(接口自动化): 跨项目添加场景 2021-02-25 11:22:01 +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
shiziyuan9527 ef08532187 feat(接口自动化): 跨项目添加场景 2021-02-24 16:29:22 +08:00
fit2-zhao eb16cead2e style(接口定义): 接口定义用例创建时间和更新时间样式间距调整 2021-02-24 14:03:00 +08:00
fit2-zhao aa6bf4cb6e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-24 11:04:39 +08:00
fit2-zhao 56a38525e4 fix(接口自动化): 权限控制 2021-02-24 11:04:21 +08:00
wenyann 1f2ffba0d4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-02-24 10:36:19 +08:00
wenyann 96ddd80f11 feat: 接口定义列表操作列增加执行图标 2021-02-24 10:31:06 +08:00
fit2-zhao 0355634492 style(测试跟踪，接口测试): 所有TAG标签显示样式优化 2021-02-24 10:13:09 +08:00
shiziyuan9527 0a997065dd feat(接口自动化): 跨项目添加场景步骤 2021-02-23 18:06:12 +08:00
wenyann 83f8d4f5c1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 17:20:58 +08:00
wenyann b8387ac3cf feat: 接口定义列表添加执行 2021-02-23 17:20:45 +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 80e5b4935d feat(接口自动化): 导入jmx 添加HTTP 请求头处理 2021-02-23 17:02:49 +08:00
fit2-zhao 22855ba8cb fix(接口定义):规范jmx导入方法 2021-02-23 14:27:23 +08:00
wenyann 7e51a7eb61 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 14:11:37 +08:00
wenyann 24007f71a8 fix: 明文显示收件人 2021-02-23 14:11:24 +08:00
fit2-zhao 4d810c3d5d fix(接口定义): 修复执行报错问题 2021-02-23 11:29:15 +08:00
fit2-zhao 6b931b9777 fix(接口定义): 修复dubbo类型错误问题 2021-02-23 11:01:13 +08:00
fit2-zhao 1bc15856cc style(接口自动化): 优化单个步骤执行结果信息显示，支持可复制 2021-02-23 10:16:51 +08:00
fit2-zhao 8771e82ba1 fix(接口自动化): 修复场景变量 header 输入提示功能，修复报告显示顺序问题 2021-02-22 18:05:17 +08:00
fit2-zhao a983c8a4da Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-22 16:38:49 +08:00
fit2-zhao 42a9c3b1de feat(接口自动化): 完成 jmx 导出功能 2021-02-22 16:32:44 +08:00
shiziyuan9527 354892fd9c refactor(场景自动化): 场景步骤显示所属项目名 2021-02-22 16:01:39 +08:00
shiziyuan9527 5f0821174a refactor: 测试元素实体类增加项目ID属性 2021-02-22 14:51:05 +08:00
chenjianxing 2a7ccf7b24 refactor: 统一接口定义和场景导出 2021-02-22 13:57:40 +08:00
Captain.B 192b8ed757 feat: K8S 资源池支持nodeSelector 2021-02-22 12:41:46 +08:00
fit2-zhao 188cdbf6e3 fix(接口自动化): 修复场景无法导入问题 2021-02-20 18:26:06 +08:00
fit2-zhao e6e71a0f1e feat(接口自动化): 完成导出jmx功能 2021-02-20 18:25:39 +08:00
fit2-zhao e831eb5f3d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-20 14:33:25 +08:00
fit2-zhao dff4904efb style(接口自动化): DUBBO协议接口 显示样式修改 2021-02-20 14:32:45 +08:00
chenjianxing 29b87fd76d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-20 14:12:39 +08:00
chenjianxing 3e623dd0ad fix: 场景导出代码冲突 2021-02-20 14:10:06 +08:00
song.tianyang 8fd91be7b1 fix: 解决文档右侧列表排序变动时产生的错序问题 
解决文档右侧列表排序变动时产生的错序问题
 2021-02-20 14:06:09 +08:00
chenjianxing ce7600bad4 fix: 解决冲突 2021-02-20 13:44:18 +08:00
chenjianxing 500fe60fec feat: 场景导入-MS格式 2021-02-20 11:57:31 +08:00
fit2-zhao 35d87006e0 fix(接口自动化): 注释一部分重复代码 2021-02-20 11:56:18 +08:00
fit2-zhao 1270eb8b29 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
 2021-02-20 11:53:04 +08:00
fit2-zhao b0486b6faf Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
 2021-02-20 11:52:23 +08:00
fit2-zhao 63b8801aa9 feat(接口自动化): 完善jmx导入功能，增加jmeter相关Sampler依赖jar包 2021-02-20 11:20:58 +08:00
song.tianyang 1f6736cad0 Merge remote-tracking branch 'origin/master' 2021-02-19 18:30:13 +08:00
song.tianyang d1789dd154 feat: 接口定义->文档 增加JSON-Schema的显示和查找功能 
接口定义->文档 增加JSON-Schema的显示和查找功能
 2021-02-19 18:29:47 +08:00
wenyann 9b2e1e5a52 Merge remote-tracking branch 'origin/master' 2021-02-19 18:27:44 +08:00
wenyann 4e376541d1 fix: 修复冲突 2021-02-19 18:27:24 +08:00
chenjianxing a813605095 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-19 17:52:45 +08:00
chenjianxing c6c220269b fix: 解决冲突 2021-02-19 17:52:34 +08:00
wenyann c72a85ba39 Merge remote-tracking branch 'origin/master' 2021-02-19 16:54:36 +08:00
wenyann 774c44c28a fix: 冲突 2021-02-19 16:53:54 +08:00
shiziyuan9527 eb5b2d3de1 feat(测试跟踪): 用例评审默认关联工作空间下所有项目 2021-02-19 16:44:51 +08:00
wenyann 6e6ca3c0b9 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-02-19 16:42:14 +08:00
wenyann 245b46dc19 fix: 自定义表头 2021-02-19 16:34:22 +08:00
shiziyuan9527 b289b4d267 feat(测试跟踪): 测试计划默认关联工作空间下所有项目 2021-02-19 16:12:04 +08:00
chenjianxing f42e7ac3eb feat: 场景用例导出 2021-02-19 15:41:27 +08:00
fit2-zhao 8f9286252c feat(接口自动化): 导入JMX JDBC类型 数据源处理 2021-02-19 15:07:19 +08:00
chenjianxing a003eb566e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-19 14:37:49 +08:00
chenjianxing 1e2e80d507 refactor: 重构场景全选 2021-02-19 14:37:25 +08:00
Captain.B 2b27f03ddf Merge remote-tracking branch 'origin/master' 2021-02-19 13:12:26 +08:00
Captain.B cecdcebc49 feat: K8S 资源池支持nodeSelector 2021-02-19 13:11:19 +08:00
chenjianxing 5e8cbfe931 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-19 11:30:28 +08:00
chenjianxing c24ca8e562 场景支持导入postman 2021-02-19 11:30:08 +08:00
shiziyuan9527 340a685393 refactor: 删除无用log 2021-02-19 10:40:28 +08:00
shiziyuan9527 e2efd5c55b refactor: 模块节点可回车保存 
Closes #1413
 2021-02-18 17:08:22 +08:00
shiziyuan9527 9f74130dc8 fix(系统设置): 修复缺陷管理平台页面保存数据后密码显示明文的问题 
Closes #347
 2021-02-18 15:52:31 +08:00
fit2-zhao 09b39ca249 fix(xpack): 修复license数量显示为0 问题 2021-02-18 14:54:44 +08:00
fit2-zhao 72351396ae fix(xpack): 修复license数量显示为0 问题 2021-02-18 14:23:31 +08:00
chenjianxing bdf11d09aa 修改定时任务 #1167 2021-02-18 14:11:05 +08:00
chenjianxing b7e12652dd fix: 解决冲突 2021-02-18 14:10:57 +08:00
chenjianxing c7046993e5 fix: 删除无用代码 2021-02-18 14:05:26 +08:00
fit2-zhao a45fce4d41 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-18 12:56:09 +08:00
chenjianxing c60db63f2a fix: 修复退出登入后重新登入页面无数据问题 2021-02-18 11:42:31 +08:00
chenjianxing ccdf41894d 修改定时任务 #1167 2021-02-18 10:35:08 +08:00
fit2-zhao 329d95fe64 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-18 09:35:18 +08:00
song.tianyang d54e6911db Merge branch 'v1.7' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
#	frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
#	frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
 2021-02-17 12:03:59 +08:00
song.tianyang 7b671d3620 feat: 接口页面增加文档功能 
接口页面增加文档功能
 2021-02-17 11:50:25 +08:00
fit2-zhao 298e8df45a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-08 18:27:30 +08:00
fit2-zhao e7df89b1e2 feat(接口自动化): 导入jmx对已经有的请求处理 2021-02-08 18:27:22 +08:00
wenyann 8e4ce8a197 feat: 自定义表头 2021-02-08 18:06:52 +08:00
wenyann 21b6481b8b feat: 自定义表头 2021-02-08 17:22:27 +08:00
Captain.B 51ca71531e fix(性能测试): 修复请求很多的时候，图标鼠标悬停显示不全 2021-02-08 17:07:30 +08:00
fit2-zhao 6501890d5c Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-08 14:46:55 +08:00
fit2-zhao b42fbeafa2 fix(接口自动化): query参数自动处理 2021-02-08 14:46:09 +08:00
Captain.B 353d047854 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-08 14:28:53 +08:00
Captain.B ad98e6f783 fix(性能测试): 修复请求很多的时候，图标鼠标悬停显示不全 2021-02-08 14:28:24 +08:00
fit2-zhao 69646c0a92 style(接口自动化): 样式调整 2021-02-08 14:26:27 +08:00
fit2-zhao 9f1ca9fbe0 fix(场景自动化): 去除多余按钮 2021-02-08 14:13:21 +08:00
fit2-zhao 5eb34cbae4 feat(场景自动化): 场景变量增加请求头，并历史请求头数据可以支持迁移 2021-02-08 14:12:07 +08:00
fit2-zhao 415900370e fix(接口自动化): 修复引用场景能添加 其他步骤问题 2021-02-08 11:34:32 +08:00
fit2-zhao f3e0eb5b9d fix(接口定义): 测试中另存新接口缺陷修复 2021-02-07 11:36:57 +08:00
fit2-zhao d25d6f54cf feat(接口自动化): 导入jmx处理 2021-02-07 11:16:22 +08:00
fit2-zhao 4e14835474 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
 2021-02-07 09:47:16 +08:00
fit2-zhao dcb0714601 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
 2021-02-07 09:42:00 +08:00
chenjianxing 64c746a10a feat: 导出接口支持用例一起导出 2021-02-05 18:51:47 +08:00
fit2-zhao fc625a27f3 feat(接口自动化): 导入Jmeter文件初步结构完成 2021-02-05 15:32:39 +08:00
chenjianxing 0fd72ce96d refactor: 接口列表全选重构 2021-02-05 14:49:48 +08:00
chenjianxing 21678d4a77 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-05 10:57:05 +08:00
chenjianxing b41edd7c03 Merge branch 'v1.7' 2021-02-05 10:56:42 +08:00
Coooder-X 7e5c334122
fix: 修复新建接口，另存为用例后，修改接口路径，用例没有同步 (#1409) 2021-02-05 10:53:26 +08:00
fit2-zhao 1102ad81ab Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-02-05 10:40:48 +08:00
wenyann 67a420e78e Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/track/case/components/TestCaseList.vue
 2021-02-05 10:19:25 +08:00
wenyann 41964c5c58 fix: 自定义表头 2021-02-05 10:16:51 +08:00
fit2-zhao 38ce17b583 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-02-05 10:14:14 +08:00
fit2-zhao d258d7b693 fix(接口自动化): 修复JSR233 刷新问题 2021-02-05 10:00:55 +08:00
fit2-zhao d1a9332188 fix(接口自动化): 修复展开步骤时卡死问题 2021-02-05 09:50:56 +08:00
chenjianxing 3aa0d05d66 fix: 另存为新用例报id重复 2021-02-04 19:24:35 +08:00
fit2-zhao 039898c635 fix(接口自动化): 循环结果放到各自请求中 2021-02-04 19:12:36 +08:00
chenjianxing fe2f4e90a2 fix: sql请求更新接口报错 2021-02-04 18:13:07 +08:00
fit2-zhao bd12a36af5 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 17:54:14 +08:00
fit2-zhao 291164f15c fix(接口自动化): 场景步骤中自定义接口时隐藏另存用例按钮 2021-02-04 17:54:05 +08:00
Captain.B 7b3612f84d Merge branch 'v1.7' 2021-02-04 17:53:16 +08:00
chenjianxing 91e1215d65 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 17:44:32 +08:00
chenjianxing 6bad2e75df fix: 拖拽节点到根节点报错 2021-02-04 17:43:41 +08:00
Captain.B 78d843157b fix(性能测试): 修复切换报告的时候压力配置没有变化的问题 2021-02-04 17:42:32 +08:00
Captain.B af5a970412 Merge branch 'v1.7' 2021-02-04 16:14:03 +08:00
Coooder-X ad1c9d3ffe fix: 测试计划 编辑错误 (#1393) 2021-02-04 16:01:33 +08:00
chenjianxing 391cbf06d7 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 15:58:24 +08:00
chenjianxing ef3ddf4a8a fix: jsonpath 推荐名字中带有'.'，推荐失败 2021-02-04 15:50:28 +08:00
song.tianyang aadf243399 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-04 15:26:25 +08:00
song.tianyang 3e8efc608f fix: 接口定义->接口案例->批量编辑，请求方式中，修改TCP/SQL/DUBBO接口的下拉框数据 
接口定义->接口案例->批量编辑，请求方式中，修改TCP/SQL/DUBBO接口的下拉框数据
 2021-02-04 15:25:57 +08:00
fit2-zhao bb6986a74a fix(接口自动化): 场景变量搜索问题处理 2021-02-04 15:19:40 +08:00
chenjianxing 7955dc6205 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 13:36:03 +08:00
Captain.B dae7ad93a7 Merge branch 'v1.7' 2021-02-04 12:56:43 +08:00
Captain.B 072efeaf86 refactor(性能测试): 使用java作为http-client，设置连接超时60s 2021-02-04 12:56:13 +08:00
chenjianxing 13da850bcb fix: 脚本断言选其他语言不生效 2021-02-04 11:11:20 +08:00
Coooder-X 07205c4911 fix: 解决: 测试跟踪-用例评审，删除所有用例再添加时，需要刷新才显示list (#1372) 2021-02-03 19:26:04 +08:00
chenjianxing 29c30607bd Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-03 19:24:51 +08:00
Coooder-X 72c24b41a7
fix: 解决: 测试跟踪-用例评审，删除所有用例再添加时，需要刷新才显示list (#1372) 2021-02-03 19:24:10 +08:00
chenjianxing 32afe89ae8 Merge branch 'v1.7' 2021-02-03 19:23:12 +08:00
chenjianxing 03a8401b1b fix: 修复_fileter和_sort方法引用 2021-02-03 19:22:34 +08:00
chenjianxing 9b66d9c261 Merge branch 'v1.7' 2021-02-03 19:07:03 +08:00
chenjianxing 9ed341da50 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 19:05:12 +08:00
chenjianxing c115ea22e5 refactor: 代码优化 2021-02-03 19:04:50 +08:00
fit2-zhao 76bcd14500 fix(接口定义): 排序修改 2021-02-03 18:50:02 +08:00
chenjianxing 947ec17383 refactor: 抽取表格相关代码 2021-02-03 18:17:29 +08:00
fit2-zhao e69ee40438 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-03 17:48:37 +08:00
chenjianxing 937ce3f3c6 refactor: jar包管理优化 2021-02-03 17:21:20 +08:00
song.tianyang 683c533db0 Merge branch 'v1.7' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	backend/src/main/java/io/metersphere/track/service/TestPlanService.java
#	frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
#	frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
 2021-02-03 17:11:04 +08:00
song.tianyang e3903adcd0 refactor: 添加国际化字段 
添加国际化字段
 2021-02-03 16:57:04 +08:00
shiziyuan9527 117571cd94 feat: 组织、工作空间下拉列表增加滚动条 2021-02-03 16:43:59 +08:00
fit2-zhao a803225644 fix(接口定义): 历史JDBC数据兼容处理 2021-02-03 15:25:51 +08:00
fit2-zhao 54d88a077f fix(场景自动化): 历史数据兼容处理 2021-02-03 14:22:28 +08:00
Coooder-X 21f8e54069 fit: 解决冲突 2021-02-03 11:54:44 +08:00
Coooder-X 9a9f8f628b fear: (系统设置) 项目-jar包管理，支持查找 (#1350) 2021-02-03 11:23:17 +08:00
chenjianxing 171c7bc3b9 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 11:22:37 +08:00
Coooder-X 893485d592
fear: (系统设置) 项目-jar包管理，支持查找 (#1350) 2021-02-03 11:20:15 +08:00
chenjianxing b6f59bb15c fix: 滚动条宽度变化导致关联页面页面变形 2021-02-03 11:18:54 +08:00
fit2-zhao 3ba281e53c Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 10:47:22 +08:00
fit2-zhao f41beb6147 style(接口自动化): 整体展示样式优化 2021-02-03 10:46:56 +08:00
song.tianyang a09b8afb52 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-03 10:38:35 +08:00
song.tianyang 8e0d57a6d2 fix: 测试计划-关联功能测试用例-查看报告统计-切回到功能测试用例页后左侧模块列消失 
解决测试计划-关联功能测试用例-查看报告统计-切回到功能测试用例页后左侧模块列消失的缺陷
 2021-02-03 10:37:22 +08:00
chenjianxing f26b96a38b fix: 国际化 2021-02-02 19:42:14 +08:00
chenjianxing 80f34e4056 fix: 删除无用代码 2021-02-02 19:22:59 +08:00
chenjianxing ee1e55ac29 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-02 18:54:19 +08:00
chenjianxing 3e4e1272e6 fix: 测试计划场景列表tag显示问题 2021-02-02 18:53:57 +08:00